From eb2f94a355ff5b8abb630ae9a66cefb59b3c930d Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Mon, 3 Dec 2007 15:36:43 +0000
Subject: [PATCH] use changes from pagesetup.xsl patch only for
 passivetex.extensions set to     1

---
 docbook-style-xsl.spec      |   6 +-
 docbook-xsl-pagesetup.patch | 286 +++++++++++++++++++++++++++---------
 2 files changed, 225 insertions(+), 67 deletions(-)

diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index a74ed00..98f414f 100644
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -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 @@ CATALOG=%{_sysconfdir}/xml/catalog
 
 
 %changelog
+* Mon Dec 03 2007 Ondrej Vasik <ovasik@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@redhat.com> 1.73.2-5
 - convert all html files in doc to UTF-8 in prep
   (latest rpmlint gives warnings)
diff --git a/docbook-xsl-pagesetup.patch b/docbook-xsl-pagesetup.patch
index d7b6cd5..f7fa3a4 100644
--- a/docbook-xsl-pagesetup.patch
+++ b/docbook-xsl-pagesetup.patch
@@ -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">
+
+-      <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: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: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: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: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: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>
+-        </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">
+-          <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>
+-      <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>