Added new parameter index.prefer.titleabbrev. When set to 1, index references will...

diff --git a/xsl/html/Makefile.param b/xsl/html/Makefile.param
index a6f98ac3596b0521b1b0f2e9bd7bd926d912e86a..3bfd5947aaffb3ed11fd62a1074ba0765e0695db 100644 (file)
--- a/xsl/html/Makefile.param
+++ b/xsl/html/Makefile.param
@@ -123,6 +123,7 @@ PARAMS=../params/admon.graphics.xml \
        ../params/htmlhelp.window.geometry.xml \
        ../params/img.src.path.xml \
        ../params/index.on.role.xml \
+       ../params/index.prefer.titleabbrev.xml \
        ../params/index.on.type.xml \
        ../params/inherit.keywords.xml \
        ../params/label.from.part.xml \

diff --git a/xsl/html/autoidx.xsl b/xsl/html/autoidx.xsl
index 5b626a8b41b3a9a892329fd18978da905e72a3f4..b08be9ba640f091f4804b56b6272548413584252 100644 (file)
--- a/xsl/html/autoidx.xsl
+++ b/xsl/html/autoidx.xsl
@@ -369,7 +369,14 @@
     <xsl:otherwise>
       <a>
         <xsl:variable name="title">
-          <xsl:apply-templates select="&section;" mode="title.markup"/>
+          <xsl:choose>
+            <xsl:when test="&section;/titleabbrev and $index.prefer.titleabbrev != 0">
+              <xsl:apply-templates select="&section;" mode="titleabbrev.markup"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:apply-templates select="&section;" mode="title.markup"/>
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:variable>
 
         <xsl:attribute name="href">

diff --git a/xsl/html/docbook.xsl b/xsl/html/docbook.xsl
index 38f76f766656687dba9b5eca6dfb03abfa36c837..29a14dbf59bee5ed5c34506194ac4479b781e6ca 100644 (file)
--- a/xsl/html/docbook.xsl
+++ b/xsl/html/docbook.xsl
@@ -70,6 +70,7 @@
 <xsl:include href="docbookng.xsl"/>
 
 <xsl:param name="stylesheet.result.type" select="'html'"/>
+<xsl:param name="htmlhelp.output" select="0"/>
 
 <!-- ==================================================================== -->
 

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 45d3a30993c3f6b22ae38abe5757c790592ecd35..e1b89ed37266b282b83c8c57e62f7793f664d341 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -123,6 +123,7 @@
 <!ENTITY htmlhelp.window.geometry SYSTEM "../params/htmlhelp.window.geometry.xml">
 <!ENTITY img.src.path SYSTEM "../params/img.src.path.xml">
 <!ENTITY index.on.role SYSTEM "../params/index.on.role.xml">
+<!ENTITY index.prefer.titleabbrev SYSTEM "../params/index.prefer.titleabbrev.xml">
 <!ENTITY index.on.type SYSTEM "../params/index.on.type.xml">
 <!ENTITY inherit.keywords SYSTEM "../params/inherit.keywords.xml">
 <!ENTITY label.from.part SYSTEM "../params/label.from.part.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 04c023ab8e905c6d43d50098a456a02a320ce2e6..3dd3880acff16de5ef37a46e300d8dead5ec842f 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -103,6 +103,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &generate.index;
 &index.on.type;
 &index.on.role;
+&index.prefer.titleabbrev;
 </reference>
 
 <reference><title>Extensions</title>
@@ -563,6 +564,7 @@ around all these parameters.</para>
 <src:fragref linkend="img.src.path.frag"/>
 <src:fragref linkend="index.on.role.frag"/>
 <src:fragref linkend="index.on.type.frag"/>
+<src:fragref linkend="index.prefer.titleabbrev.frag"/>
 <src:fragref linkend="ignore.image.scaling.frag"/>
 <src:fragref linkend="inherit.keywords.frag"/>
 <src:fragref linkend="l10n.gentext.default.language.frag"/>