From: Julian Seward <jseward@acm.org>
Date: Thu, 17 Nov 2005 18:04:58 +0000 (+0000)
Subject: Fixes to make the .pdf build using the toolchain on SuSE10 (from Donna).
X-Git-Tag: svn/VALGRIND_3_1_0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfa3bfb64dc49153bc254a9cd8ecd3e3cba85f03;p=thirdparty%2Fvalgrind.git

Fixes to make the .pdf build using the toolchain on SuSE10 (from Donna).


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5171
---

diff --git a/docs/README b/docs/README
index 6f6b5e358c..dbd32407dd 100644
--- a/docs/README
+++ b/docs/README
@@ -1,32 +1,9 @@
 
-New notes, JRS 20050727
-~~~~~~~~~~~~~~~~~~~~~~~
-* I had to install zillions of packages on SuSE 9.2 in order to
-  build the print docs (make print-docs), including
-
-    passivetex
-    xpdf (for pdftops)
-
-  It's possible to use pdf2ps instead, but that seems to generate
-  huge and almost-unreadable .ps.  pdftops does a much nicer job.
-
-
-* Even then, pdfxmltex eventually dies with "TeX capacity exceeded,
-  sorry [pool size = 67555]" or some such.  To fix this, I edited
-  /etc/texmf/texmf.cnf and changed
-
-     pool_size.pdfxmltex = 500000
-
-  to 1500000 and that fixed it.
-
-
-Old notes
-~~~~~~~~~
 Valgrind Documentation
 ----------------------
 This text assumes the following directory structure:
 
-Distribution text files (eg. README):
+Distribution text files (eg. AUTHORS, NEWS, ...):
   valgrind/
 
 Main /docs/ dir:
@@ -115,7 +92,6 @@ present on his system:
 - pdftops:   version 3.00
 - DocBook:   version 4.2
 - bzip2
-- lynx
 
 A big problem is latency.  Norman Walsh is constantly updating
 DocBook, but the tools tend to lag behind somewhat.  It is
@@ -133,26 +109,45 @@ then look at this:
 and modify your texmf files accordingly.
 
 
-Catalog Locations
-------------------
-oasis:
-http://www.oasis-open.org/docbook/xml/4.2/catalog.xml
-http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd
+Catalog/Stylesheet Location
+---------------------------
+Suse 10:
+/usr/share/xml/docbook/
 
-Suse 9.1: 
-/usr/share/xml/docbook/ stylesheet/nwalsh/1.64.1/html/docbook.xsl
-/usr/share/xml/docbook/ schema/dtd/4.2/docbookx.dtd
-/usr/share/xml/docbook/ schema/dtd/4.2/catalog.xml
 
 
-Notes:
-------
+Notes [Nov. 2004]:
+-----------------
 - the end of file.xml must have only ONE newline after the last tag:
   </book>
-
 - pdfxmltex barfs if given a filename with an underscore in it
   
 
+Notes [July 2005]
+-----------------
+jrs had to install zillions of packages on SuSE 9.2 in order to
+build the print docs (make print-docs), including
+   passivetex
+   xpdf (for pdftops, which does the nicest job)
+
+Even then, pdfxmltex eventually dies with "TeX capacity exceeded,
+sorry [pool size = 67555]" or some such.  To fix this, he edited
+/etc/texmf/texmf.cnf and changed
+   pool_size.pdfxmltex = 500000
+
+ to 1500000 and that fixed it.
+
+
+Notes [Nov. 2005]
+-----------------
+After upgrading to Suse 10, found a (known) bug in PassiveTex which 
+broke the build, so added a bug-fix to 'docs/lib/vg-fo.xsl'.
+Bug-fix related links:
+http://lists.oasis-open.org/archives/docbook/200509/msg00032.html
+http://www.dpawson.co.uk/docbook/tools.html#d850e300
+http://www.haskell.org/pipermail/glasgow-haskell-bugs/2005-January.txt
+
+
 References:
 ----------
 - samba have got all the stuff
diff --git a/docs/lib/vg-fo.xsl b/docs/lib/vg-fo.xsl
index 647d91bcca..bf852de719 100644
--- a/docs/lib/vg-fo.xsl
+++ b/docs/lib/vg-fo.xsl
@@ -34,6 +34,25 @@
   <xsl:attribute name="color">blue</xsl:attribute>
 </xsl:attribute-set>
 
+<!-- Bug-fix for Suse 10 PassiveTex version -->
+<!-- Precompute attribute values; PassiveTex is too stupid: -->
+<xsl:attribute-set name="component.title.properties">
+  <xsl:attribute
+  name="keep-with-next.within-column">always</xsl:attribute>
+  <xsl:attribute name="space-before.optimum">
+    <xsl:value-of select="concat($body.font.master, 'pt')"/>
+  </xsl:attribute>
+  <xsl:attribute name="space-before.minimum">
+    <xsl:value-of select="$body.font.master * 0.8"/>
+    <xsl:text>pt</xsl:text>
+  </xsl:attribute>
+  <xsl:attribute name="space-before.maximum">
+    <xsl:value-of select="$body.font.master * 1.2"/>
+    <xsl:text>pt</xsl:text>
+  </xsl:attribute>
+  <xsl:attribute name="hyphenate">false</xsl:attribute>
+</xsl:attribute-set>
+
 <!-- make pre listings indented a bit + a bg colour -->
 <xsl:template match="programlisting | screen">
   <fo:block start-indent="0.25in" wrap-option="no-wrap"