Support 'info'

diff --git a/xsl/common/subtitles.xsl b/xsl/common/subtitles.xsl
index 4d9ac1772c3f82469d55050ab5a012e915f5df84..e0277d549124e9e6ded84a327303c1db99decad4 100644 (file)
--- a/xsl/common/subtitles.xsl
+++ b/xsl/common/subtitles.xsl
@@ -43,7 +43,7 @@ subtitle of the element.
 
 <xsl:template match="set" mode="subtitle.markup">
   <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(setinfo/subtitle|subtitle)[1]"
+  <xsl:apply-templates select="(setinfo/subtitle|info/subtitle|subtitle)[1]"
                        mode="subtitle.markup">
     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
   </xsl:apply-templates>
@@ -51,7 +51,7 @@ subtitle of the element.
 
 <xsl:template match="book" mode="subtitle.markup">
   <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(bookinfo/subtitle|subtitle)[1]"
+  <xsl:apply-templates select="(bookinfo/subtitle|info/subtitle|subtitle)[1]"
                        mode="subtitle.markup">
     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
   </xsl:apply-templates>
@@ -61,6 +61,7 @@ subtitle of the element.
   <xsl:param name="allow-anchors" select="'0'"/>
   <xsl:apply-templates select="(partinfo/subtitle
                                 |docinfo/subtitle
+                                |info/subtitle
                                 |subtitle)[1]"
                        mode="subtitle.markup">
     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
@@ -70,6 +71,7 @@ subtitle of the element.
 <xsl:template match="preface|chapter|appendix" mode="subtitle.markup">
   <xsl:param name="allow-anchors" select="'0'"/>
   <xsl:apply-templates select="(docinfo/subtitle
+                                |info/subtitle
                                 |prefaceinfo/subtitle
                                 |chapterinfo/subtitle
                                 |appendixinfo/subtitle
@@ -83,6 +85,7 @@ subtitle of the element.
   <xsl:param name="allow-anchors" select="'0'"/>
   <xsl:apply-templates select="(artheader/subtitle
                                 |articleinfo/subtitle
+                                |info/subtitle
                                 |subtitle)[1]"
                        mode="subtitle.markup">
     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
@@ -101,6 +104,7 @@ subtitle of the element.
   <xsl:param name="allow-anchors" select="'0'"/>
   <xsl:apply-templates select="(referenceinfo/subtitle
                                 |docinfo/subtitle
+                                |info/subtitle
                                 |subtitle)[1]"
                        mode="subtitle.markup">
     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
@@ -110,6 +114,7 @@ subtitle of the element.
 <xsl:template match="refentry" mode="subtitle.markup">
   <xsl:param name="allow-anchors" select="'0'"/>
   <xsl:apply-templates select="(refentryinfo/subtitle
+                                |info/subtitle
                                 |docinfo/subtitle)[1]"
                        mode="subtitle.markup">
     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
@@ -122,7 +127,8 @@ subtitle of the element.
                      |simplesect"
               mode="subtitle.markup">
   <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(sectioninfo/subtitle
+  <xsl:apply-templates select="(info/subtitle
+                                |sectioninfo/subtitle
                                 |sect1info/subtitle
                                 |sect2info/subtitle
                                 |sect3info/subtitle

diff --git a/xsl/common/titles.xsl b/xsl/common/titles.xsl
index f5615b8171d9d579ce6b2e638f91184ec3239c60..33f0012fd3cf59cea572cc659d173a92cf3f507d 100644 (file)
--- a/xsl/common/titles.xsl
+++ b/xsl/common/titles.xsl
@@ -89,7 +89,7 @@ title of the element. This does not include the label.
 
 <xsl:template match="set" mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(setinfo/title|title)[1]"
+  <xsl:apply-templates select="(setinfo/title|info/title|title)[1]"
                        mode="title.markup">
     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
   </xsl:apply-templates>
@@ -97,7 +97,7 @@ title of the element. This does not include the label.
 
 <xsl:template match="book" mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(bookinfo/title|title)[1]"
+  <xsl:apply-templates select="(bookinfo/title|info/title|title)[1]"
                        mode="title.markup">
     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
   </xsl:apply-templates>
@@ -105,7 +105,7 @@ title of the element. This does not include the label.
 
 <xsl:template match="part" mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(partinfo/title|docinfo/title|title)[1]"
+  <xsl:apply-templates select="(partinfo/title|info/title|docinfo/title|title)[1]"
                        mode="title.markup">
     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
   </xsl:apply-templates>
@@ -123,6 +123,7 @@ title of the element. This does not include the label.
 -->
 
   <xsl:variable name="title" select="(docinfo/title
+                                      |info/title
                                       |prefaceinfo/title
                                       |chapterinfo/title
                                       |appendixinfo/title
@@ -168,6 +169,7 @@ title of the element. This does not include the label.
   <xsl:param name="allow-anchors" select="0"/>
   <xsl:variable name="title" select="(artheader/title
                                       |articleinfo/title
+                                      |info/title
                                       |title)[1]"/>
 
   <xsl:apply-templates select="$title" mode="title.markup">
