rpms/docbook-style-xsl/FC-4 docbook-xsl-lists.patch, NONE, 1.1 docbook-xsl-pagesetup.patch, NONE, 1.1 docbook-style-xsl.spec, 1.17, 1.18
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 20 12:24:36 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/docbook-style-xsl/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31136
Modified Files:
docbook-style-xsl.spec
Added Files:
docbook-xsl-lists.patch docbook-xsl-pagesetup.patch
Log Message:
* Fri Jan 20 2006 Tim Waugh <twaugh at redhat.com> 1.68.1-1.1
- Fix lists blocking (bug #161371).
- Avoid proportional-column-width for passivetex (bug #176766).
docbook-xsl-lists.patch:
lists.xsl | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 7 deletions(-)
--- NEW FILE docbook-xsl-lists.patch ---
--- docbook-xsl-1.68.1/fo/lists.xsl.lists 2006-01-20 12:14:09.000000000 +0000
+++ docbook-xsl-1.68.1/fo/lists.xsl 2006-01-20 12:15:02.000000000 +0000
@@ -125,9 +125,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>
</xsl:variable>
@@ -287,9 +296,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>
</xsl:variable>
@@ -486,9 +504,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 +933,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 +968,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 +1157,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>
docbook-xsl-pagesetup.patch:
pagesetup.xsl | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
--- NEW FILE docbook-xsl-pagesetup.patch ---
--- docbook-xsl-1.68.1/fo/pagesetup.xsl.pagesetup 2006-01-20 12:18:13.000000000 +0000
+++ docbook-xsl-1.68.1/fo/pagesetup.xsl 2006-01-20 12:22:08.000000000 +0000
@@ -1491,32 +1491,29 @@
<fo:table-column column-number="1">
<xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width">
<xsl:with-param name="location">header</xsl:with-param>
<xsl:with-param name="position" select="$column1"/>
</xsl:call-template>
- <xsl:text>)</xsl:text>
+ <xsl:text>%</xsl:text>
</xsl:attribute>
</fo:table-column>
<fo:table-column column-number="2">
<xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width">
<xsl:with-param name="location">header</xsl:with-param>
<xsl:with-param name="position" select="2"/>
</xsl:call-template>
- <xsl:text>)</xsl:text>
+ <xsl:text>%</xsl:text>
</xsl:attribute>
</fo:table-column>
<fo:table-column column-number="3">
<xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width">
<xsl:with-param name="location">header</xsl:with-param>
<xsl:with-param name="position" select="$column3"/>
</xsl:call-template>
- <xsl:text>)</xsl:text>
+ <xsl:text>%</xsl:text>
</xsl:attribute>
</fo:table-column>
@@ -1812,32 +1809,29 @@
</xsl:call-template>
<fo:table-column column-number="1">
<xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width">
<xsl:with-param name="location">footer</xsl:with-param>
<xsl:with-param name="position" select="$column1"/>
</xsl:call-template>
- <xsl:text>)</xsl:text>
+ <xsl:text>%</xsl:text>
</xsl:attribute>
</fo:table-column>
<fo:table-column column-number="2">
<xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width">
<xsl:with-param name="location">footer</xsl:with-param>
<xsl:with-param name="position" select="2"/>
</xsl:call-template>
- <xsl:text>)</xsl:text>
+ <xsl:text>%</xsl:text>
</xsl:attribute>
</fo:table-column>
<fo:table-column column-number="3">
<xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width">
<xsl:with-param name="location">footer</xsl:with-param>
<xsl:with-param name="position" select="$column3"/>
</xsl:call-template>
- <xsl:text>)</xsl:text>
+ <xsl:text>%</xsl:text>
</xsl:attribute>
</fo:table-column>
Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-style-xsl/FC-4/docbook-style-xsl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- docbook-style-xsl.spec 14 Feb 2005 15:24:11 -0000 1.17
+++ docbook-style-xsl.spec 20 Jan 2006 12:24:33 -0000 1.18
@@ -1,6 +1,6 @@
Name: docbook-style-xsl
Version: 1.68.1
-Release: 1
+Release: 1.1
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -21,7 +21,9 @@
Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.bz2
Source1: %{name}.Makefile
+Patch1: docbook-xsl-pagesetup.patch
Patch2: docbook-xsl-marginleft.patch
+Patch3: docbook-xsl-lists.patch
%description
@@ -31,7 +33,9 @@
%prep
%setup -q -n docbook-xsl-%{version}
+%patch1 -p1 -b .pagesetup
%patch2 -p1 -b .marginleft
+%patch3 -p1 -b .lists
cp %{SOURCE1} Makefile
for f in $(find -name "*'*")
do
@@ -91,6 +95,10 @@
%changelog
+* Fri Jan 20 2006 Tim Waugh <twaugh at redhat.com> 1.68.1-1.1
+- Fix lists blocking (bug #161371).
+- Avoid proportional-column-width for passivetex (bug #176766).
+
* Mon Feb 14 2005 Tim Waugh <twaugh at redhat.com> 1.68.1-1
- 1.68.1.
More information about the fedora-cvs-commits
mailing list