FR #422097, make a listitem containing a single simpara output an li with only inline...

diff --git a/xsl/html/block.xsl b/xsl/html/block.xsl
index 9b171eec8084df5302458b624300c3b043a4b01f..7cf5b7b04e19901c351272f3ae646cc60913e3ec 100644 (file)
--- a/xsl/html/block.xsl
+++ b/xsl/html/block.xsl
@@ -47,6 +47,7 @@
 </xsl:template>
 
 <xsl:template match="simpara">
+  <!-- see also listitem/simpara in lists.xsl -->
   <p>
     <xsl:if test="@id">
       <a name="{@id}"/>

diff --git a/xsl/html/lists.xsl b/xsl/html/lists.xsl
index f35cc7a58a0670e81cfd737182ee3fad36265c71..8d840758cce058fcd8f4564751033cc74a313c1f 100644 (file)
--- a/xsl/html/lists.xsl
+++ b/xsl/html/lists.xsl
@@ -191,6 +191,29 @@
   <xsl:number format="1"/>
 </xsl:template>
 
+<xsl:template match="listitem/simpara" priority="2">
+  <!-- If a listitem contains only a single simpara, don't output
+       the <p> wrapper; this has the effect of creating an li
+       with simple text content. -->
+  <xsl:choose>
+    <xsl:when test="not(preceding-sibling::*)
+                    and not (following-sibling::*)">
+      <xsl:if test="@id">
+        <a name="{@id}"/>
+      </xsl:if>
+      <xsl:apply-templates/>
+    </xsl:when>
+    <xsl:otherwise>
+      <p>
+        <xsl:if test="@id">
+          <a name="{@id}"/>
+        </xsl:if>
+        <xsl:apply-templates/>
+      </p>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 <xsl:template match="varlistentry">
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>