Support stepalternatives

diff --git a/xsl/fo/lists.xsl b/xsl/fo/lists.xsl
index c6987a0fd4e1d00b0cccaebda86b83b0ed79e549..74feb1f89bc9c9af2908e304bfc8971f830d79e1 100644 (file)
--- a/xsl/fo/lists.xsl
+++ b/xsl/fo/lists.xsl
@@ -704,7 +704,7 @@
   </fo:list-block>
 </xsl:template>
 
-<xsl:template match="step">
+<xsl:template match="procedure/step|substeps/step">
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
@@ -731,6 +731,30 @@
   </fo:list-item>
 </xsl:template>
 
+<xsl:template match="stepalternatives">
+  <fo:list-block provisional-distance-between-starts="2em"
+                provisional-label-separation="0.2em">
+    <xsl:apply-templates select="step"/>
+  </fo:list-block>
+</xsl:template>
+
+<xsl:template match="stepalternatives/step">
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+
+  <fo:list-item xsl:use-attribute-sets="list.item.spacing">
+    <fo:list-item-label end-indent="label-end()">
+      <fo:block id="{$id}">
+       <xsl:text>&#x2022;</xsl:text>
+      </fo:block>
+    </fo:list-item-label>
+    <fo:list-item-body start-indent="body-start()">
+      <xsl:apply-templates/>
+    </fo:list-item-body>
+  </fo:list-item>
+</xsl:template>
+
 <xsl:template match="step/title">
   <fo:block font-weight="bold"
             keep-together.within-column="always" 

diff --git a/xsl/html/lists.xsl b/xsl/html/lists.xsl
index 265b9b149043664d77f9789d2466bda09b50f4a6..27743a9c95861b19c2b5e8aac84d81c2e9235e88 100644 (file)
--- a/xsl/html/lists.xsl
+++ b/xsl/html/lists.xsl
@@ -700,6 +700,13 @@
   </li>
 </xsl:template>
 
+<xsl:template match="stepalternatives">
+  <xsl:call-template name="anchor"/>
+  <ul>
+    <xsl:apply-templates/>
+  </ul>
+</xsl:template>
+
 <xsl:template match="step/title">
   <p class="title">
     <b>