docbook-xsl/docbook-xsl-listblock.patch

135 lines
3.5 KiB
Diff

--- docbook-xsl-1.64.1/fo/lists.xsl.listblock 2004-01-20 11:12:15.000000000 +0000
+++ docbook-xsl-1.64.1/fo/lists.xsl 2004-01-20 11:38:17.000000000 +0000
@@ -112,9 +112,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>
@@ -222,9 +231,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>
@@ -397,9 +415,18 @@
</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>
+ <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 select="listitem"/>
+ </fo:block>
+ </xsl:otherwise>
+ </xsl:choose>
</fo:list-item-body>
</fo:list-item>
</xsl:template>
@@ -766,9 +793,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>
</fo:list-item>
</xsl:template>
@@ -792,9 +828,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>
</fo:list-item>
</xsl:template>
@@ -942,9 +987,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>
</fo:list-item>
</xsl:template>