Merge pull request #580 from openSUSE/517-substeps-performance

Fix #517: Process substeps/@performance='optional'

suse2022-ns/fo/lists.xsl

@@ -325,7 +325,7 @@
                                    local-name()='simpara' or
                                    local-name()='formalpara']"
               priority="2">
-
+  <xsl:variable name="perf" select="(../@performance|../../@performance)[last()]"/>
   <fo:block xsl:use-attribute-sets="para.properties">
     <xsl:call-template name="no-break-after-colon"/>
 
@@ -335,7 +335,7 @@
         <xsl:with-param name="arch-value" select="@arch"/>
       </xsl:call-template>
     </xsl:if>
-    <xsl:if test="(self::d:para or self::d:simpara) and ../@performance='optional'">
+    <xsl:if test="(self::d:para or self::d:simpara) and $perf='optional'">
       <fo:inline color="&mid-gray;" xsl:use-attribute-sets="italicized">
         <xsl:call-template name="gentext">
           <xsl:with-param name="key" select="'step.optional'"/>

suse2022-ns/xhtml/lists.xsl

@@ -112,6 +112,7 @@
   </xsl:template>
 
   <xsl:template match="d:step/*[1][local-name()='para' or local-name()='simpara']">
+   <xsl:variable name="perf" select="(../@performance|../../@performance)[last()]"/>
    <xsl:call-template name="paragraph">
      <xsl:with-param name="class">
        <xsl:if test="@role and $para.propagates.style != 0">
@@ -125,7 +126,7 @@
          </xsl:call-template>
        </xsl:if>
        <xsl:call-template name="anchor"/>
-       <xsl:if test="../@performance='optional'">
+       <xsl:if test="$perf='optional'">
          <span class="step-optional">
            <xsl:call-template name="gentext">
              <xsl:with-param name="key" select="'step.optional'"/>
@@ -138,6 +139,7 @@
    </xsl:call-template>
   </xsl:template>
 
+
 <xsl:template match="d:listitem/d:simpara" priority="10">
   <!-- Unlike the original DocBook stylesheets, if a listitem contains only a
   single simpara, we still want to output the <p> wrapper... This is essentially