Index can be alternatively created using HHK file from now. This allows see-also...

diff --git a/xsl/html/Makefile.param b/xsl/html/Makefile.param
index a0d9a098141f1241cea2845af0c6a057eb2169ed..b75b8a7910c4c2a77b763779b2e87508e93bcbb4 100644 (file)
--- a/xsl/html/Makefile.param
+++ b/xsl/html/Makefile.param
@@ -21,7 +21,6 @@ PARAMS=../params/admon.graphics.xml \
        ../params/callout.unicode.start.character.xml \
        ../params/callouts.extension.xml \
        ../params/chapter.autolabel.xml \
-       ../params/chunk.datafile.xml \
        ../params/chunk.first.sections.xml \
        ../params/chunk.quietly.xml \
        ../params/chunk.section.depth.xml \
@@ -36,13 +35,16 @@ PARAMS=../params/admon.graphics.xml \
        ../params/chunker.output.omit-xml-declaration.xml \
        ../params/chunker.output.standalone.xml \
        ../params/citerefentry.link.xml \
+       ../params/collect.xref.targets.xml \
        ../params/css.decoration.xml \
+       ../params/current.docid.xml \
        ../params/default.table.width.xml \
        ../params/draft.watermark.image.xml \
        ../params/ebnf.table.bgcolor.xml \
        ../params/ebnf.table.border.xml \
        ../params/emphasis.propagates.style.xml \
        ../params/firstterm.only.link.xml \
+       ../params/footer.rule.xml \
        ../params/formal.procedures.xml \
        ../params/formal.title.placement.xml \
        ../params/funcsynopsis.decoration.xml \
@@ -58,6 +60,7 @@ PARAMS=../params/admon.graphics.xml \
        ../params/glossary.collection.xml \
        ../params/glossterm.auto.link.xml \
        ../params/graphic.default.extension.xml \
+       ../params/header.rule.xml \
        ../params/html.base.xml \
        ../params/html.cleanup.xml \
        ../params/html.ext.xml \
@@ -68,6 +71,25 @@ PARAMS=../params/admon.graphics.xml \
        ../params/html.stylesheet.type.xml \
        ../params/htmlhelp.alias.file.xml \
        ../params/htmlhelp.autolabel.xml \
+       ../params/htmlhelp.button.back.xml \
+       ../params/htmlhelp.button.forward.xml \
+       ../params/htmlhelp.button.hideshow.xml \
+       ../params/htmlhelp.button.home.xml \
+       ../params/htmlhelp.button.home.url.xml \
+       ../params/htmlhelp.button.jump1.xml \
+       ../params/htmlhelp.button.jump1.title.xml \
+       ../params/htmlhelp.button.jump1.url.xml \
+       ../params/htmlhelp.button.jump2.xml \
+       ../params/htmlhelp.button.jump2.title.xml \
+       ../params/htmlhelp.button.jump2.url.xml \
+       ../params/htmlhelp.button.locate.xml \
+       ../params/htmlhelp.button.next.xml \
+       ../params/htmlhelp.button.options.xml \
+       ../params/htmlhelp.button.prev.xml \
+       ../params/htmlhelp.button.print.xml \
+       ../params/htmlhelp.button.refresh.xml \
+       ../params/htmlhelp.button.stop.xml \
+       ../params/htmlhelp.button.zoom.xml \
        ../params/htmlhelp.chm.xml \
        ../params/htmlhelp.default.topic.xml \
        ../params/htmlhelp.encoding.xml \
@@ -84,29 +106,11 @@ PARAMS=../params/admon.graphics.xml \
        ../params/htmlhelp.hhp.window.xml \
        ../params/htmlhelp.map.file.xml \
        ../params/htmlhelp.only.xml \
-       ../params/htmlhelp.title.xml \
-       ../params/htmlhelp.show.menu.xml \
        ../params/htmlhelp.show.advanced.search.xml \
        ../params/htmlhelp.show.favorities.xml \
