- 1.68.0.
This commit is contained in:
Tim Waugh
parent
78f96966cf
commit
1e8554d277
@ -2,3 +2,4 @@ docbook-xsl-1.65.1.tar.gz
|
||||
docbook-xsl-1.66.1.tar.gz
|
||||
docbook-xsl-1.67.0.tar.gz
|
||||
docbook-xsl-1.67.2.tar.bz2
|
||||
docbook-xsl-1.68.0.tar.bz2
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: docbook-style-xsl
|
||||
Version: 1.67.2
|
||||
Release: 2
|
||||
Version: 1.68.0
|
||||
Release: 1
|
||||
Group: Applications/Text
|
||||
|
||||
Summary: Norman Walsh's XSL stylesheets for DocBook XML.
|
||||
@ -91,6 +91,9 @@ CATALOG=/etc/xml/catalog
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Feb 9 2005 Tim Waugh <twaugh@redhat.com> 1.68.0-1
|
||||
- 1.68.0.
|
||||
|
||||
* Wed Dec 8 2004 Tim Waugh <twaugh@redhat.com> 1.67.2-2
|
||||
- Prevent expressions in passivetex output from index.xsl (bug #142229).
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- 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
|
||||
--- 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
|
||||
@@ -34,29 +34,11 @@
|
||||
margin-left="{$page.margin.outer} - {$title.margin.left}"
|
||||
-->
|
||||
@ -32,9 +32,9 @@
|
||||
</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 @@
|
||||
--- 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 @@
|
||||
</xsl:when>
|
||||
<xsl:when test="@termlength">
|
||||
<xsl:variable name="termlength.is.number">
|
||||
@ -43,49 +43,62 @@
|
||||
</xsl:variable>
|
||||
<xsl:choose>
|
||||
<xsl:when test="$termlength.is.number = 'NaN'">
|
||||
@@ -364,7 +364,7 @@
|
||||
@@ -380,15 +380,7 @@
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<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: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>
|
||||
<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 @@
|
||||
@@ -397,15 +389,7 @@
|
||||
<xsl:with-param name="terms" select="varlistentry/term"/>
|
||||
<xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
|
||||
</xsl:call-template>
|
||||
- <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>
|
||||
<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: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 @@
|
||||
<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>
|
||||
@ -94,12 +107,5 @@
|
||||
+ <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 name="start-indent">0pt</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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user