- Prevent expressions in passivetex output from index.xsl (bug #142229).

This commit is contained in:
Tim Waugh 2004-12-08 12:45:19 +00:00
parent 853951e1f2
commit 78f96966cf
2 changed files with 37 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Name: docbook-style-xsl
Version: 1.67.2
Release: 1
Release: 2
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@ -91,6 +91,9 @@ CATALOG=/etc/xml/catalog
%changelog
* Wed Dec 8 2004 Tim Waugh <twaugh@redhat.com> 1.67.2-2
- Prevent expressions in passivetex output from index.xsl (bug #142229).
* Thu Dec 2 2004 Tim Waugh <twaugh@redhat.com> 1.67.2-1
- 1.67.2.
- No longer need nbsp or listblock patches.

View File

@ -70,3 +70,36 @@
<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>