2008-08-06 11:56:12 +00:00
|
|
|
diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl
|
|
|
|
--- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200
|
|
|
|
+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:41:27.000000000 +0200
|
2008-06-03 11:16:45 +00:00
|
|
|
@@ -248,9 +248,17 @@
|
2007-12-14 12:26:22 +00:00
|
|
|
</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>
|
|
|
|
|
2008-06-03 11:16:45 +00:00
|
|
|
@@ -446,10 +454,18 @@
|
2007-12-14 12:26:22 +00:00
|
|
|
</fo:block>
|
|
|
|
</fo:list-item-label>
|
|
|
|
<fo:list-item-body start-indent="body-start()">
|
|
|
|
- <fo:block>
|
|
|
|
- <xsl:apply-templates select="listitem"/>
|
|
|
|
- </fo:block>
|
2008-06-03 11:16:45 +00:00
|
|
|
- </fo:list-item-body>
|
2007-12-14 12:26:22 +00:00
|
|
|
+ <xsl:choose>
|
|
|
|
+ <!-- * work around broken passivetex list-item-body rendering -->
|
|
|
|
+ <xsl:when test="$passivetex.extensions = '1'">
|
2008-06-03 11:16:45 +00:00
|
|
|
+ <xsl:apply-templates/>
|
2007-12-14 12:26:22 +00:00
|
|
|
+ </xsl:when>
|
|
|
|
+ <xsl:otherwise>
|
|
|
|
+ <fo:block>
|
2008-06-03 11:16:45 +00:00
|
|
|
+ <xsl:apply-templates/>
|
2007-12-14 12:26:22 +00:00
|
|
|
+ </fo:block>
|
|
|
|
+ </xsl:otherwise>
|
|
|
|
+ </xsl:choose>
|
2008-06-03 11:16:45 +00:00
|
|
|
+ </fo:list-item-body>
|
2007-12-14 12:26:22 +00:00
|
|
|
</xsl:variable>
|
|
|
|
|
2008-06-03 11:16:45 +00:00
|
|
|
<xsl:choose>
|
|
|
|
@@ -925,9 +941,17 @@
|
2007-12-14 12:26:22 +00:00
|
|
|
</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>
|
2008-06-03 11:16:45 +00:00
|
|
|
</fo:list-item-body>
|
2007-12-14 12:26:22 +00:00
|
|
|
</fo:list-item>
|
|
|
|
</xsl:template>
|
2008-06-03 11:16:45 +00:00
|
|
|
@@ -951,9 +975,17 @@
|
2007-12-14 12:26:22 +00:00
|
|
|
</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>
|
2008-06-03 11:16:45 +00:00
|
|
|
@@ -1141,9 +1173,17 @@
|
2007-12-14 12:26:22 +00:00
|
|
|
</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>
|