106 lines
4.5 KiB
Diff
106 lines
4.5 KiB
Diff
--- docbook-xsl-1.67.2/fo/pagesetup.xsl.marginleft 2004-09-02 05:13:53.000000000 +0100
|
|
+++ docbook-xsl-1.67.2/fo/pagesetup.xsl 2004-12-02 22:59:01.796211246 +0000
|
|
@@ -34,29 +34,11 @@
|
|
margin-left="{$page.margin.outer} - {$title.margin.left}"
|
|
-->
|
|
<xsl:param name="margin.left.outer">
|
|
- <xsl:choose>
|
|
- <xsl:when test="$passivetex.extensions != 0">
|
|
- <xsl:value-of select="$page.margin.outer"/>
|
|
- </xsl:when>
|
|
- <xsl:otherwise>
|
|
- <xsl:value-of select="$page.margin.outer"/>
|
|
- <xsl:text> - </xsl:text>
|
|
- <xsl:value-of select="$title.margin.left"/>
|
|
- </xsl:otherwise>
|
|
- </xsl:choose>
|
|
+ <xsl:value-of select="$page.margin.outer"/>
|
|
</xsl:param>
|
|
|
|
<xsl:param name="margin.left.inner">
|
|
- <xsl:choose>
|
|
- <xsl:when test="$passivetex.extensions != 0">
|
|
- <xsl:value-of select="$page.margin.inner"/>
|
|
- </xsl:when>
|
|
- <xsl:otherwise>
|
|
- <xsl:value-of select="$page.margin.inner"/>
|
|
- <xsl:text> - </xsl:text>
|
|
- <xsl:value-of select="$title.margin.left"/>
|
|
- </xsl:otherwise>
|
|
- </xsl:choose>
|
|
+ <xsl:value-of select="$page.margin.inner"/>
|
|
</xsl:param>
|
|
|
|
<xsl:template name="setup.pagemasters">
|
|
--- docbook-xsl-1.67.2/fo/lists.xsl.marginleft 2004-11-20 11:49:17.000000000 +0000
|
|
+++ docbook-xsl-1.67.2/fo/lists.xsl 2004-12-02 23:02:08.361569542 +0000
|
|
@@ -353,7 +353,7 @@
|
|
</xsl:when>
|
|
<xsl:when test="@termlength">
|
|
<xsl:variable name="termlength.is.number">
|
|
- <xsl:value-of select="@termlength + 0"/>
|
|
+ <xsl:value-of select="@termlength"/>
|
|
</xsl:variable>
|
|
<xsl:choose>
|
|
<xsl:when test="$termlength.is.number = 'NaN'">
|
|
@@ -364,7 +364,7 @@
|
|
<xsl:value-of select="@termlength"/>
|
|
<xsl:choose>
|
|
<!-- workaround for passivetex lack of support for non-constant expressions -->
|
|
- <xsl:when test="$passivetex.extensions != 0">
|
|
+ <xsl:when test="1 != 0">
|
|
<xsl:text>em</xsl:text>
|
|
</xsl:when>
|
|
<xsl:otherwise>
|
|
@@ -381,7 +381,7 @@
|
|
</xsl:call-template>
|
|
<xsl:choose>
|
|
<!-- workaround for passivetex lack of support for non-constant expressions -->
|
|
- <xsl:when test="$passivetex.extensions != 0">
|
|
+ <xsl:when test="1 != 0">
|
|
<xsl:text>em</xsl:text>
|
|
</xsl:when>
|
|
<xsl:otherwise>
|
|
@@ -403,7 +403,7 @@
|
|
<xsl:variable name="distance-between-starts">
|
|
<xsl:choose>
|
|
<!-- workaround for passivetex lack of support for non-constant expressions -->
|
|
- <xsl:when test="$passivetex.extensions != 0">
|
|
+ <xsl:when test="1 != 0">
|
|
<xsl:value-of select="$termlength"/>
|
|
</xsl:when>
|
|
<xsl:otherwise>
|
|
--- docbook-xsl-1.67.2/fo/index.xsl.marginleft 2004-12-08 12:34:12.310231417 +0000
|
|
+++ docbook-xsl-1.67.2/fo/index.xsl 2004-12-08 12:34:32.443381818 +0000
|
|
@@ -255,8 +255,8 @@
|
|
font-weight="bold"
|
|
keep-with-next.within-column="always"
|
|
space-before.optimum="{$body.font.master}pt"
|
|
- space-before.minimum="{$body.font.master * 0.8}pt"
|
|
- space-before.maximum="{$body.font.master * 1.2}pt">
|
|
+ space-before.minimum="{$body.font.master}pt"
|
|
+ space-before.maximum="{$body.font.master}pt">
|
|
<xsl:choose>
|
|
<xsl:when test="$title">
|
|
<xsl:apply-templates select="." mode="object.title.markup">
|
|
--- docbook-xsl-1.67.2/fo/param.xsl.marginleft 2004-12-08 12:40:18.526434259 +0000
|
|
+++ docbook-xsl-1.67.2/fo/param.xsl 2004-12-08 12:40:32.104826321 +0000
|
|
@@ -85,8 +85,8 @@
|
|
<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="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
|
|
- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
|
|
+ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
|
|
+ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
|
|
<xsl:attribute name="hyphenate">false</xsl:attribute>
|
|
</xsl:attribute-set>
|
|
<xsl:param name="current.docid" select="''"/>
|
|
@@ -685,4 +685,4 @@
|
|
<xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param>
|
|
<xsl:param name="xref.with.number.and.title" select="1"/>
|
|
|
|
-</xsl:stylesheet>
|
|
\ No newline at end of file
|
|
+</xsl:stylesheet>
|