-       ../params/htmlhelp.button.hideshow.xml \
-       ../params/htmlhelp.button.back.xml \
-       ../params/htmlhelp.button.forward.xml \
-       ../params/htmlhelp.button.stop.xml \
-       ../params/htmlhelp.button.refresh.xml \
-       ../params/htmlhelp.button.home.xml \
-       ../params/htmlhelp.button.home.url.xml \
-       ../params/htmlhelp.button.options.xml \
-       ../params/htmlhelp.button.print.xml \
-       ../params/htmlhelp.button.locate.xml \
-       ../params/htmlhelp.button.jump1.xml \
-       ../params/htmlhelp.button.jump1.url.xml \
-       ../params/htmlhelp.button.jump1.title.xml \
-       ../params/htmlhelp.button.jump2.xml \
-       ../params/htmlhelp.button.jump2.url.xml \
-       ../params/htmlhelp.button.jump2.title.xml \
-       ../params/htmlhelp.button.next.xml \
-       ../params/htmlhelp.button.prev.xml \
-       ../params/htmlhelp.button.zoom.xml \
+       ../params/htmlhelp.show.menu.xml \
+       ../params/htmlhelp.title.xml \
+       ../params/htmlhelp.use.hhk.xml \
        ../params/inherit.keywords.xml \
        ../params/label.from.part.xml \
        ../params/linenumbering.everyNth.xml \
@@ -127,6 +131,8 @@ PARAMS=../params/admon.graphics.xml \
        ../params/nominal.image.depth.xml \
        ../params/nominal.image.width.xml \
        ../params/nominal.table.width.xml \
+       ../params/olink.base.uri.xml \
+       ../params/olink.doctitle.xml \
        ../params/olink.fragid.xml \
        ../params/olink.outline.ext.xml \
        ../params/olink.pubid.xml \
@@ -174,14 +180,16 @@ PARAMS=../params/admon.graphics.xml \
        ../params/show.comments.xml \
        ../params/show.revisionflag.xml \
        ../params/spacing.paras.xml \
-       ../params/suppress.navigation.xml \
-       ../params/suppress.header.navigation.xml \
        ../params/suppress.footer.navigation.xml \
+       ../params/suppress.header.navigation.xml \
+       ../params/suppress.navigation.xml \
        ../params/table.border.color.xml \
        ../params/table.border.style.xml \
        ../params/table.border.thickness.xml \
        ../params/table.borders.with.css.xml \
        ../params/tablecolumns.extension.xml \
+       ../params/targets.filename.xml \
+       ../params/target.database.document.xml \
        ../params/tex.math.delims.xml \
        ../params/tex.math.file.xml \
        ../params/tex.math.in.alt.xml \
@@ -192,6 +200,13 @@ PARAMS=../params/admon.graphics.xml \
        ../params/use.embed.for.svg.xml \
        ../params/use.extensions.xml \
        ../params/use.id.as.filename.xml \
+       ../params/use.local.olink.style.xml \
        ../params/use.role.as.xrefstyle.xml \
        ../params/use.svg.xml \
-       ../params/variablelist.as.table.xml
+       ../params/variablelist.as.table.xml \
+       ../params/para.propagates.style.xml \
+       ../params/html.cellpadding.xml \
+       ../params/html.cellspacing.xml \
+       ../params/menuchoice.separator.xml \
+       ../params/menuchoice.menu.separator.xml \
+       ../params/bibliography.numbered.xml

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 0b5f9ee4c2c1ed275fbebc3d93bc93c6485cd0f1..ac43b1ec4ea9e70279b9d39ecbb1697acd4136f8 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -110,6 +110,7 @@
 <!ENTITY htmlhelp.show.favorities SYSTEM "../params/htmlhelp.show.favorities.xml">
 <!ENTITY htmlhelp.show.menu SYSTEM "../params/htmlhelp.show.menu.xml">
 <!ENTITY htmlhelp.title SYSTEM "../params/htmlhelp.title.xml">
+<!ENTITY htmlhelp.use.hhk SYSTEM "../params/htmlhelp.use.hhk.xml">
 <!ENTITY inherit.keywords SYSTEM "../params/inherit.keywords.xml">
 <!ENTITY label.from.part SYSTEM "../params/label.from.part.xml">
 <!ENTITY linenumbering.everyNth SYSTEM "../params/linenumbering.everyNth.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 597b0298c8ee71bb3d9cd7654b414bd5290c90ac..339e8decbd5ee6da8bd1f016358d4927b9fb489c 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -339,6 +339,7 @@ url="http://docbook.sourceforge.net/projects/xsl/doc/tools/profiling.html">http:
 &htmlhelp.button.next;
 &htmlhelp.button.prev;
 &htmlhelp.button.zoom;
