2005-02-09 14:56:45 +00:00
|
|
|
--- docbook-xsl-1.68.0/fo/pagesetup.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000
|
|
|
|
+++ docbook-xsl-1.68.0/fo/pagesetup.xsl 2005-02-09 14:53:59.088068221 +0000
|
2004-09-09 04:21:07 +00:00
|
|
|
@@ -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">
|
2005-02-09 14:56:45 +00:00
|
|
|
--- docbook-xsl-1.68.0/fo/lists.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000
|
|
|
|
+++ docbook-xsl-1.68.0/fo/lists.xsl 2005-02-09 14:55:06.682138599 +0000
|
|
|
|
@@ -371,7 +371,7 @@
|
2004-09-09 04:21:07 +00:00
|
|
|
</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'">
|
2005-02-09 14:56:45 +00:00
|
|
|
@@ -380,15 +380,7 @@
|
|
|
|
</xsl:when>
|
|
|
|
<xsl:otherwise>
|
2004-09-09 04:21:07 +00:00
|
|
|
<xsl:value-of select="@termlength"/>
|
2005-02-09 14:56:45 +00:00
|
|
|
- <xsl:choose>
|
|
|
|
- <!-- workaround for passivetex lack of support for non-constant expressions -->
|
|
|
|
- <xsl:when test="$passivetex.extensions != 0">
|
|
|
|
- <xsl:text>em</xsl:text>
|
|
|
|
- </xsl:when>
|
|
|
|
- <xsl:otherwise>
|
|
|
|
- <xsl:text>em * 0.60</xsl:text>
|
|
|
|
- </xsl:otherwise>
|
|
|
|
- </xsl:choose>
|
|
|
|
+ <xsl:text>em</xsl:text>
|
|
|
|
</xsl:otherwise>
|
|
|
|
</xsl:choose>
|
|
|
|
</xsl:when>
|
|
|
|
@@ -397,15 +389,7 @@
|
|
|
|
<xsl:with-param name="terms" select="varlistentry/term"/>
|
|
|
|
<xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
|
2004-09-09 04:21:07 +00:00
|
|
|
</xsl:call-template>
|
2005-02-09 14:56:45 +00:00
|
|
|
- <xsl:choose>
|
|
|
|
- <!-- workaround for passivetex lack of support for non-constant expressions -->
|
|
|
|
- <xsl:when test="$passivetex.extensions != 0">
|
|
|
|
- <xsl:text>em</xsl:text>
|
|
|
|
- </xsl:when>
|
|
|
|
- <xsl:otherwise>
|
|
|
|
- <xsl:text>em * 0.60</xsl:text>
|
|
|
|
- </xsl:otherwise>
|
|
|
|
- </xsl:choose>
|
|
|
|
+ <xsl:text>em</xsl:text>
|
|
|
|
</xsl:otherwise>
|
|
|
|
</xsl:choose>
|
|
|
|
</xsl:variable>
|
|
|
|
@@ -419,17 +403,7 @@
|
|
|
|
|
|
|
|
<xsl:variable name="label-separation">1em</xsl:variable>
|
2004-12-02 23:04:01 +00:00
|
|
|
<xsl:variable name="distance-between-starts">
|
2005-02-09 14:56:45 +00:00
|
|
|
- <xsl:choose>
|
|
|
|
- <!-- workaround for passivetex lack of support for non-constant expressions -->
|
2004-12-02 23:04:01 +00:00
|
|
|
- <xsl:when test="$passivetex.extensions != 0">
|
2005-02-09 14:56:45 +00:00
|
|
|
- <xsl:value-of select="$termlength"/>
|
|
|
|
- </xsl:when>
|
|
|
|
- <xsl:otherwise>
|
|
|
|
- <xsl:value-of select="$termlength"/>
|
|
|
|
- <xsl:text>+</xsl:text>
|
|
|
|
- <xsl:value-of select="$label-separation"/>
|
|
|
|
- </xsl:otherwise>
|
|
|
|
- </xsl:choose>
|
|
|
|
+ <xsl:value-of select="$termlength"/>
|
|
|
|
</xsl:variable>
|
|
|
|
|
|
|
|
<xsl:if test="title">
|
|
|
|
--- docbook-xsl-1.68.0/fo/param.xsl.marginleft 2005-02-09 12:20:55.000000000 +0000
|
|
|
|
+++ docbook-xsl-1.68.0/fo/param.xsl 2005-02-09 14:53:59.115063057 +0000
|
|
|
|
@@ -95,8 +95,8 @@
|
2004-12-08 12:45:19 +00:00
|
|
|
<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>
|
2007-12-04 15:07:09 +00:00
|
|
|
+ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
|
|
|
|
+ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
|
2004-12-08 12:45:19 +00:00
|
|
|
<xsl:attribute name="hyphenate">false</xsl:attribute>
|
2005-02-09 14:56:45 +00:00
|
|
|
<xsl:attribute name="start-indent">0pt</xsl:attribute>
|
2004-12-08 12:45:19 +00:00
|
|
|
</xsl:attribute-set>
|