From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 28 Aug 2013 22:55:38 +0000 (+0000)
Subject: Add support for procedure title contained in info or blockinfo.
X-Git-Tag: release/1.79.1~6^2~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d4d5eb843bd507811cda13656da7426a820cab0;p=docbook-dsssl

Add support for procedure title contained in info or blockinfo.
---

diff --git a/xsl/common/gentext.xsl b/xsl/common/gentext.xsl
index 6f2e783fa..ffd1be2dc 100644
--- a/xsl/common/gentext.xsl
+++ b/xsl/common/gentext.xsl
@@ -116,8 +116,9 @@
 </xsl:template>
 
 <xsl:template match="procedure" mode="object.title.template">
+  <xsl:variable name="title" select="title|blockinfo/title|info/title"/>
   <xsl:choose>
-    <xsl:when test="$formal.procedures != 0 and title">
+    <xsl:when test="$formal.procedures != 0 and $title">
       <xsl:call-template name="gentext.template">
         <xsl:with-param name="context" select="'title'"/>
         <xsl:with-param name="name">
diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index ec49eb85d..8b087049a 100644
--- a/xsl/common/labels.xsl
+++ b/xsl/common/labels.xsl
@@ -695,11 +695,11 @@ element label.</para>
             <xsl:apply-templates select="$pchap" mode="label.markup"/>
             <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
           </xsl:if>
-          <xsl:number count="procedure[title]" format="1" 
+          <xsl:number count="procedure[title|blockinfo/title|info/title]" format="1" 
                       from="chapter|appendix" level="any"/>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:number count="procedure[title]" format="1" 
+          <xsl:number count="procedure[title|blockinfo/title|info/title]" format="1" 
                       from="book|article" level="any"/>
         </xsl:otherwise>
       </xsl:choose>