1 10660 laca --- docbook-xsl-1.69.1/fo/lists.xsl.orig 2006-01-19 02:36:22.000000000 -0800 2 10660 laca +++ docbook-xsl-1.69.1/fo/lists.xsl 2006-01-19 02:34:54.000000000 -0800 3 10660 laca @@ -125,9 +130,18 @@ 4 10660 laca </fo:block> 5 10660 laca </fo:list-item-label> 6 10660 laca <fo:list-item-body start-indent="body-start()"> 7 10660 laca + <xsl:choose> 8 10660 laca + <xsl:when test="child::*[1][local-name()='para' or 9 10660 laca + local-name()='simpara' or 10 10660 laca + local-name()='formalpara']"> 11 10660 laca + <xsl:apply-templates/> 12 10660 laca + </xsl:when> 13 10660 laca + <xsl:otherwise> 14 10660 laca <fo:block> 15 10660 laca - <xsl:apply-templates/> 16 10660 laca + <xsl:apply-templates/> 17 10660 laca </fo:block> 18 10660 laca + </xsl:otherwise> 19 10660 laca + </xsl:choose> 20 10660 laca </fo:list-item-body> 21 10660 laca </xsl:variable> 22 10660 laca 23 10660 laca @@ -287,9 +301,18 @@ 24 10660 laca </fo:block> 25 10660 laca </fo:list-item-label> 26 10660 laca <fo:list-item-body start-indent="body-start()"> 27 10660 laca + <xsl:choose> 28 10660 laca + <xsl:when test="child::*[1][local-name()='para' or 29 10660 laca + local-name()='simpara' or 30 10660 laca + local-name()='formalpara']"> 31 10660 laca + <xsl:apply-templates/> 32 10660 laca + </xsl:when> 33 10660 laca + <xsl:otherwise> 34 10660 laca <fo:block> 35 10660 laca - <xsl:apply-templates/> 36 10660 laca + <xsl:apply-templates/> 37 10660 laca </fo:block> 38 10660 laca + </xsl:otherwise> 39 10660 laca + </xsl:choose> 40 10660 laca </fo:list-item-body> 41 10660 laca </xsl:variable> 42 10660 laca 43 10660 laca @@ -486,9 +509,18 @@ 44 10660 laca </fo:block> 45 10660 laca </fo:list-item-label> 46 10660 laca <fo:list-item-body start-indent="body-start()"> 47 10660 laca + <xsl:choose> 48 10660 laca + <xsl:when test="child::*[1][local-name()='para' or 49 10660 laca + local-name()='simpara' or 50 10660 laca + local-name()='formalpara']"> 51 10660 laca + <xsl:apply-templates/> 52 10660 laca + </xsl:when> 53 10660 laca + <xsl:otherwise> 54 10660 laca <fo:block> 55 10660 laca - <xsl:apply-templates select="listitem"/> 56 10660 laca + <xsl:apply-templates/> 57 10660 laca </fo:block> 58 10660 laca + </xsl:otherwise> 59 10660 laca + </xsl:choose> 60 10660 laca </fo:list-item-body> 61 10660 laca </fo:list-item> 62 10660 laca </xsl:template> 63 10660 laca @@ -906,9 +938,18 @@ 64 10660 laca </fo:block> 65 10660 laca </fo:list-item-label> 66 10660 laca <fo:list-item-body start-indent="body-start()"> 67 10660 laca + <xsl:choose> 68 10660 laca + <xsl:when test="child::*[1][local-name()='para' or 69 10660 laca + local-name()='simpara' or 70 10660 laca + local-name()='formalpara']"> 71 10660 laca + <xsl:apply-templates/> 72 10660 laca + </xsl:when> 73 10660 laca + <xsl:otherwise> 74 10660 laca <fo:block> 75 10660 laca - <xsl:apply-templates/> 76 10660 laca + <xsl:apply-templates/> 77 10660 laca </fo:block> 78 10660 laca + </xsl:otherwise> 79 10660 laca + </xsl:choose> 80 10660 laca </fo:list-item-body> 81 10660 laca </fo:list-item> 82 10660 laca </xsl:template> 83 10660 laca @@ -932,9 +973,18 @@ 84 10660 laca </fo:block> 85 10660 laca </fo:list-item-label> 86 10660 laca <fo:list-item-body start-indent="body-start()"> 87 10660 laca + <xsl:choose> 88 10660 laca + <xsl:when test="child::*[1][local-name()='para' or 89 10660 laca + local-name()='simpara' or 90 10660 laca + local-name()='formalpara']"> 91 10660 laca + <xsl:apply-templates/> 92 10660 laca + </xsl:when> 93 10660 laca + <xsl:otherwise> 94 10660 laca <fo:block> 95 10660 laca - <xsl:apply-templates/> 96 10660 laca + <xsl:apply-templates/> 97 10660 laca </fo:block> 98 10660 laca + </xsl:otherwise> 99 10660 laca + </xsl:choose> 100 10660 laca </fo:list-item-body> 101 10660 laca </fo:list-item> 102 10660 laca </xsl:template> 103 10660 laca @@ -1112,10 +1162,19 @@ 104 10660 laca </fo:block> 105 10660 laca </fo:list-item-label> 106 10660 laca <fo:list-item-body start-indent="body-start()"> 107 10660 laca + <xsl:choose> 108 10660 laca + <xsl:when test="child::*[1][local-name()='para' or 109 10660 laca + local-name()='simpara' or 110 10660 laca + local-name()='formalpara']"> 111 10660 laca + <xsl:apply-templates/> 112 10660 laca + </xsl:when> 113 10660 laca + <xsl:otherwise> 114 10660 laca <fo:block> 115 10660 laca - <xsl:apply-templates/> 116 10660 laca + <xsl:apply-templates/> 117 10660 laca </fo:block> 118 10660 laca - </fo:list-item-body> 119 10660 laca + </xsl:otherwise> 120 10660 laca + </xsl:choose> 121 10660 laca + </fo:list-item-body> 122 10660 laca </fo:list-item> 123 10660 laca </xsl:template> 124