rpms/docbook-style-xsl/devel docbook-style-xsl.spec, 1.42, 1.43 docbook-xsl-pagesetup.patch, 1.1, 1.2
Ondrej Vasik (ovasik)
fedora-extras-commits at redhat.com
Mon Dec 3 15:37:17 UTC 2007
- Previous message (by thread): rpms/warzone2100/devel warzone2100-2.0.8.fixsound.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 warzone2100.spec, 1.13, 1.14
- Next message (by thread): rpms/kcbench/devel kcbench-ChangeLog, NONE, 1.1 kcbench-manpage, NONE, 1.1 kcbench, 1.2, 1.3 kcbench-README, 1.1, 1.2 kcbench.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ovasik
Update of /cvs/extras/rpms/docbook-style-xsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24099
Modified Files:
docbook-style-xsl.spec docbook-xsl-pagesetup.patch
Log Message:
use changes from pagesetup.xsl patch only for passivetex.extensions set to 1
Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- docbook-style-xsl.spec 29 Nov 2007 09:38:16 -0000 1.42
+++ docbook-style-xsl.spec 3 Dec 2007 15:36:43 -0000 1.43
@@ -1,6 +1,6 @@
Name: docbook-style-xsl
Version: 1.73.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -110,6 +110,10 @@
%changelog
+* Mon Dec 03 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-6
+- fixed docbook-xsl-pagesetup.patch to follow Norman Walsh's
+ documentation for nonpassivetex processing(#307001)
+
* Tue Nov 27 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-5
- convert all html files in doc to UTF-8 in prep
(latest rpmlint gives warnings)
docbook-xsl-pagesetup.patch:
Index: docbook-xsl-pagesetup.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-xsl-pagesetup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docbook-xsl-pagesetup.patch 3 Jan 2006 13:47:31 -0000 1.1
+++ docbook-xsl-pagesetup.patch 3 Dec 2007 15:36:43 -0000 1.2
@@ -1,74 +1,228 @@
---- docbook-xsl-1.69.1/fo/pagesetup.xsl.orig 2005-12-10 14:08:28.000000000 -0600
-+++ docbook-xsl-1.69.1/fo/pagesetup.xsl 2006-01-01 19:49:28.000000000 -0600
-@@ -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 @@
+diff -urp docbook-xsl-1.73.2-orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pagesetup.xsl
+--- docbook-xsl-1.73.2-orig/fo/pagesetup.xsl 2007-12-03 14:54:28.000000000 +0100
++++ docbook-xsl-1.73.2/fo/pagesetup.xsl 2007-12-03 15:24:32.000000000 +0100
+@@ -1679,37 +1679,82 @@
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </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">header</xsl:with-param>
+- <xsl:with-param name="position" select="$column1"/>
+- </xsl:call-template>
+- <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: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:attribute>
+- </fo:table-column>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="1">
++ <xsl:attribute name="column-width">
++ <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:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <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:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="2">
++ <xsl:attribute name="column-width">
++ <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:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <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:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="3">
++ <xsl:attribute name="column-width">
++ <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:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <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:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
+
+ <fo:table-body>
+ <fo:table-row>
+ <xsl:attribute name="block-progression-dimension.minimum">
+@@ -2003,36 +2046,81 @@
+ <xsl:with-param name="sequence" select="$sequence"/>
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
</xsl:call-template>
- <fo:table-column column-number="1">
- <xsl:attribute name="column-width">
+- <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>
+- <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: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: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:attribute>
+- </fo:table-column>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="1">
++ <xsl:attribute name="column-width">
++ <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:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <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:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="2">
++ <xsl:attribute name="column-width">
++ <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:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <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:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="3">
++ <xsl:attribute name="column-width">
++ <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:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <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:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
+ <fo:table-body>
+ <fo:table-row>
- Previous message (by thread): rpms/warzone2100/devel warzone2100-2.0.8.fixsound.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 warzone2100.spec, 1.13, 1.14
- Next message (by thread): rpms/kcbench/devel kcbench-ChangeLog, NONE, 1.1 kcbench-manpage, NONE, 1.1 kcbench, 1.2, 1.3 kcbench-README, 1.1, 1.2 kcbench.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list