Support setindex (there were all sorts of things wrong with it)

diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index a3385a1eaae005f814162bdd58924443f70cd923..cfe6ef8c0d8aab4a88752dae4d8157a11fe9db29 100644 (file)
--- a/xsl/common/labels.xsl
+++ b/xsl/common/labels.xsl
@@ -482,7 +482,7 @@ element label.</para>
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="bibliography|glossary|index" mode="label.markup">
+<xsl:template match="bibliography|glossary|index|setindex" mode="label.markup">
   <xsl:if test="@label">
     <xsl:value-of select="@label"/>
   </xsl:if>

diff --git a/xsl/common/titles.xsl b/xsl/common/titles.xsl
index 4d408b0ae3e38cc470c916f95e0cd6e29820d635..c741d76e1b18991a183e86604c76bf7a75815a24 100644 (file)
--- a/xsl/common/titles.xsl
+++ b/xsl/common/titles.xsl
@@ -285,6 +285,23 @@ title of the element. This does not include the label.
   </xsl:choose>
 </xsl:template>
 
+<xsl:template match="setindex" mode="title.markup">
+  <xsl:param name="allow-anchors" select="0"/>
+  <xsl:variable name="title" select="(setindexinfo/title|title)[1]"/>
+  <xsl:choose>
+    <xsl:when test="$title">
+      <xsl:apply-templates select="$title" mode="title.markup">
+        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+      </xsl:apply-templates>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="gentext">
+        <xsl:with-param name="key" select="'SetIndex'"/>
+      </xsl:call-template>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 <xsl:template match="figure|table|example|equation" mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
   <xsl:apply-templates select="title" mode="title.markup">

diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index ef492bed1211cfd10e2f5edefa666b56fc53a6c7..531b66d9792a5964764efc99d65ffb50c81f8505 100644 (file)
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -41,7 +41,7 @@
  </xsl:if>
 </xsl:template>
 
-<xsl:template match="book/index">
+<xsl:template match="book/index|part/index">
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
@@ -137,7 +137,7 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="index.titlepage"/>
+      <xsl:call-template name="setindex.titlepage"/>
       <xsl:apply-templates/>
       <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
 

diff --git a/xsl/fo/titlepage.templates.xml b/xsl/fo/titlepage.templates.xml
index 0b61fc4cf8e0ac8cd36821106f1a774ca895cec8..9282c8d0cf3540ecb676ca7335a00a4e3acfaf0c 100644 (file)
--- a/xsl/fo/titlepage.templates.xml
+++ b/xsl/fo/titlepage.templates.xml
@@ -856,6 +856,36 @@
     </t:titlepage-before>
   </t:titlepage>
 
+<!-- ==================================================================== -->
+
+  <t:titlepage element="setindex" wrapper="fo:block">
+    <t:titlepage-content side="recto">
+      <title
+            force="1"
+            named-template="component.title"
+            param:node="ancestor-or-self::setindex[1]"
+             param:pagewide="1"
+            fo:margin-left="{$title.margin.left}"
+            fo:font-size="&hsize5;"
+            fo:font-family="{$title.font.family}"
+            fo:font-weight="bold"/>
+      <subtitle
+               fo:font-family="{$title.font.family}"/>
+    </t:titlepage-content>
+
+    <t:titlepage-content side="verso">
+    </t:titlepage-content>
+
+    <t:titlepage-separator>
+    </t:titlepage-separator>
+
+    <t:titlepage-before side="recto">
+    </t:titlepage-before>
+
+    <t:titlepage-before side="verso">
+    </t:titlepage-before>
+  </t:titlepage>
+
 <!-- ==================================================================== -->
 
   <t:titlepage element="colophon" wrapper="fo:block">

diff --git a/xsl/fo/titlepage.xsl b/xsl/fo/titlepage.xsl
index b09d342b8f0dd54e4e74740ca28236cf30ea5d06..98a004f742508c06858127a00e3abf81bbe37ff9 100644 (file)
--- a/xsl/fo/titlepage.xsl
+++ b/xsl/fo/titlepage.xsl
@@ -67,6 +67,9 @@
 <xsl:attribute-set name="index.titlepage.recto.style"/>
 <xsl:attribute-set name="index.titlepage.verso.style"/>
 
+<xsl:attribute-set name="setindex.titlepage.recto.style"/>
+<xsl:attribute-set name="setindex.titlepage.verso.style"/>
+
 <xsl:attribute-set name="colophon.titlepage.recto.style"/>
 <xsl:attribute-set name="colophon.titlepage.verso.style"/>
 

diff --git a/xsl/html/index.xsl b/xsl/html/index.xsl
index cfbb4248a9c05b39d16a50fbe45a59935577d6f7..97162994927a58f16ff245dc33880fdea4aa992e 100644 (file)
--- a/xsl/html/index.xsl
+++ b/xsl/html/index.xsl
@@ -58,7 +58,7 @@
         </xsl:attribute>
       </xsl:if>
 
-      <xsl:call-template name="index.titlepage"/>
+      <xsl:call-template name="setindex.titlepage"/>
       <xsl:apply-templates/>
 
       <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">

diff --git a/xsl/html/titlepage.templates.xml b/xsl/html/titlepage.templates.xml
index 109389a79ae071f7448b92ef2f5e3b27de1dbab0..5174601960d59f6747726447ec93625cc037d469 100644 (file)
--- a/xsl/html/titlepage.templates.xml
+++ b/xsl/html/titlepage.templates.xml
@@ -632,4 +632,28 @@
 
 <!-- ==================================================================== -->
 
+<t:titlepage element="setindex" wrapper="div" class="titlepage">
+  <t:titlepage-content side="recto">
+    <title
+          force="1"
+          named-template="component.title"
+          param:node="ancestor-or-self::setindex[1]"/>
+    <subtitle/>
+  </t:titlepage-content>
+
+  <t:titlepage-content side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
 </t:templates>

diff --git a/xsl/html/titlepage.xsl b/xsl/html/titlepage.xsl
index 6d6c4d476c39722af20ba8fbdb9f609e5467ecc7..4f50c8d77659f2c8e2315ef6d2bcdd096fec10ff 100644 (file)
--- a/xsl/html/titlepage.xsl
+++ b/xsl/html/titlepage.xsl
@@ -56,6 +56,9 @@
 <xsl:attribute-set name="index.titlepage.recto.style"/>
 <xsl:attribute-set name="index.titlepage.verso.style"/>
 
+<xsl:attribute-set name="setindex.titlepage.recto.style"/>
+<xsl:attribute-set name="setindex.titlepage.verso.style"/>
+
 <xsl:attribute-set name="section.titlepage.recto.style"/>
 <xsl:attribute-set name="section.titlepage.verso.style"/>