added fixes for passivetex extension and list-item-body(#161371)

docbook-style-xsl.spec

@@ -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 @@ Patch1: docbook-xsl-pagesetup.patch
 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 @@ popd
 %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 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Fri Dec 14 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-9
+- added fixes for passivetex extension and list-item-body
+  (#161371)
+
 * Tue Dec 11 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-8
 - remove entries from xmlcatalog only on removal of package
   (required because of the change with droping release

docbook-xsl-list-item-body.patch

@@ -0,0 +1,110 @@
+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>