+&htmlhelp.use.hhk;
 &htmlhelp.only;
 </reference>
 
@@ -471,6 +472,7 @@ around all these parameters.</para>
 <src:fragref linkend="htmlhelp.show.favorities.frag"/>
 <src:fragref linkend="htmlhelp.show.menu.frag"/>
 <src:fragref linkend="htmlhelp.title.frag"/>
+<src:fragref linkend="htmlhelp.use.hhk.frag"/>
 <src:fragref linkend="inherit.keywords.frag"/>
 <src:fragref linkend="label.from.part.frag"/>
 <src:fragref linkend="linenumbering.everyNth.frag"/>

diff --git a/xsl/htmlhelp/htmlhelp-common.xsl b/xsl/htmlhelp/htmlhelp-common.xsl
index c950721fd1a4ebed0a34be3a17e144fb4ebf0514..29920d7e3c58f2eec1221f20e8ed57fd4e2965f8 100644 (file)
--- a/xsl/htmlhelp/htmlhelp-common.xsl
+++ b/xsl/htmlhelp/htmlhelp-common.xsl
@@ -766,35 +766,47 @@ Title=</xsl:text>
 <xsl:template match="index" mode="toc"/>
 
 <xsl:template match="indexterm">
-
-  <xsl:variable name="primary" select="normalize-space(primary)"/>
-  <xsl:variable name="secondary" select="normalize-space(secondary)"/>
-  <xsl:variable name="tertiary" select="normalize-space(tertiary)"/>
-
-  <xsl:variable name="text">
-    <xsl:value-of select="$primary"/>
-    <xsl:if test="secondary">
-      <xsl:text>, </xsl:text>
-      <xsl:value-of select="$secondary"/>
-    </xsl:if>
-    <xsl:if test="tertiary">
-      <xsl:text>, </xsl:text>
-      <xsl:value-of select="$tertiary"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:if test="secondary">
-    <xsl:if test="not(//indexterm[normalize-space(primary)=$primary and not(secondary)])">
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.use.hhk = 0">
+  
+      <xsl:variable name="primary" select="normalize-space(primary)"/>
+      <xsl:variable name="secondary" select="normalize-space(secondary)"/>
+      <xsl:variable name="tertiary" select="normalize-space(tertiary)"/>
+      
+      <xsl:variable name="text">
+        <xsl:value-of select="$primary"/>
+        <xsl:if test="secondary">
+          <xsl:text>, </xsl:text>
+          <xsl:value-of select="$secondary"/>
+        </xsl:if>
+        <xsl:if test="tertiary">
+          <xsl:text>, </xsl:text>
+          <xsl:value-of select="$tertiary"/>
+        </xsl:if>
+      </xsl:variable>
+      
+      <xsl:if test="secondary">
+        <xsl:if test="not(//indexterm[normalize-space(primary)=$primary and not(secondary)])">
+          <xsl:call-template name="write.indexterm">
+            <xsl:with-param name="text" select="$primary"/>
+          </xsl:call-template>
+        </xsl:if>
+      </xsl:if>
+      
       <xsl:call-template name="write.indexterm">
-        <xsl:with-param name="text" select="$primary"/>
+        <xsl:with-param name="text" select="$text"/>
       </xsl:call-template>
-    </xsl:if>
-  </xsl:if>
-
-  <xsl:call-template name="write.indexterm">
-    <xsl:with-param name="text" select="$text"/>
-  </xsl:call-template>
-
+      
+    </xsl:when>
+    <xsl:otherwise>
+      <a>
+        <xsl:attribute name="name">
+          <xsl:call-template name="object.id"/>
+        </xsl:attribute>
+      </a>
+    </xsl:otherwise>
+    
+  </xsl:choose>
 </xsl:template>
 
 <xsl:template name="write.indexterm">
@@ -814,14 +826,96 @@ Title=</xsl:text>
     <xsl:with-param name="content"><![CDATA[<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <HTML>
 <HEAD>
+<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<!-- Sitemap 1.0 -->
 </HEAD><BODY>
-<UL>
-</UL>
+<OBJECT type="text/site properties">
+</OBJECT>
+<UL>]]>
+<xsl:if test="($htmlhelp.use.hhk != 0) and $generate.index">
+  <xsl:choose>
+    <xsl:when test="$rootid != ''">
+      <xsl:apply-templates select="key('id',$rootid)" mode="hhk"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="/" mode="hhk"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:if>
+<![CDATA[</UL>
 </BODY></HTML>]]></xsl:with-param>
     <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
   </xsl:call-template>
 </xsl:template>
 