@@ -177,7 +179,7 @@ title of the element. This does not include the label.
 
 <xsl:template match="reference" mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(referenceinfo/title|docinfo/title|title)[1]"
+  <xsl:apply-templates select="(referenceinfo/title|docinfo/title|info/title|title)[1]"
                        mode="title.markup">
     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
   </xsl:apply-templates>
@@ -223,7 +225,8 @@ title of the element. This does not include the label.
                      |simplesect"
               mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(sectioninfo/title
+  <xsl:variable name="title" select="(info/title
+                                     |sectioninfo/title
                                       |sect1info/title
                                       |sect2info/title
                                       |sect3info/title
@@ -261,7 +264,7 @@ title of the element. This does not include the label.
 
 <xsl:template match="bibliography" mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(bibliographyinfo/title|title)[1]"/>
+  <xsl:variable name="title" select="(bibliographyinfo/title|info/title|title)[1]"/>
   <xsl:choose>
     <xsl:when test="$title">
       <xsl:apply-templates select="$title" mode="title.markup">
@@ -278,7 +281,7 @@ title of the element. This does not include the label.
 
 <xsl:template match="glossary" mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(glossaryinfo/title|title)[1]"/>
+  <xsl:variable name="title" select="(glossaryinfo/title|info/title|title)[1]"/>
   <xsl:choose>
     <xsl:when test="$title">
       <xsl:apply-templates select="$title" mode="title.markup">
@@ -315,7 +318,7 @@ title of the element. This does not include the label.
 
 <xsl:template match="index" mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(indexinfo/title|title)[1]"/>
+  <xsl:variable name="title" select="(indexinfo/title|info/title|title)[1]"/>
   <xsl:choose>
     <xsl:when test="$title">
       <xsl:apply-templates select="$title" mode="title.markup">
@@ -332,7 +335,7 @@ title of the element. This does not include the label.
 
 <xsl:template match="setindex" mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(setindexinfo/title|title)[1]"/>
+  <xsl:variable name="title" select="(setindexinfo/title|info/title|title)[1]"/>
   <xsl:choose>
     <xsl:when test="$title">
       <xsl:apply-templates select="$title" mode="title.markup">
@@ -466,6 +469,7 @@ title of the element. This does not include the label.
   <xsl:param name="verbose" select="1"/>
 
   <xsl:variable name="titleabbrev" select="(docinfo/titleabbrev
+                                           |info/titleabbrev
                                            |prefaceinfo/titleabbrev
                                            |chapterinfo/titleabbrev
                                            |appendixinfo/titleabbrev
@@ -492,6 +496,7 @@ title of the element. This does not include the label.
 
   <xsl:variable name="titleabbrev" select="(artheader/titleabbrev
                                            |articleinfo/titleabbrev
+                                           |info/titleabbrev
                                            |titleabbrev)[1]"/>
 
   <xsl:choose>
@@ -517,16 +522,17 @@ title of the element. This does not include the label.
   <xsl:param name="allow-anchors" select="0"/>
   <xsl:param name="verbose" select="1"/>
 
-  <xsl:variable name="titleabbrev" select="(sectioninfo/titleabbrev
-                                      |sect1info/titleabbrev
-                                      |sect2info/titleabbrev
-                                      |sect3info/titleabbrev
-                                      |sect4info/titleabbrev
-                                      |sect5info/titleabbrev
-                                      |refsect1info/titleabbrev
-                                      |refsect2info/titleabbrev
-                                      |refsect3info/titleabbrev
-                                      |titleabbrev)[1]"/>
+  <xsl:variable name="titleabbrev" select="(info/titleabbrev
+                                           |sectioninfo/titleabbrev
+                                           |sect1info/titleabbrev
+                                           |sect2info/titleabbrev
+                                           |sect3info/titleabbrev
+                                           |sect4info/titleabbrev
+                                           |sect5info/titleabbrev
+                                           |refsect1info/titleabbrev
+                                           |refsect2info/titleabbrev
+                                           |refsect3info/titleabbrev
+                                           |titleabbrev)[1]"/>
 
   <xsl:choose>
     <xsl:when test="$titleabbrev">