Added parameter htmlhelp.title for manual control over HTML Help title. Improved...

diff --git a/xsl/html/Makefile.param b/xsl/html/Makefile.param
new file mode 100644 (file)
index 0000000..89daca5
--- /dev/null
+++ b/xsl/html/Makefile.param
@@ -0,0 +1,143 @@
+PARAMS=../params/admon.graphics.xml \
+       ../params/admon.graphics.extension.xml \
+       ../params/admon.graphics.path.xml \
+       ../params/admon.style.xml \
+       ../params/annotate.toc.xml \
+       ../params/appendix.autolabel.xml \
+       ../params/author.othername.in.middle.xml \
+       ../params/autotoc.label.separator.xml \
+       ../params/base.dir.xml \
+       ../params/biblioentry.item.separator.xml \
+       ../params/bibliography.collection.xml \
+       ../params/bridgehead.in.toc.xml \
+       ../params/callout.defaultcolumn.xml \
+       ../params/callout.graphics.xml \
+       ../params/callout.graphics.extension.xml \
+       ../params/callout.graphics.number.limit.xml \
+       ../params/callout.graphics.path.xml \
+       ../params/callout.list.table.xml \
+       ../params/callout.unicode.xml \
+       ../params/callout.unicode.number.limit.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.section.depth.xml \
+       ../params/citerefentry.link.xml \
+       ../params/css.decoration.xml \
+       ../params/default.encoding.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/formal.procedures.xml \
+       ../params/funcsynopsis.decoration.xml \
+       ../params/funcsynopsis.style.xml \
+       ../params/function.parens.xml \
+       ../params/generate.appendix.toc.xml \
+       ../params/generate.article.toc.xml \
+       ../params/generate.book.toc.xml \
+       ../params/generate.chapter.toc.xml \
+       ../params/generate.component.toc.xml \
+       ../params/generate.division.toc.xml \
+       ../params/generate.index.xml \
+       ../params/generate.legalnotice.link.xml \
+       ../params/generate.part.toc.xml \
+       ../params/generate.preface.toc.xml \
+       ../params/generate.qandadiv.toc.xml \
+       ../params/generate.qandaset.toc.xml \
+       ../params/generate.reference.toc.xml \
+       ../params/generate.section.toc.xml \
+       ../params/generate.section.toc.level.xml \
+       ../params/generate.set.toc.xml \
+       ../params/glossary.collection.xml \
+       ../params/glossterm.auto.link.xml \
+       ../params/graphic.default.extension.xml \
+       ../params/html.base.xml \
+       ../params/html.cleanup.xml \
+       ../params/html.ext.xml \
+       ../params/html.longdesc.xml \
+       ../params/html.longdesc.link.xml \
+       ../params/html.stylesheet.xml \
+       ../params/html.stylesheet.type.xml \
+       ../params/htmlhelp.alias.file.xml \
+       ../params/htmlhelp.autolabel.xml \
+       ../params/htmlhelp.chm.xml \
+       ../params/htmlhelp.encoding.xml \
+       ../params/htmlhelp.enumerate.images.xml \
+       ../params/htmlhelp.force.map.and.alias.xml \
+       ../params/htmlhelp.hhc.xml \
+       ../params/htmlhelp.hhc.folders.instead.books.xml \
+       ../params/htmlhelp.hhc.section.depth.xml \
+       ../params/htmlhelp.hhp.xml \
+       ../params/htmlhelp.hhp.tail.xml \
+       ../params/htmlhelp.map.file.xml \
+       ../params/htmlhelp.title.xml \
+       ../params/inherit.keywords.xml \
+       ../params/label.from.part.xml \
+       ../params/linenumbering.everyNth.xml \
+       ../params/linenumbering.extension.xml \
+       ../params/linenumbering.separator.xml \
+       ../params/linenumbering.width.xml \
+       ../params/link.mailto.url.xml \
+       ../params/make.valid.html.xml \
+       ../params/make.single.year.ranges.xml \
+       ../params/make.year.ranges.xml \
+       ../params/navig.graphics.xml \
+       ../params/navig.graphics.extension.xml \
+       ../params/navig.graphics.path.xml \
+       ../params/navig.showtitles.xml \
+       ../params/nominal.table.width.xml \
+       ../params/olink.fragid.xml \
+       ../params/olink.outline.ext.xml \
+       ../params/olink.pubid.xml \
+       ../params/olink.resolver.xml \
+       ../params/olink.sysid.xml \
+       ../params/output.method.xml \
+       ../params/part.autolabel.xml \
+       ../params/phrase.propagates.style.xml \
+       ../params/pixels.per.inch.xml \
+       ../params/preface.autolabel.xml \
+       ../params/process.empty.source.toc.xml \
+       ../params/process.source.toc.xml \
+       ../params/punct.honorific.xml \
+       ../params/qanda.defaultlabel.xml \
+       ../params/qanda.inherit.numeration.xml \
+       ../params/qandadiv.autolabel.xml \
+       ../params/refentry.generate.name.xml \
+       ../params/refentry.generate.title.xml \
+       ../params/refentry.separator.xml \
+       ../params/refentry.xref.manvolnum.xml \
+       ../params/root.filename.xml \
+       ../params/rootid.xml \
+       ../params/runinhead.default.title.end.punct.xml \
+       ../params/runinhead.title.end.punct.xml \
+       ../params/saxon.character.representation.xml \
+       ../params/section.autolabel.xml \
+       ../params/section.label.includes.component.label.xml \
+       ../params/segmentedlist.as.table.xml \
+       ../params/shade.verbatim.xml \
+       ../params/shade.verbatim.style.xml \
+       ../params/show.comments.xml \
+       ../params/show.revisionflag.xml \
+       ../params/spacing.paras.xml \
+       ../params/stylesheet.result.type.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/textinsert.extension.xml \
+       ../params/tex.math.in.alt.xml \
+       ../params/tex.math.file.xml \
+       ../params/toc.list.type.xml \
+       ../params/toc.section.depth.xml \
+       ../params/ulink.target.xml \
+       ../params/use.extensions.xml \
+       ../params/use.id.as.filename.xml \
+       ../params/using.chunker.xml \
+       ../params/variablelist.as.table.xml

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 99945a8d8990eb039cbf65695b0b2e56d1a3071f..3c37c5c5f3a2215d3bcfebd2a042dead5d81a21b 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -75,6 +75,7 @@
 <!ENTITY htmlhelp.hhp SYSTEM "../params/htmlhelp.hhp.xml">
 <!ENTITY htmlhelp.hhp.tail SYSTEM "../params/htmlhelp.hhp.tail.xml">
 <!ENTITY htmlhelp.map.file SYSTEM "../params/htmlhelp.map.file.xml">
