rpms/docbook-style-xsl/devel docbook-style-xsl.spec, 1.24, 1.25 docbook-xsl-lists.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jan 19 13:20:23 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/docbook-style-xsl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9150
Modified Files:
docbook-style-xsl.spec docbook-xsl-lists.patch
Log Message:
* Thu Jan 19 2006 Tim Waugh <twaugh at redhat.com> 1.69.1-4
- Better 'lists' patch (bug #161371).
Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- docbook-style-xsl.spec 19 Jan 2006 12:09:11 -0000 1.24
+++ docbook-style-xsl.spec 19 Jan 2006 13:20:18 -0000 1.25
@@ -1,6 +1,6 @@
Name: docbook-style-xsl
Version: 1.69.1
-Release: 3
+Release: 4
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -100,6 +100,9 @@
%changelog
+* Thu Jan 19 2006 Tim Waugh <twaugh at redhat.com> 1.69.1-4
+- Better 'lists' patch (bug #161371).
+
* Thu Jan 19 2006 Tim Waugh <twaugh at redhat.com> 1.69.1-3
- Apply patch to fix simpara manpage output, which asciidoc tends to use
(bug #175592).
docbook-xsl-lists.patch:
lists.xsl | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 7 deletions(-)
Index: docbook-xsl-lists.patch
===================================================================
RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-xsl-lists.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docbook-xsl-lists.patch 3 Jan 2006 13:50:54 -0000 1.1
+++ docbook-xsl-lists.patch 19 Jan 2006 13:20:18 -0000 1.2
@@ -1,46 +1,123 @@
---- docbook-xsl-1.69.1/fo/lists.xsl.orig 2006-01-01 20:00:44.000000000 -0600
-+++ docbook-xsl-1.69.1/fo/lists.xsl 2006-01-01 20:01:54.000000000 -0600
-@@ -125,9 +125,18 @@
+--- docbook-xsl-1.69.1/fo/lists.xsl.orig 2006-01-19 02:36:22.000000000 -0800
++++ docbook-xsl-1.69.1/fo/lists.xsl 2006-01-19 02:34:54.000000000 -0800
+@@ -125,9 +130,18 @@
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
-- <fo:block>
++ <xsl:choose>
++ <xsl:when test="child::*[1][local-name()='para' or
++ local-name()='simpara' or
++ local-name()='formalpara']">
++ <xsl:apply-templates/>
++ </xsl:when>
++ <xsl:otherwise>
+ <fo:block>
- <xsl:apply-templates/>
-- </fo:block>
-+ <xsl:choose>
-+ <xsl:when test="child::*[1][local-name()='para' or
-+ local-name()='simpara' or
-+ local-name()='formalpara']">
-+ <xsl:apply-templates/>
-+ </xsl:when>
-+ <xsl:otherwise>
-+ <fo:block>
-+ <xsl:apply-templates/>
-+ </fo:block>
-+ </xsl:otherwise>
-+ </xsl:choose>
++ <xsl:apply-templates/>
+ </fo:block>
++ </xsl:otherwise>
++ </xsl:choose>
</fo:list-item-body>
</xsl:variable>
-@@ -288,9 +297,18 @@
+@@ -287,9 +301,18 @@
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
-- <fo:block>
++ <xsl:choose>
++ <xsl:when test="child::*[1][local-name()='para' or
++ local-name()='simpara' or
++ local-name()='formalpara']">
++ <xsl:apply-templates/>
++ </xsl:when>
++ <xsl:otherwise>
+ <fo:block>
- <xsl:apply-templates/>
-- </fo:block>
-+ <xsl:choose>
-+ <xsl:when test="child::*[1][local-name()='para' or
-+ local-name()='simpara' or
-+ local-name()='formalpara']">
-+ <xsl:apply-templates/>
-+ </xsl:when>
-+ <xsl:otherwise>
-+ <fo:block>
-+ <xsl:apply-templates/>
-+ </fo:block>
-+ </xsl:otherwise>
-+ </xsl:choose>
++ <xsl:apply-templates/>
+ </fo:block>
++ </xsl:otherwise>
++ </xsl:choose>
</fo:list-item-body>
</xsl:variable>
+@@ -486,9 +509,18 @@
+ </fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
++ <xsl:choose>
++ <xsl:when test="child::*[1][local-name()='para' or
++ local-name()='simpara' or
++ local-name()='formalpara']">
++ <xsl:apply-templates/>
++ </xsl:when>
++ <xsl:otherwise>
+ <fo:block>
+- <xsl:apply-templates select="listitem"/>
++ <xsl:apply-templates/>
+ </fo:block>
++ </xsl:otherwise>
++ </xsl:choose>
+ </fo:list-item-body>
+ </fo:list-item>
+ </xsl:template>
+@@ -906,9 +938,18 @@
+ </fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
++ <xsl:choose>
++ <xsl:when test="child::*[1][local-name()='para' or
++ local-name()='simpara' or
++ local-name()='formalpara']">
++ <xsl:apply-templates/>
++ </xsl:when>
++ <xsl:otherwise>
+ <fo:block>
+- <xsl:apply-templates/>
++ <xsl:apply-templates/>
+ </fo:block>
++ </xsl:otherwise>
++ </xsl:choose>
+ </fo:list-item-body>
+ </fo:list-item>
+ </xsl:template>
+@@ -932,9 +973,18 @@
+ </fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
++ <xsl:choose>
++ <xsl:when test="child::*[1][local-name()='para' or
++ local-name()='simpara' or
++ local-name()='formalpara']">
++ <xsl:apply-templates/>
++ </xsl:when>
++ <xsl:otherwise>
+ <fo:block>
+- <xsl:apply-templates/>
++ <xsl:apply-templates/>
+ </fo:block>
++ </xsl:otherwise>
++ </xsl:choose>
+ </fo:list-item-body>
+ </fo:list-item>
+ </xsl:template>
+@@ -1112,10 +1162,19 @@
+ </fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
++ <xsl:choose>
++ <xsl:when test="child::*[1][local-name()='para' or
++ local-name()='simpara' or
++ local-name()='formalpara']">
++ <xsl:apply-templates/>
++ </xsl:when>
++ <xsl:otherwise>
+ <fo:block>
+- <xsl:apply-templates/>
++ <xsl:apply-templates/>
+ </fo:block>
+- </fo:list-item-body>
++ </xsl:otherwise>
++ </xsl:choose>
++ </fo:list-item-body>
+ </fo:list-item>
+ </xsl:template>
More information about the fedora-cvs-commits
mailing list