- 1.67.2.

- No longer need nbsp or listblock patches.
This commit is contained in:
Tim Waugh 2004-12-02 23:04:01 +00:00
parent 72ffd51add
commit 853951e1f2
4 changed files with 39 additions and 47 deletions

View File

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

View File

@ -1,6 +1,6 @@
Name: docbook-style-xsl
Version: 1.67.0
Release: 3
Version: 1.67.2
Release: 1
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@ -18,12 +18,10 @@ Conflicts: passivetex < 1.21
BuildRoot: %{_tmppath}/%{name}-%{version}
BuildArch: noarch
Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz
Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.bz2
Source1: %{name}.Makefile
Patch1: docbook-xsl-nbsp.patch
Patch2: docbook-xsl-marginleft.patch
Patch3: docbook-xsl-listblock.patch
%description
@ -33,9 +31,7 @@ other formats, such as HTML, FO, and XHMTL. They are highly customizable.
%prep
%setup -q -n docbook-xsl-%{version}
%patch1 -p1 -b .nbsp
%patch2 -p1 -b .marginleft
%patch3 -p1 -b .listblock
cp %{SOURCE1} Makefile
for f in $(find -name "*'*")
do
@ -95,6 +91,10 @@ CATALOG=/etc/xml/catalog
%changelog
* Thu Dec 2 2004 Tim Waugh <twaugh@redhat.com> 1.67.2-1
- 1.67.2.
- No longer need nbsp or listblock patches.
* Mon Nov 22 2004 Tim Waugh <twaugh@redhat.com> 1.67.0-3
- Avoid non-ASCII in generated man pages.

View File

@ -1,5 +1,5 @@
--- docbook-xsl-1.66.1/fo/pagesetup.xsl.marginleft 2004-09-02 05:13:53.000000000 +0100
+++ docbook-xsl-1.66.1/fo/pagesetup.xsl 2004-11-02 17:08:30.350296912 +0000
--- 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
@@ -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.66.1/fo/lists.xsl.marginleft 2004-08-14 09:33:19.000000000 +0100
+++ docbook-xsl-1.66.1/fo/lists.xsl 2004-11-02 17:11:16.236642694 +0000
@@ -350,7 +350,7 @@
--- 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 @@
</xsl:when>
<xsl:when test="@termlength">
<xsl:variable name="termlength.is.number">
@ -43,39 +43,30 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="$termlength.is.number = 'NaN'">
@@ -359,7 +359,7 @@
</xsl:when>
<xsl:otherwise>
@@ -364,7 +364,7 @@
<xsl:value-of select="@termlength"/>
- <xsl:text>em * 0.60</xsl:text>
+ <xsl:text>em</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -368,7 +368,7 @@
<xsl:with-param name="terms" select="varlistentry/term"/>
<xsl:with-param name="maxlength" select="$variablelist.max.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:text>em * 0.60</xsl:text>
+ <xsl:text>em</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -406,7 +406,7 @@
<xsl:when test="ancestor::listitem">
<fo:list-block id="{$id}"
provisional-distance-between-starts=
- "{$termlength}+{$label-separation}"
+ "{$termlength}"
provisional-label-separation="{$label-separation}">
<xsl:copy-of select="$content"/>
</fo:list-block>
@@ -414,7 +414,7 @@
<xsl:otherwise>
<fo:list-block id="{$id}"
provisional-distance-between-starts=
- "{$termlength}+{$label-separation}"
+ "{$termlength}"
provisional-label-separation="{$label-separation}"
xsl:use-attribute-sets="list.block.spacing">
<xsl:copy-of select="$content"/>
<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:when>
<xsl:otherwise>

View File

@ -1 +1 @@
c23b103673ff668378df655b6cdb80a5 docbook-xsl-1.67.0.tar.gz
deb1864e3e190465dcc26145d2667a84 docbook-xsl-1.67.2.tar.bz2