+<xsl:template match="indexterm[@class='endofrange']" mode="hhk"/>
+
+<xsl:template match="indexterm" mode="hhk">
+  <xsl:variable name="primary" select="normalize-space(primary)"/>
+  <xsl:variable name="secondary" select="normalize-space(secondary)"/>
+  <xsl:variable name="tertiary" select="normalize-space(tertiary)"/>
+
+  <xsl:call-template name="write.indexterm.hhk">
+    <xsl:with-param name="text" select="$primary"/>
+    <xsl:with-param name="seealso" select="seealso"/>
+  </xsl:call-template>
+
+  <xsl:if test="secondary">
+    <xsl:if test="not(//indexterm[normalize-space(primary)=$primary and not(secondary)])">
+      <xsl:call-template name="write.indexterm.hhk">
+        <!-- We must create fake entry when there is secondary without primary --> 
+        <xsl:with-param name="text" select="$primary"/>
+        <xsl:with-param name="seealso" select="$primary"/>
+      </xsl:call-template>
+    </xsl:if>
+    <![CDATA[<UL>]]>
+    <xsl:call-template name="write.indexterm.hhk">
+      <xsl:with-param name="text" select="$secondary"/>
+      <xsl:with-param name="seealso" select="secondary/seealso"/>
+    </xsl:call-template>
+    <xsl:if test="tertiary">
+      <![CDATA[<UL>]]>
+      <xsl:call-template name="write.indexterm.hhk">
+        <xsl:with-param name="text" select="$tertiary"/>
+        <xsl:with-param name="seealso" select="tertiary/seealso"/>
+      </xsl:call-template>
+      <![CDATA[</UL>]]>
+    </xsl:if>
+    <![CDATA[</UL>]]>
+  </xsl:if>
+
+</xsl:template>
+
+<xsl:template name="write.indexterm.hhk">
+  <xsl:param name="text"/>
+  <xsl:param name="seealso"/>
+  <![CDATA[<LI> <OBJECT type="text/sitemap">
+        <param name="Name" value="]]><xsl:value-of select="$text"/><xsl:text><![CDATA[">]]></xsl:text>
+      <xsl:if test="not(seealso)">
+        <xsl:variable name="href">
+          <xsl:call-template name="href.target.with.base.dir"/>
+        </xsl:variable>
+        <xsl:variable name="title">
+          <xsl:call-template name="nearest.title">
+            <xsl:with-param name="object" select=".."/>
+          </xsl:call-template>
+        </xsl:variable>
+        <![CDATA[<param name="Name" value="]]><xsl:value-of select="$title"/><![CDATA[">]]>
+        <![CDATA[<param name="Local" value="]]><xsl:value-of select="$href"/><![CDATA[">]]>
+      </xsl:if>
+      <xsl:if test="seealso">
+        <![CDATA[<param name="See Also" value="]]><xsl:value-of select="$seealso"/><![CDATA[">]]>
+      </xsl:if>
+      <xsl:text><![CDATA[ </OBJECT>]]></xsl:text>
+</xsl:template>
+
+<xsl:template match="text()" mode="hhk"/>
+
+<xsl:template name="nearest.title">
+  <xsl:param name="object"/>
+  <xsl:apply-templates select="$object/ancestor-or-self::*[title][1]" mode="title.markup"/>
+</xsl:template>
+
 <!-- ==================================================================== -->
 
 <xsl:template name="hh-map">

diff --git a/xsl/params/htmlhelp.use.hhk.xml b/xsl/params/htmlhelp.use.hhk.xml
new file mode 100644 (file)
index 0000000..6c9da07
--- /dev/null
+++ b/xsl/params/htmlhelp.use.hhk.xml
@@ -0,0 +1,23 @@
+<refentry id="htmlhelp.use.hhk">
+<refmeta>
+<refentrytitle>htmlhelp.use.hhk</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>htmlhelp.use.hhk</refname>
+<refpurpose>Should be index built using HHK file?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='htmlhelp.use.hhk.frag'>
+<xsl:param name="htmlhelp.use.hhk" select="0"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>If non-zero, index is created using HHK file. This provides some
+new features.</para>
+
+</refsect1>
+</refentry>