rpms/docbook-style-xsl/devel docbook-xsl-list-item-body.patch, NONE, 1.1 docbook-style-xsl.spec, 1.45, 1.46

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20960

Modified Files:
	docbook-style-xsl.spec 
Added Files:
	docbook-xsl-list-item-body.patch 
Log Message:
added fixes for passivetex extension and list-item-body(#161371)

docbook-xsl-list-item-body.patch:

--- NEW FILE docbook-xsl-list-item-body.patch ---
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
@@ -286,9 +286,17 @@
       </fo:block>
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
+      <xsl:choose>
+        <!-- * work around broken passivetex list-item-body rendering -->
+        <xsl:when test="$passivetex.extensions = '1'">
+          <xsl:apply-templates/>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block>
+            <xsl:apply-templates/>
+          </fo:block>
+        </xsl:otherwise>
+      </xsl:choose>
     </fo:list-item-body>
   </xsl:variable>
 
@@ -484,9 +492,17 @@
       </fo:block>
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates select="listitem"/>
-      </fo:block>
+      <xsl:choose>
+        <!-- * work around broken passivetex list-item-body rendering -->
+        <xsl:when test="$passivetex.extensions = '1'">
+          <xsl:apply-templates select="listitem"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block>
+            <xsl:apply-templates select="listitem"/>
+          </fo:block>
+        </xsl:otherwise>
+      </xsl:choose>
     </fo:list-item-body>
   </xsl:variable>
 
@@ -963,10 +979,18 @@
       </fo:block>
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
-    </fo:list-item-body>
+      <xsl:choose>
+        <!-- * work around broken passivetex list-item-body rendering -->
+        <xsl:when test="$passivetex.extensions = '1'">
+          <xsl:apply-templates/>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block>
+            <xsl:apply-templates/>
+          </fo:block>
+        </xsl:otherwise>
+      </xsl:choose>
+     </fo:list-item-body>
   </fo:list-item>
 </xsl:template>
 
@@ -989,9 +1013,17 @@
       </fo:block>
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
+      <xsl:choose>
+        <!-- * work around broken passivetex list-item-body rendering -->
+        <xsl:when test="$passivetex.extensions = '1'">
+          <xsl:apply-templates/>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block>
+            <xsl:apply-templates/>
+          </fo:block>
+        </xsl:otherwise>
+      </xsl:choose>
     </fo:list-item-body>
   </fo:list-item>
 </xsl:template>
@@ -1168,9 +1200,17 @@
       </fo:block>
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
+      <xsl:choose>
+        <!-- * work around broken passivetex list-item-body rendering -->
+        <xsl:when test="$passivetex.extensions = '1'">
+          <xsl:apply-templates/>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block>
+            <xsl:apply-templates/>
+          </fo:block>
+        </xsl:otherwise>
+      </xsl:choose>
     </fo:list-item-body>
   </fo:list-item>
 </xsl:template>


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- docbook-style-xsl.spec	11 Dec 2007 13:08:23 -0000	1.45
+++ docbook-style-xsl.spec	14 Dec 2007 12:26:22 -0000	1.46
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.73.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -29,6 +29,7 @@
 Patch2: docbook-xsl-marginleft.patch
 Patch3: docbook-xsl-newmethods.patch
 Patch4: docbook-xsl-non-constant-expressions.patch
+Patch5: docbook-xsl-list-item-body.patch
 
 
 %description
@@ -45,6 +46,8 @@
 %patch2 -p1 -b .marginleft
 %patch3 -p1 -b .newmethods
 %patch4 -p1 -b .nonconstant
+%patch5 -p1 -b .listitembody
+
 cp -p %{SOURCE1} Makefile
 
 # fix of non UTF-8 files rpmlint warnings 
@@ -114,6 +117,10 @@
 fi
 
 %changelog
+* Fri Dec 14 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-9
+- added fixes for passivetex extension and list-item-body
+  (#161371)
+
 * Tue Dec 11 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-8
 - remove entries from xmlcatalog only on removal of package
   (required because of the change with droping release