82 lines
3.0 KiB
Diff
82 lines
3.0 KiB
Diff
--- docbook-xsl-1.66.1/fo/pagesetup.xsl.marginleft 2004-09-02 05:13:53.000000000 +0100
|
|
+++ docbook-xsl-1.66.1/fo/pagesetup.xsl 2004-11-02 17:08:30.350296912 +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.66.1/fo/lists.xsl.marginleft 2004-08-14 09:33:19.000000000 +0100
|
|
+++ docbook-xsl-1.66.1/fo/lists.xsl 2004-11-02 17:11:16.236642694 +0000
|
|
@@ -350,7 +350,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'">
|
|
@@ -359,7 +359,7 @@
|
|
</xsl:when>
|
|
<xsl:otherwise>
|
|
<xsl:value-of select="@termlength"/>
|
|
- <xsl:text>em * 0.60</xsl:text>
|
|
+ <xsl:text>em</xsl:text>
|
|
</xsl:otherwise>
|
|
</xsl:choose>
|
|
</xsl:when>
|
|
@@ -368,7 +368,7 @@
|
|
<xsl:with-param name="terms" select="varlistentry/term"/>
|
|
<xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
|
|
</xsl:call-template>
|
|
- <xsl:text>em * 0.60</xsl:text>
|
|
+ <xsl:text>em</xsl:text>
|
|
</xsl:otherwise>
|
|
</xsl:choose>
|
|
</xsl:variable>
|
|
@@ -406,7 +406,7 @@
|
|
<xsl:when test="ancestor::listitem">
|
|
<fo:list-block id="{$id}"
|
|
provisional-distance-between-starts=
|
|
- "{$termlength}+{$label-separation}"
|
|
+ "{$termlength}"
|
|
provisional-label-separation="{$label-separation}">
|
|
<xsl:copy-of select="$content"/>
|
|
</fo:list-block>
|
|
@@ -414,7 +414,7 @@
|
|
<xsl:otherwise>
|
|
<fo:list-block id="{$id}"
|
|
provisional-distance-between-starts=
|
|
- "{$termlength}+{$label-separation}"
|
|
+ "{$termlength}"
|
|
provisional-label-separation="{$label-separation}"
|
|
xsl:use-attribute-sets="list.block.spacing">
|
|
<xsl:copy-of select="$content"/>
|