rpms/docbook-style-xsl/devel docbook-xsl-lists.patch, NONE, 1.1 docbook-style-xsl.spec, 1.21, 1.22

[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-serv25129

Modified Files:
	docbook-style-xsl.spec 
Added Files:
	docbook-xsl-lists.patch 
Log Message:
* Tue Jan  3 2006 Tim Waugh <twaugh at redhat.com>
- Patches from W. Michael Petullo:
  - Fix lists blocking (bug #161371).

docbook-xsl-lists.patch:
 lists.xsl |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

--- NEW FILE docbook-xsl-lists.patch ---
--- docbook-xsl-1.69.1/fo/lists.xsl.orig	2006-01-01 20:00:44.000000000 -0600
+++ docbook-xsl-1.69.1/fo/lists.xsl	2006-01-01 20:01:54.000000000 -0600
@@ -125,9 +125,18 @@
       </fo:block>
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
+      <xsl:choose>
+        <xsl:when test="child::*[1][local-name()='para' or
+                                    local-name()='simpara' or
+                                    local-name()='formalpara']">
+          <xsl:apply-templates/>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block>
+            <xsl:apply-templates/>
+          </fo:block>
+        </xsl:otherwise>
+      </xsl:choose>
     </fo:list-item-body>
   </xsl:variable>
 
@@ -288,9 +297,18 @@
       </fo:block>
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
+      <xsl:choose>
+        <xsl:when test="child::*[1][local-name()='para' or
+                                    local-name()='simpara' or
+                                    local-name()='formalpara']">
+          <xsl:apply-templates/>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block>
+            <xsl:apply-templates/>
+          </fo:block>
+        </xsl:otherwise>
+      </xsl:choose>
     </fo:list-item-body>
   </xsl:variable>
 


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- docbook-style-xsl.spec	3 Jan 2006 13:47:31 -0000	1.21
+++ docbook-style-xsl.spec	3 Jan 2006 13:50:54 -0000	1.22
@@ -24,6 +24,7 @@
 
 Patch1: docbook-xsl-pagesetup.patch
 Patch2: docbook-xsl-marginleft.patch
+Patch3: docbook-xsl-lists.patch
 
 
 %description
@@ -38,6 +39,7 @@
 popd
 %patch1 -p1 -b .pagesetup
 %patch2 -p1 -b .marginleft
+%patch3 -p1 -b .lists
 cp %{SOURCE1} Makefile
 for f in $(find -name "*'*")
 do
@@ -97,7 +99,9 @@
 
 %changelog
 * Tue Jan  3 2006 Tim Waugh <twaugh at redhat.com>
-- Avoid proportional-column-width for passivetex (bug #176766).
+- Patches from W. Michael Petullo:
+  - Fix lists blocking (bug #161371).
+  - Avoid proportional-column-width for passivetex (bug #176766).
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt