74 lines
2.7 KiB
Diff
74 lines
2.7 KiB
Diff
--- docbook-xsl-1.64.1/fo/pagesetup.xsl.marginleft 2003-12-17 00:57:36.000000000 +0000
|
|
+++ docbook-xsl-1.64.1/fo/pagesetup.xsl 2004-01-18 16:29:32.000000000 +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.64.1/fo/lists.xsl.marginleft 2003-12-04 20:13:46.000000000 +0000
|
|
+++ docbook-xsl-1.64.1/fo/lists.xsl 2004-01-18 16:31:51.000000000 +0000
|
|
@@ -303,7 +303,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'">
|
|
@@ -312,7 +312,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>
|
|
@@ -321,7 +321,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>
|
|
@@ -348,8 +348,7 @@
|
|
|processing-instruction()[not(preceding-sibling::varlistentry)]"/>
|
|
|
|
<fo:list-block id="{$id}"
|
|
- provisional-distance-between-starts=
|
|
- "{$termlength}+{$label-separation}"
|
|
+ provisional-distance-between-starts="{$termlength}"
|
|
provisional-label-separation="{$label-separation}"
|
|
xsl:use-attribute-sets="list.block.spacing">
|
|
<xsl:apply-templates mode="vl.as.list"
|