From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 11 Apr 2013 23:47:50 +0000 (+0000)
Subject: Add mark.optional.procedure.steps param.
X-Git-Tag: release/1.79.1~6^2~216
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d80b065b61f13332b581fd8fc306502a2a84df8;p=docbook-dsssl

Add mark.optional.procedure.steps param.
---

diff --git a/xsl/fo/lists.xsl b/xsl/fo/lists.xsl
index 87151c8a1..7c55405ca 100644
--- a/xsl/fo/lists.xsl
+++ b/xsl/fo/lists.xsl
@@ -1063,6 +1063,31 @@
   </fo:block>
 </xsl:template>
 
+<!-- Add (Optional) when the step is optional -->
+<xsl:template match="step[@performance = 'optional']/*[1][self::para]" priority="3">
+  <xsl:variable name="keep.together">
+    <xsl:call-template name="pi.dbfo_keep-together"/>
+  </xsl:variable>
+  <fo:block xsl:use-attribute-sets="para.properties">
+    <xsl:if test="$keep.together != ''">
+      <xsl:attribute name="keep-together.within-column"><xsl:value-of
+                      select="$keep.together"/></xsl:attribute>
+    </xsl:if>
+    <xsl:call-template name="anchor"/>
+    <xsl:if test="$mark.optional.procedure.steps != 0">
+      <xsl:call-template name="optional.step.marker"/>
+    </xsl:if>
+    <xsl:apply-templates/>
+  </fo:block>
+</xsl:template>
+
+<xsl:template name="optional.step.marker">
+  <fo:inline>
+    <xsl:call-template name="gentext">
+      <xsl:with-param name="key">optional-step</xsl:with-param>
+    </xsl:call-template>
+  </fo:inline>
+</xsl:template>
 <!-- ==================================================================== -->
 
 <xsl:template match="segmentedlist">
diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 8c0fb9801..d7f6370d6 100644
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -360,3 +360,4 @@
 <!ENTITY para.properties SYSTEM "../params/para.properties.xml">
 <!ENTITY activate.external.olinks SYSTEM "../params/activate.external.olinks.xml">
 <!ENTITY force.blank.pages SYSTEM "../params/force.blank.pages.xml">
+<!ENTITY mark.optional.procedure.steps" SYSTEM "../params/mark.optional.procedure.steps.xml">
diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 81eb46f00..1abee03c3 100644
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -197,6 +197,7 @@ generate.section.toc.level;
 &list.block.properties;
 &list.block.spacing;
 &list.item.spacing;
+&mark.optional.procedure.steps;
 &orderedlist.properties;
 &orderedlist.label.properties;
 &orderedlist.label.width;
@@ -926,6 +927,7 @@ around all these parameters.</para>
 <src:fragref linkend="region.inner.properties.frag"/>
 <src:fragref linkend="region.outer.properties.frag"/>
 <src:fragref linkend="para.properties.frag"/>
+<src:fragref linkend="mark.optional.procedure.steps.frag"/>
 
 </xsl:stylesheet>
 </src:fragment>