rpms/docbook-style-xsl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- 1.68.0.

Browse Source
This commit is contained in:
Tim Waugh 2005-02-09 14:56:45 +00:00
parent 78f96966cf
commit 1e8554d277
4 changed files with 67 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -2,3 +2,4 @@ docbook-xsl-1.65.1.tar.gz
docbook-xsl-1.66.1.tar.gz docbook-xsl-1.66.1.tar.gz
docbook-xsl-1.67.0.tar.gz docbook-xsl-1.67.0.tar.gz
docbook-xsl-1.67.2.tar.bz2 docbook-xsl-1.67.2.tar.bz2
docbook-xsl-1.68.0.tar.bz2

7
docbook-style-xsl.spec
View File

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

114
docbook-xsl-marginleft.patch
View File

@ -1,5 +1,5 @@
--- docbook-xsl-1.67.2/fo/pagesetup.xsl.marginleft 2004-09-02 05:13:53.000000000 +0100 --- docbook-xsl-1.68.0/fo/pagesetup.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000
+++ docbook-xsl-1.67.2/fo/pagesetup.xsl 2004-12-02 22:59:01.796211246 +0000 +++ docbook-xsl-1.68.0/fo/pagesetup.xsl 2005-02-09 14:53:59.088068221 +0000
@@ -34,29 +34,11 @@ @@ -34,29 +34,11 @@
margin-left="{$page.margin.outer} - {$title.margin.left}" margin-left="{$page.margin.outer} - {$title.margin.left}"
--> -->
@ -32,9 +32,9 @@
</xsl:param> </xsl:param>
<xsl:template name="setup.pagemasters"> <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.68.0/fo/lists.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000
+++ docbook-xsl-1.67.2/fo/lists.xsl 2004-12-02 23:02:08.361569542 +0000 +++ docbook-xsl-1.68.0/fo/lists.xsl 2005-02-09 14:55:06.682138599 +0000
@@ -353,7 +353,7 @@ @@ -371,7 +371,7 @@
</xsl:when> </xsl:when>
<xsl:when test="@termlength"> <xsl:when test="@termlength">
<xsl:variable name="termlength.is.number"> <xsl:variable name="termlength.is.number">
@ -43,49 +43,62 @@
</xsl:variable> </xsl:variable>
<xsl:choose> <xsl:choose>
<xsl:when test="$termlength.is.number = 'NaN'"> <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:value-of select="@termlength"/>
<xsl:choose> - <xsl:choose>
<!-- workaround for passivetex lack of support for non-constant expressions --> - <!-- workaround for passivetex lack of support for non-constant expressions -->
- <xsl:when test="$passivetex.extensions != 0"> - <xsl:when test="$passivetex.extensions != 0">
+ <xsl:when test="1 != 0"> - <xsl:text>em</xsl:text>
<xsl:text>em</xsl:text> - </xsl:when>
</xsl:when> - <xsl:otherwise>
<xsl:otherwise> - <xsl:text>em * 0.60</xsl:text>
@@ -381,7 +381,7 @@ - </xsl:otherwise>
</xsl:call-template> - </xsl:choose>
<xsl:choose> + <xsl:text>em</xsl:text>
<!-- workaround for passivetex lack of support for non-constant expressions --> </xsl:otherwise>
- <xsl:when test="$passivetex.extensions != 0"> </xsl:choose>
+ <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:when> </xsl:when>
<xsl:otherwise> @@ -397,15 +389,7 @@
--- docbook-xsl-1.67.2/fo/index.xsl.marginleft 2004-12-08 12:34:12.310231417 +0000 <xsl:with-param name="terms" select="varlistentry/term"/>
+++ docbook-xsl-1.67.2/fo/index.xsl 2004-12-08 12:34:32.443381818 +0000 <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
@@ -255,8 +255,8 @@ </xsl:call-template>
font-weight="bold" - <xsl:choose>
keep-with-next.within-column="always" - <!-- workaround for passivetex lack of support for non-constant expressions -->
space-before.optimum="{$body.font.master}pt" - <xsl:when test="$passivetex.extensions != 0">
- space-before.minimum="{$body.font.master * 0.8}pt" - <xsl:text>em</xsl:text>
- space-before.maximum="{$body.font.master * 1.2}pt"> - </xsl:when>
+ space-before.minimum="{$body.font.master}pt" - <xsl:otherwise>
+ space-before.maximum="{$body.font.master}pt"> - <xsl:text>em * 0.60</xsl:text>
<xsl:choose> - </xsl:otherwise>
<xsl:when test="$title"> - </xsl:choose>
<xsl:apply-templates select="." mode="object.title.markup"> + <xsl:text>em</xsl:text>
--- docbook-xsl-1.67.2/fo/param.xsl.marginleft 2004-12-08 12:40:18.526434259 +0000 </xsl:otherwise>
+++ docbook-xsl-1.67.2/fo/param.xsl 2004-12-08 12:40:32.104826321 +0000 </xsl:choose>
@@ -85,8 +85,8 @@ </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-set name="component.title.properties">
<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> <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.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.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="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
<xsl:attribute name="hyphenate">false</xsl:attribute> <xsl:attribute name="hyphenate">false</xsl:attribute>
<xsl:attribute name="start-indent">0pt</xsl:attribute>
</xsl:attribute-set> </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>

2
sources
View File

@ -1 +1 @@
deb1864e3e190465dcc26145d2667a84 docbook-xsl-1.67.2.tar.bz2 3cf72fd69e7e3bb7dd925363a0558bf2 docbook-xsl-1.68.0.tar.bz2