From 5b5cbb02c6a1864cfd111eea26bbae6503ea26b3 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Sep 11 2008 10:18:29 +0000
Subject: tiny changes in docbook-xsl-newmethods.patch to work with xalan (#461463)


---

diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index f890e77..905d23a 100644
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.73.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -117,6 +117,11 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Thu Sep 11 2008 Kamil Dudka <kdudka@redhat.com> 1.73.2-10
+- tiny changes in docbook-xsl-newmethods.patch to work with xalan
+  (#461463)
+- rediffed all patches
+
 * Fri Dec 14 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-9
 - added fixes for passivetex extension and list-item-body
   (#161371)
diff --git a/docbook-xsl-list-item-body.patch b/docbook-xsl-list-item-body.patch
index d3d72a3..de21966 100644
--- a/docbook-xsl-list-item-body.patch
+++ b/docbook-xsl-list-item-body.patch
@@ -1,6 +1,6 @@
-diff -urNp docbook-xsl-1.73.2-orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
---- docbook-xsl-1.73.2-orig/fo/lists.xsl	2007-12-14 12:27:58.000000000 +0100
-+++ docbook-xsl-1.73.2/fo/lists.xsl	2007-12-14 12:43:25.000000000 +0100
+diff -ruNp docbook-xsl-1.73.2.orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
+--- docbook-xsl-1.73.2.orig/fo/lists.xsl	2008-09-11 11:06:31.000000000 +0200
++++ docbook-xsl-1.73.2/fo/lists.xsl	2008-09-11 11:07:40.000000000 +0200
 @@ -286,9 +286,17 @@
        </fo:block>
      </fo:list-item-label>
diff --git a/docbook-xsl-marginleft.patch b/docbook-xsl-marginleft.patch
index 7ae08ae..c729add 100644
--- a/docbook-xsl-marginleft.patch
+++ b/docbook-xsl-marginleft.patch
@@ -1,40 +1,7 @@
---- docbook-xsl-1.68.0/fo/pagesetup.xsl.marginleft	2005-02-09 12:09:37.000000000 +0000
-+++ docbook-xsl-1.68.0/fo/pagesetup.xsl	2005-02-09 14:53:59.088068221 +0000
-@@ -34,29 +34,11 @@
-      margin-left="{$page.margin.outer} - {$title.margin.left}"
- -->
- <xsl:param name="margin.left.outer">
--  <xsl:choose>
--    <xsl:when test="$passivetex.extensions != 0">
--      <xsl:value-of select="$page.margin.outer"/>
--    </xsl:when>
--    <xsl:otherwise>
--      <xsl:value-of select="$page.margin.outer"/>
--      <xsl:text> - </xsl:text>
--      <xsl:value-of select="$title.margin.left"/>
--    </xsl:otherwise>
--  </xsl:choose>
-+  <xsl:value-of select="$page.margin.outer"/>
- </xsl:param>
- 
- <xsl:param name="margin.left.inner">
--  <xsl:choose>
--    <xsl:when test="$passivetex.extensions != 0">
--      <xsl:value-of select="$page.margin.inner"/>
--    </xsl:when>
--    <xsl:otherwise>
--      <xsl:value-of select="$page.margin.inner"/>
--      <xsl:text> - </xsl:text>
--      <xsl:value-of select="$title.margin.left"/>
--    </xsl:otherwise>
--  </xsl:choose>
-+  <xsl:value-of select="$page.margin.inner"/>
- </xsl:param>
- 
- <xsl:template name="setup.pagemasters">
---- docbook-xsl-1.68.0/fo/lists.xsl.marginleft	2005-02-09 12:09:37.000000000 +0000
-+++ docbook-xsl-1.68.0/fo/lists.xsl	2005-02-09 14:55:06.682138599 +0000
-@@ -371,7 +371,7 @@
+diff -ruNp docbook-xsl-1.73.2.orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
+--- docbook-xsl-1.73.2.orig/fo/lists.xsl	2007-07-07 10:15:39.000000000 +0200
++++ docbook-xsl-1.73.2/fo/lists.xsl	2008-09-11 10:52:43.000000000 +0200
+@@ -362,7 +362,7 @@
        </xsl:when>
        <xsl:when test="@termlength">
          <xsl:variable name="termlength.is.number">
@@ -42,8 +9,8 @@
 +          <xsl:value-of select="@termlength"/>
          </xsl:variable>
          <xsl:choose>
-           <xsl:when test="$termlength.is.number = 'NaN'">
-@@ -380,15 +380,7 @@
+           <xsl:when test="string($termlength.is.number) = 'NaN'">
+@@ -371,15 +371,7 @@
            </xsl:when>
            <xsl:otherwise>
              <xsl:value-of select="@termlength"/>
@@ -60,7 +27,7 @@
            </xsl:otherwise>
          </xsl:choose>
        </xsl:when>
-@@ -397,15 +389,7 @@
+@@ -388,15 +380,7 @@
            <xsl:with-param name="terms" select="varlistentry/term"/>
            <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
          </xsl:call-template>
@@ -77,7 +44,7 @@
        </xsl:otherwise>
      </xsl:choose>
    </xsl:variable>
-@@ -419,17 +403,7 @@
+@@ -410,17 +394,7 @@
  
    <xsl:variable name="label-separation">1em</xsl:variable>
    <xsl:variable name="distance-between-starts">
@@ -96,9 +63,45 @@
    </xsl:variable>
  
    <xsl:if test="title">
---- docbook-xsl-1.68.0/fo/param.xsl.marginleft	2005-02-09 12:20:55.000000000 +0000
-+++ docbook-xsl-1.68.0/fo/param.xsl	2005-02-09 14:53:59.115063057 +0000
-@@ -95,8 +95,8 @@
+diff -ruNp 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	2008-09-11 10:50:36.000000000 +0200
++++ docbook-xsl-1.73.2/fo/pagesetup.xsl	2008-09-11 10:52:43.000000000 +0200
+@@ -34,29 +34,11 @@
+      margin-left="{$page.margin.outer} - {$title.margin.left}"
+ -->
+ <xsl:param name="margin.left.outer">
+-  <xsl:choose>
+-    <xsl:when test="$passivetex.extensions != 0">
+-      <xsl:value-of select="$page.margin.outer"/>
+-    </xsl:when>
+-    <xsl:otherwise>
+-      <xsl:value-of select="$page.margin.outer"/>
+-      <xsl:text> - </xsl:text>
+-      <xsl:value-of select="$title.margin.left"/>
+-    </xsl:otherwise>
+-  </xsl:choose>
++  <xsl:value-of select="$page.margin.outer"/>
+ </xsl:param>
+ 
+ <xsl:param name="margin.left.inner">
+-  <xsl:choose>
+-    <xsl:when test="$passivetex.extensions != 0">
+-      <xsl:value-of select="$page.margin.inner"/>
+-    </xsl:when>
+-    <xsl:otherwise>
+-      <xsl:value-of select="$page.margin.inner"/>
+-      <xsl:text> - </xsl:text>
+-      <xsl:value-of select="$title.margin.left"/>
+-    </xsl:otherwise>
+-  </xsl:choose>
++  <xsl:value-of select="$page.margin.inner"/>
+ </xsl:param>
+ 
+ <xsl:template name="setup.pagemasters">
+diff -ruNp docbook-xsl-1.73.2.orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
+--- docbook-xsl-1.73.2.orig/fo/param.xsl	2007-08-30 15:43:12.000000000 +0200
++++ docbook-xsl-1.73.2/fo/param.xsl	2008-09-11 10:52:43.000000000 +0200
+@@ -133,8 +133,8 @@
  <xsl:attribute-set name="component.title.properties">
    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
    <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
@@ -107,5 +110,5 @@
 +  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
 +  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
    <xsl:attribute name="hyphenate">false</xsl:attribute>
-   <xsl:attribute name="start-indent">0pt</xsl:attribute>
- </xsl:attribute-set>
+   <xsl:attribute name="text-align">
+     <xsl:choose>
diff --git a/docbook-xsl-newmethods.patch b/docbook-xsl-newmethods.patch
index fe95dca..eb49b9c 100644
--- a/docbook-xsl-newmethods.patch
+++ b/docbook-xsl-newmethods.patch
@@ -1,6 +1,6 @@
-diff -urNp docbook-xsl-1.72.0/html/docbook.xsl devel/html/docbook.xsl
---- docbook-xsl-1.72.0/html/docbook.xsl	2007-01-21 18:39:03.000000000 +0100
-+++ devel/html/docbook.xsl	2007-06-18 13:19:45.000000000 +0200
+diff -ruNp docbook-xsl-1.73.2.orig/html/docbook.xsl docbook-xsl-1.73.2/html/docbook.xsl
+--- docbook-xsl-1.73.2.orig/html/docbook.xsl	2007-08-09 09:48:42.000000000 +0200
++++ docbook-xsl-1.73.2/html/docbook.xsl	2008-09-11 10:54:26.000000000 +0200
 @@ -25,6 +25,7 @@
  <xsl:include href="../VERSION"/>
  <xsl:include href="param.xsl"/>
@@ -8,8 +8,8 @@ diff -urNp docbook-xsl-1.72.0/html/docbook.xsl devel/html/docbook.xsl
 +<xsl:include href="../lib/dumpfragment.xsl"/>
  <xsl:include href="../common/l10n.xsl"/>
  <xsl:include href="../common/common.xsl"/>
- <xsl:include href="../common/labels.xsl"/>
-@@ -42,6 +43,7 @@
+ <xsl:include href="../common/utility.xsl"/>
+@@ -43,6 +44,7 @@
  <xsl:include href="graphics.xsl"/>
  <xsl:include href="xref.xsl"/>
  <xsl:include href="formal.xsl"/>
@@ -17,10 +17,10 @@ diff -urNp docbook-xsl-1.72.0/html/docbook.xsl devel/html/docbook.xsl
  <xsl:include href="table.xsl"/>
  <xsl:include href="htmltbl.xsl"/>
  <xsl:include href="sections.xsl"/>
-diff -urNp docbook-xsl-1.72.0/html/dtbl.xsl devel/html/dtbl.xsl
---- docbook-xsl-1.72.0/html/dtbl.xsl	1970-01-01 01:00:00.000000000 +0100
-+++ devel/html/dtbl.xsl	2007-06-18 14:00:05.000000000 +0200
-@@ -0,0 +1,292 @@
+diff -ruNp docbook-xsl-1.73.2.orig/html/dtbl.xsl docbook-xsl-1.73.2/html/dtbl.xsl
+--- docbook-xsl-1.73.2.orig/html/dtbl.xsl	1970-01-01 01:00:00.000000000 +0100
++++ docbook-xsl-1.73.2/html/dtbl.xsl	2008-09-11 10:55:42.000000000 +0200
+@@ -0,0 +1,293 @@
 +<?xml version="1.0" encoding="US-ASCII"?>
 +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 +                xmlns:exsl="http://exslt.org/common"
@@ -201,11 +201,12 @@ diff -urNp docbook-xsl-1.72.0/html/dtbl.xsl devel/html/dtbl.xsl
 +</xsl:template>
 +
 +<xsl:template match="col" mode="dtbl-correct-rounding-error">
++  <xsl:param name="relative.widths.total"/>
 +  <xsl:param name="error"/>
 +
 +  <xsl:element name="col">
 +    <xsl:attribute name="width">
-+      <xsl:value-of select="concat(round((@relwidth div $relative.widths.total) * 100))"/>
++      <xsl:value-of select="concat('', round((@relwidth div $relative.widths.total) * 100))"/>
 +    </xsl:attribute>
 +    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
 +  </xsl:element>
@@ -313,23 +314,20 @@ diff -urNp docbook-xsl-1.72.0/html/dtbl.xsl devel/html/dtbl.xsl
 +</xsl:template>
 +
 +</xsl:stylesheet>
-diff -urNp docbook-xsl-1.72.0/html/param.xsl devel/html/param.xsl
---- docbook-xsl-1.72.0/html/param.xsl	2007-01-23 13:33:37.000000000 +0100
-+++ devel/html/param.xsl	2007-06-18 13:26:41.000000000 +0200
+diff -ruNp docbook-xsl-1.73.2.orig/html/param.xsl docbook-xsl-1.73.2/html/param.xsl
+--- docbook-xsl-1.73.2.orig/html/param.xsl	2007-08-30 15:43:10.000000000 +0200
++++ docbook-xsl-1.73.2/html/param.xsl	2008-09-11 10:54:26.000000000 +0200
 @@ -64,6 +64,7 @@ div.annotation-close { position: absolut
-                       right: 2px;
-                     }
+                      }
  </xsl:param>
-
+ 
 +<xsl:param name="adjustColumnWidths.debug" select="false()"/>
  <xsl:param name="annotation.js">
  <xsl:text>http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param>
  
- <xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param>
- <xsl:param name="annotation.graphic.close">
-diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl
---- docbook-xsl-1.72.0/html/table.xsl	2006-12-06 10:28:33.000000000 +0100
-+++ devel/html/table.xsl	2007-06-18 13:30:00.000000000 +0200
+diff -ruNp docbook-xsl-1.73.2.orig/html/table.xsl docbook-xsl-1.73.2/html/table.xsl
+--- docbook-xsl-1.73.2.orig/html/table.xsl	2007-07-12 02:28:40.000000000 +0200
++++ docbook-xsl-1.73.2/html/table.xsl	2008-09-11 10:54:26.000000000 +0200
 @@ -5,7 +5,8 @@
                  xmlns:xtbl="xalan://com.nwalsh.xalan.Table"
                  xmlns:lxslt="http://xml.apache.org/xslt"
@@ -340,7 +338,7 @@ diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl
                  version='1.0'>
  
  <xsl:include href="../common/table.xsl"/>
-@@ -373,6 +374,9 @@
+@@ -364,6 +365,9 @@
            <xsl:when test="$use.extensions != 0
                            and $tablecolumns.extension != 0">
              <xsl:choose>
@@ -350,7 +348,7 @@ diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl
                <xsl:when test="function-available('stbl:convertLength')">
                  <xsl:value-of select="stbl:convertLength($table.width)"/>
                </xsl:when>
-@@ -397,6 +401,9 @@
+@@ -388,6 +392,9 @@
        <xsl:when test="$use.extensions != 0
                        and $tablecolumns.extension != 0">
          <xsl:choose>
@@ -360,9 +358,9 @@ diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl
            <xsl:when test="function-available('stbl:adjustColumnWidths')">
              <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
            </xsl:when>
-diff -urNp docbook-xsl-1.72.0/lib/dumpfragment.xsl devel/lib/dumpfragment.xsl
---- docbook-xsl-1.72.0/lib/dumpfragment.xsl	1970-01-01 01:00:00.000000000 +0100
-+++ devel/lib/dumpfragment.xsl	2007-06-18 14:00:52.000000000 +0200
+diff -ruNp docbook-xsl-1.73.2.orig/lib/dumpfragment.xsl docbook-xsl-1.73.2/lib/dumpfragment.xsl
+--- docbook-xsl-1.73.2.orig/lib/dumpfragment.xsl	1970-01-01 01:00:00.000000000 +0100
++++ docbook-xsl-1.73.2/lib/dumpfragment.xsl	2008-09-11 10:54:26.000000000 +0200
 @@ -0,0 +1,30 @@
 +<?xml version="1.0" encoding="US-ASCII"?>
 +<xsl:stylesheet version="1.0"
diff --git a/docbook-xsl-non-constant-expressions.patch b/docbook-xsl-non-constant-expressions.patch
index 53db07e..4bd9374 100644
--- a/docbook-xsl-non-constant-expressions.patch
+++ b/docbook-xsl-non-constant-expressions.patch
@@ -1,6 +1,6 @@
-diff -ur docbook-xsl-1.73.2-orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
---- docbook-xsl-1.73.2-orig/fo/param.xsl	2007-12-03 15:49:14.000000000 +0100
-+++ docbook-xsl-1.73.2/fo/param.xsl	2007-12-04 15:49:46.000000000 +0100
+diff -ruNp docbook-xsl-1.73.2.orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
+--- docbook-xsl-1.73.2.orig/fo/param.xsl	2008-09-11 11:06:31.000000000 +0200
++++ docbook-xsl-1.73.2/fo/param.xsl	2008-09-11 11:07:06.000000000 +0200
 @@ -23,8 +23,8 @@
    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
@@ -12,7 +12,7 @@ diff -ur docbook-xsl-1.73.2-orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
    <xsl:attribute name="hyphenate">false</xsl:attribute>
    <xsl:attribute name="text-align">center</xsl:attribute>
  </xsl:attribute-set>
-@@ -331,8 +331,8 @@
+@@ -331,8 +331,8 @@ set       toc,title
    <xsl:attribute name="font-weight">bold</xsl:attribute>
    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
    <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master,'pt')"/></xsl:attribute>
diff --git a/docbook-xsl-pagesetup.patch b/docbook-xsl-pagesetup.patch
index f7fa3a4..11eb122 100644
--- a/docbook-xsl-pagesetup.patch
+++ b/docbook-xsl-pagesetup.patch
@@ -1,10 +1,10 @@
-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 @@
+diff -ruNp 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-06-29 01:23:31.000000000 +0200
++++ docbook-xsl-1.73.2/fo/pagesetup.xsl	2008-09-11 10:50:36.000000000 +0200
+@@ -1697,36 +1697,81 @@
          <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>
@@ -110,11 +110,10 @@ diff -urp docbook-xsl-1.73.2-orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pageset
 +          </fo:table-column>
 +        </xsl:otherwise>
 +      </xsl:choose>
-
+ 
        <fo:table-body>
          <fo:table-row>
-           <xsl:attribute name="block-progression-dimension.minimum">
-@@ -2003,36 +2046,81 @@
+@@ -2021,36 +2066,81 @@
          <xsl:with-param name="sequence" select="$sequence"/>
          <xsl:with-param name="gentext-key" select="$gentext-key"/>
        </xsl:call-template>