Support inheriting of *info keywords

diff --git a/xsl/html/docbook.xsl b/xsl/html/docbook.xsl
index 13d2f5e04fabef16518a317780b215fa9b5f035c..9584683540d48c18f67b47872859601022418577 100644 (file)
--- a/xsl/html/docbook.xsl
+++ b/xsl/html/docbook.xsl
@@ -85,34 +85,9 @@
 
 <xsl:template name="head.content">
   <xsl:param name="node" select="."/>
-  <xsl:variable name="info" select="($node/docinfo
-                                     |$node/chapterinfo
-                                     |$node/appendixinfo
-                                     |$node/prefaceinfo
-                                     |$node/bookinfo
-                                     |$node/setinfo
-                                     |$node/articleinfo
-                                     |$node/artheader
-                                     |$node/sect1info
-                                     |$node/sect2info
-                                     |$node/sect3info
-                                     |$node/sect4info
-                                     |$node/sect5info
-                                     |$node/refsect1info
-                                     |$node/refsect2info
-                                     |$node/refsect3info
-                                     |$node/bibliographyinfo
-                                     |$node/glossaryinfo
-                                     |$node/indexinfo
-                                     |$node/refentryinfo
-                                     |$node/partinfo
-                                     |$node/referenceinfo)[1]"/>
 
   <title>
-    <xsl:variable name="title">
-      <xsl:apply-templates select="$node" mode="title.markup"/>
-    </xsl:variable>
-    <xsl:value-of select="$title"/> <!-- text only -->
+    <xsl:apply-templates select="$node" mode="object.title.markup.textonly"/>
   </title>
 
   <xsl:if test="$html.stylesheet">
@@ -132,9 +107,43 @@
 
   <meta name="generator" content="DocBook XSL Stylesheets V{$VERSION}"/>
 
-  <xsl:apply-templates select="$info/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="." mode="head.keywords.content"/>
 </xsl:template>
 
+<!-- ============================================================ -->
+
+<xsl:template match="*" mode="head.keywords.content">
+  <xsl:apply-templates select="chapterinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="appendixinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="prefaceinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="bookinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="setinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="articleinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="artheader/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="sect1info/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="sect2info/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="sect3info/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="sect4info/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="sect5info/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="refsect1info/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="refsect2info/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="refsect3info/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="bibliographyinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="glossaryinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="indexinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="refentryinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="partinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="referenceinfo/keywordset" mode="html.header"/>
+  <xsl:apply-templates select="docinfo/keywordset" mode="html.header"/>
+
+  <xsl:if test="$inherit.keywords != 0
+                and parent::*">
+    <xsl:apply-templates select="parent::*" mode="head.keywords.content"/>
+  </xsl:if>
+</xsl:template>
+
+<!-- ============================================================ -->
+
 <xsl:template name="user.head.content">
   <xsl:param name="node" select="."/>
 </xsl:template>