18241
|
1 |
diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl
|
|
2 |
--- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-06-01 23:36:39.000000000 +0200
|
|
3 |
+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200
|
|
4 |
@@ -324,7 +324,7 @@
|
9361
|
5 |
</xsl:when>
|
|
6 |
<xsl:when test="@termlength">
|
|
7 |
<xsl:variable name="termlength.is.number">
|
|
8 |
- <xsl:value-of select="@termlength + 0"/>
|
|
9 |
+ <xsl:value-of select="@termlength"/>
|
|
10 |
</xsl:variable>
|
|
11 |
<xsl:choose>
|
18241
|
12 |
<xsl:when test="string($termlength.is.number) = 'NaN'">
|
|
13 |
@@ -333,15 +333,7 @@
|
9361
|
14 |
</xsl:when>
|
|
15 |
<xsl:otherwise>
|
|
16 |
<xsl:value-of select="@termlength"/>
|
|
17 |
- <xsl:choose>
|
|
18 |
- <!-- workaround for passivetex lack of support for non-constant expressions -->
|
|
19 |
- <xsl:when test="$passivetex.extensions != 0">
|
|
20 |
- <xsl:text>em</xsl:text>
|
|
21 |
- </xsl:when>
|
|
22 |
- <xsl:otherwise>
|
|
23 |
- <xsl:text>em * 0.60</xsl:text>
|
|
24 |
- </xsl:otherwise>
|
|
25 |
- </xsl:choose>
|
|
26 |
+ <xsl:text>em</xsl:text>
|
|
27 |
</xsl:otherwise>
|
|
28 |
</xsl:choose>
|
|
29 |
</xsl:when>
|
18241
|
30 |
@@ -350,15 +342,7 @@
|
9361
|
31 |
<xsl:with-param name="terms" select="varlistentry/term"/>
|
|
32 |
<xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
|
|
33 |
</xsl:call-template>
|
|
34 |
- <xsl:choose>
|
|
35 |
- <!-- workaround for passivetex lack of support for non-constant expressions -->
|
|
36 |
- <xsl:when test="$passivetex.extensions != 0">
|
|
37 |
- <xsl:text>em</xsl:text>
|
|
38 |
- </xsl:when>
|
|
39 |
- <xsl:otherwise>
|
|
40 |
- <xsl:text>em * 0.60</xsl:text>
|
|
41 |
- </xsl:otherwise>
|
|
42 |
- </xsl:choose>
|
|
43 |
+ <xsl:text>em</xsl:text>
|
|
44 |
</xsl:otherwise>
|
|
45 |
</xsl:choose>
|
|
46 |
</xsl:variable>
|
18241
|
47 |
@@ -372,17 +356,7 @@
|
9361
|
48 |
|
|
49 |
<xsl:variable name="label-separation">1em</xsl:variable>
|
|
50 |
<xsl:variable name="distance-between-starts">
|
|
51 |
- <xsl:choose>
|
|
52 |
- <!-- workaround for passivetex lack of support for non-constant expressions -->
|
|
53 |
- <xsl:when test="$passivetex.extensions != 0">
|
|
54 |
- <xsl:value-of select="$termlength"/>
|
|
55 |
- </xsl:when>
|
|
56 |
- <xsl:otherwise>
|
|
57 |
- <xsl:value-of select="$termlength"/>
|
|
58 |
- <xsl:text>+</xsl:text>
|
|
59 |
- <xsl:value-of select="$label-separation"/>
|
|
60 |
- </xsl:otherwise>
|
|
61 |
- </xsl:choose>
|
|
62 |
+ <xsl:value-of select="$termlength"/>
|
|
63 |
</xsl:variable>
|
|
64 |
|
|
65 |
<xsl:if test="title">
|
18241
|
66 |
diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl
|
|
67 |
--- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200
|
|
68 |
+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200
|
|
69 |
@@ -133,8 +133,8 @@
|
9361
|
70 |
<xsl:attribute-set name="component.title.properties">
|
|
71 |
<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
|
|
72 |
<xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
|
|
73 |
- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
|
|
74 |
- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
|
18241
|
75 |
+ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
|
|
76 |
+ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
|
9361
|
77 |
<xsl:attribute name="hyphenate">false</xsl:attribute>
|
|
78 |
<xsl:attribute name="text-align">
|
|
79 |
<xsl:choose>
|
18241
|
80 |
diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl
|
|
81 |
--- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl 2009-05-11 11:40:49.000000000 +0200
|
|
82 |
+++ docbook-xsl-1.75.0/fo/pagesetup.xsl 2009-05-11 11:42:29.000000000 +0200
|
|
83 |
@@ -30,16 +30,7 @@
|
|
84 |
</xsl:param>
|
|
85 |
|
|
86 |
<xsl:param name="margin.left.inner">
|
|
87 |
- <xsl:choose>
|
|
88 |
- <xsl:when test="$passivetex.extensions != 0">
|
|
89 |
- <xsl:value-of select="$page.margin.inner"/>
|
|
90 |
- </xsl:when>
|
|
91 |
- <xsl:otherwise>
|
|
92 |
- <xsl:value-of select="$page.margin.inner"/>
|
|
93 |
- <xsl:text> - </xsl:text>
|
|
94 |
- <xsl:value-of select="$title.margin.left"/>
|
|
95 |
- </xsl:otherwise>
|
|
96 |
- </xsl:choose>
|
|
97 |
+ <xsl:value-of select="$page.margin.inner"/>
|
|
98 |
</xsl:param>
|
|
99 |
|
|
100 |
<xsl:template name="setup.pagemasters">
|