From 2ada51e5efeec11ad153148e33c373468b2d3a48 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 2 Nov 2004 17:14:17 +0000
Subject: [PATCH] - 1.66.1 (bug #133586).

---
 .cvsignore                   |  1 +
 docbook-style-xsl.spec       |  7 ++++--
 docbook-xsl-marginleft.patch | 42 +++++++++++++++++++++---------------
 sources                      |  2 +-
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 7d29213..d75cc42 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 docbook-xsl-1.65.1.tar.gz
+docbook-xsl-1.66.1.tar.gz
diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index 12fa1be..163891d 100644
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
-Version: 1.65.1
-Release: 2
+Version: 1.66.1
+Release: 1
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -93,6 +93,9 @@ CATALOG=/etc/xml/catalog
 
 
 %changelog
+* Tue Nov  2 2004 Tim Waugh <twaugh@redhat.com> 1.66.1-1
+- 1.66.1 (bug #133586).
+
 * Fri Jun  4 2004 Tim Waugh <twaugh@redhat.com> 1.65.1-2
 - Fix strange filenames (bug #125311).
 
diff --git a/docbook-xsl-marginleft.patch b/docbook-xsl-marginleft.patch
index 9850e55..49cb61a 100644
--- a/docbook-xsl-marginleft.patch
+++ b/docbook-xsl-marginleft.patch
@@ -1,5 +1,5 @@
---- docbook-xsl-1.64.1/fo/pagesetup.xsl.marginleft	2003-12-17 00:57:36.000000000 +0000
-+++ docbook-xsl-1.64.1/fo/pagesetup.xsl	2004-01-18 16:29:32.000000000 +0000
+--- docbook-xsl-1.66.1/fo/pagesetup.xsl.marginleft	2004-09-02 05:13:53.000000000 +0100
++++ docbook-xsl-1.66.1/fo/pagesetup.xsl	2004-11-02 17:08:30.350296912 +0000
 @@ -34,29 +34,11 @@
       margin-left="{$page.margin.outer} - {$title.margin.left}"
  -->
@@ -32,9 +32,9 @@
  </xsl:param>
  
  <xsl:template name="setup.pagemasters">
---- docbook-xsl-1.64.1/fo/lists.xsl.marginleft	2003-12-04 20:13:46.000000000 +0000
-+++ docbook-xsl-1.64.1/fo/lists.xsl	2004-01-18 16:31:51.000000000 +0000
-@@ -303,7 +303,7 @@
+--- docbook-xsl-1.66.1/fo/lists.xsl.marginleft	2004-08-14 09:33:19.000000000 +0100
++++ docbook-xsl-1.66.1/fo/lists.xsl	2004-11-02 17:11:16.236642694 +0000
+@@ -350,7 +350,7 @@
        </xsl:when>
        <xsl:when test="@termlength">
          <xsl:variable name="termlength.is.number">
@@ -43,7 +43,7 @@
          </xsl:variable>
          <xsl:choose>
            <xsl:when test="$termlength.is.number = 'NaN'">
-@@ -312,7 +312,7 @@
+@@ -359,7 +359,7 @@
            </xsl:when>
            <xsl:otherwise>
              <xsl:value-of select="@termlength"/>
@@ -52,7 +52,7 @@
            </xsl:otherwise>
          </xsl:choose>
        </xsl:when>
-@@ -321,7 +321,7 @@
+@@ -368,7 +368,7 @@
            <xsl:with-param name="terms" select="varlistentry/term"/>
            <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
          </xsl:call-template>
@@ -61,13 +61,21 @@
        </xsl:otherwise>
      </xsl:choose>
    </xsl:variable>
-@@ -348,8 +348,7 @@
-             |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
- 
-   <fo:list-block id="{$id}"
--                 provisional-distance-between-starts=
--                    "{$termlength}+{$label-separation}"
-+                 provisional-distance-between-starts="{$termlength}"
-                  provisional-label-separation="{$label-separation}"
-                  xsl:use-attribute-sets="list.block.spacing">
-     <xsl:apply-templates mode="vl.as.list"
+@@ -406,7 +406,7 @@
+     <xsl:when test="ancestor::listitem">
+       <fo:list-block id="{$id}"
+                      provisional-distance-between-starts=
+-                        "{$termlength}+{$label-separation}"
++                        "{$termlength}"
+                      provisional-label-separation="{$label-separation}">
+         <xsl:copy-of select="$content"/>
+       </fo:list-block>
+@@ -414,7 +414,7 @@
+     <xsl:otherwise>
+       <fo:list-block id="{$id}"
+                      provisional-distance-between-starts=
+-                        "{$termlength}+{$label-separation}"
++                        "{$termlength}"
+                      provisional-label-separation="{$label-separation}"
+                      xsl:use-attribute-sets="list.block.spacing">
+         <xsl:copy-of select="$content"/>
diff --git a/sources b/sources
index eed2afe..8d0f4ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f7d446de5523ec34a19ccbe8caf387f  docbook-xsl-1.65.1.tar.gz
+a04dc6c8b4a9dc3a6ec05e033ff3e3d7  docbook-xsl-1.66.1.tar.gz