Add support for procedure title contained in info or blockinfo.

diff --git a/xsl/common/gentext.xsl b/xsl/common/gentext.xsl
index 6f2e783fa700ee72f8cf53f5a7841fd97bc0a1e9..ffd1be2dcc71af92ce55021635a2b311097878e9 100644 (file)
--- 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 ec49eb85ddf40946adc6a41df5d4d4505cb07631..8b087049a946183615a0a1a9e09e90e77a6d75f5 100644 (file)
--- 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>