+<!ENTITY htmlhelp.title SYSTEM "../params/htmlhelp.title.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 defc5d1cf245a59f2829e22f27b62f2fb1563607..4113ab96ca613f56acbaeabee79b176c68507d7d 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -259,6 +259,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &htmlhelp.alias.file;
 &htmlhelp.hhc.section.depth;
 &htmlhelp.hhc.folders.instead.books;
+&htmlhelp.title;
 </reference>
 
 <appendix><title>The Stylesheet</title>
@@ -361,6 +362,7 @@ around all these parameters.</para>
 <src:fragref linkend="htmlhelp.hhp.frag"/>
 <src:fragref linkend="htmlhelp.hhp.tail.frag"/>
 <src:fragref linkend="htmlhelp.map.file.frag"/>
+<src:fragref linkend="htmlhelp.title.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.xsl b/xsl/htmlhelp/htmlhelp.xsl
index 23c6838778054c4211bc16ab8fa58433e5ebbb1e..10c1414e283d44e6a80ae374cd528a79af159a96 100644 (file)
--- a/xsl/htmlhelp/htmlhelp.xsl
+++ b/xsl/htmlhelp/htmlhelp.xsl
@@ -105,11 +105,18 @@ Language=</xsl:text>
 <xsl:text>
 Title=</xsl:text>
   <xsl:choose>
-    <xsl:when test="$rootid != ''">
-      <xsl:value-of select="normalize-space(key('id',$rootid)//title[1])"/>
+    <xsl:when test="$htmlhelp.title = ''">
+      <xsl:choose>
+        <xsl:when test="$rootid != ''">
+          <xsl:apply-templates select="key('id',$rootid)" mode="title.markup"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="/*" mode="title.markup"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:value-of select="normalize-space(//title[1])"/>
+      <xsl:value-of select="$htmlhelp.title"/>
     </xsl:otherwise>
   </xsl:choose>
 <xsl:text>

diff --git a/xsl/params/htmlhelp.title.xml b/xsl/params/htmlhelp.title.xml
new file mode 100644 (file)
index 0000000..c5b1cb3
--- /dev/null
+++ b/xsl/params/htmlhelp.title.xml
@@ -0,0 +1,23 @@
+<refentry id="htmlhelp.title">
+<refmeta>
+<refentrytitle>htmlhelp.title</refentrytitle>
+<refmiscinfo role="type">string</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>htmlhelp.title</refname>
+<refpurpose>Title of HTML Help</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='htmlhelp.title.frag'>
+<xsl:param name="htmlhelp.title" select="''"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Content of this parameter will be used as a title for generated
+HTML Help. If empty, title will be automatically taken from document.</para>
+
+</refsect1>
+</refentry>