rpms/docbook-style-xsl/devel docbook-xsl-pagesetup.patch, NONE, 1.1 docbook-style-xsl.spec, 1.20, 1.21

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/docbook-style-xsl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23527

Modified Files:
	docbook-style-xsl.spec 
Added Files:
	docbook-xsl-pagesetup.patch 
Log Message:
* Tue Jan  3 2006 Tim Waugh <twaugh at redhat.com>
- Avoid proportional-column-width for passivetex (bug #176766).


docbook-xsl-pagesetup.patch:
 pagesetup.xsl |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

--- NEW FILE docbook-xsl-pagesetup.patch ---
--- 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 @@
       </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/devel/docbook-style-xsl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- docbook-style-xsl.spec	9 Dec 2005 22:40:14 -0000	1.20
+++ docbook-style-xsl.spec	3 Jan 2006 13:47:31 -0000	1.21
@@ -22,6 +22,7 @@
 Source1: %{name}.Makefile
 Source2: http://prdownloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2
 
+Patch1: docbook-xsl-pagesetup.patch
 Patch2: docbook-xsl-marginleft.patch
 
 
@@ -35,6 +36,7 @@
 pushd ..
 tar jxf %{SOURCE2}
 popd
+%patch1 -p1 -b .pagesetup
 %patch2 -p1 -b .marginleft
 cp %{SOURCE1} Makefile
 for f in $(find -name "*'*")
@@ -94,6 +96,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Tim Waugh <twaugh at redhat.com>
+- Avoid proportional-column-width for passivetex (bug #176766).
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt