Added new HTML Help parameters from patches by W. Borgert

diff --git a/xsl/html/Makefile.param b/xsl/html/Makefile.param
index 2307b54bd1d2f5cf22e7a3037828c9e8479d041e..f29a1331de62d91e3d5a5fa0d861205478bb0b7f 100644 (file)
--- a/xsl/html/Makefile.param
+++ b/xsl/html/Makefile.param
@@ -94,7 +94,9 @@ PARAMS=../params/admon.graphics.xml \
        ../params/htmlhelp.button.zoom.xml \
        ../params/htmlhelp.chm.xml \
        ../params/htmlhelp.default.topic.xml \
+       ../params/htmlhelp.display.progress.xml \
        ../params/htmlhelp.encoding.xml \
+       ../params/htmlhelp.enhanced.decompilation.xml \
        ../params/htmlhelp.enumerate.images.xml \
        ../params/htmlhelp.force.map.and.alias.xml \
        ../params/htmlhelp.hhc.xml \
@@ -102,17 +104,22 @@ PARAMS=../params/admon.graphics.xml \
        ../params/htmlhelp.hhc.folders.instead.books.xml \
        ../params/htmlhelp.hhc.section.depth.xml \
        ../params/htmlhelp.hhc.show.root.xml \
+       ../params/htmlhelp.hhc.width.xml \
+       ../params/htmlhelp.hhp.windows.xml \
        ../params/htmlhelp.hhk.xml \
        ../params/htmlhelp.hhp.xml \
        ../params/htmlhelp.hhp.tail.xml \
        ../params/htmlhelp.hhp.window.xml \
        ../params/htmlhelp.map.file.xml \
        ../params/htmlhelp.only.xml \
+       ../params/htmlhelp.remember.window.position.xml \
        ../params/htmlhelp.show.advanced.search.xml \
        ../params/htmlhelp.show.favorities.xml \
        ../params/htmlhelp.show.menu.xml \
+       ../params/htmlhelp.show.toolbar.text.xml \
        ../params/htmlhelp.title.xml \
        ../params/htmlhelp.use.hhk.xml \
+       ../params/htmlhelp.window.geometry.xml \
        ../params/inherit.keywords.xml \
        ../params/label.from.part.xml \
        ../params/linenumbering.everyNth.xml \

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 80c0804518474a4ede9496341094d8775c4b6c2d..282451f57bd91b16882fb05e2e58026058bc4453 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -94,7 +94,9 @@
 <!ENTITY htmlhelp.button.zoom SYSTEM "../params/htmlhelp.button.zoom.xml">
 <!ENTITY htmlhelp.chm SYSTEM "../params/htmlhelp.chm.xml">
 <!ENTITY htmlhelp.default.topic SYSTEM "../params/htmlhelp.default.topic.xml">
+<!ENTITY htmlhelp.display.progress SYSTEM "../params/htmlhelp.display.progress.xml">
 <!ENTITY htmlhelp.encoding SYSTEM "../params/htmlhelp.encoding.xml">
+<!ENTITY htmlhelp.enhanced.decompilation SYSTEM "../params/htmlhelp.enhanced.decompilation.xml">
 <!ENTITY htmlhelp.enumerate.images SYSTEM "../params/htmlhelp.enumerate.images.xml">
 <!ENTITY htmlhelp.force.map.and.alias SYSTEM "../params/htmlhelp.force.map.and.alias.xml">
 <!ENTITY htmlhelp.hhc SYSTEM "../params/htmlhelp.hhc.xml">
@@ -102,17 +104,22 @@
 <!ENTITY htmlhelp.hhc.folders.instead.books SYSTEM "../params/htmlhelp.hhc.folders.instead.books.xml">
 <!ENTITY htmlhelp.hhc.section.depth SYSTEM "../params/htmlhelp.hhc.section.depth.xml">
 <!ENTITY htmlhelp.hhc.show.root SYSTEM "../params/htmlhelp.hhc.show.root.xml">
+<!ENTITY htmlhelp.hhc.width SYSTEM "../params/htmlhelp.hhc.width.xml">
+<!ENTITY htmlhelp.hhp.windows SYSTEM "../params/htmlhelp.hhp.windows.xml">
 <!ENTITY htmlhelp.hhk SYSTEM "../params/htmlhelp.hhk.xml">
 <!ENTITY htmlhelp.hhp SYSTEM "../params/htmlhelp.hhp.xml">
 <!ENTITY htmlhelp.hhp.tail SYSTEM "../params/htmlhelp.hhp.tail.xml">
 <!ENTITY htmlhelp.hhp.window SYSTEM "../params/htmlhelp.hhp.window.xml">
 <!ENTITY htmlhelp.map.file SYSTEM "../params/htmlhelp.map.file.xml">
 <!ENTITY htmlhelp.only SYSTEM "../params/htmlhelp.only.xml">
+<!ENTITY htmlhelp.remember.window.position SYSTEM "../params/htmlhelp.remember.window.position.xml">
 <!ENTITY htmlhelp.show.advanced.search SYSTEM "../params/htmlhelp.show.advanced.search.xml">
 <!ENTITY htmlhelp.show.favorities SYSTEM "../params/htmlhelp.show.favorities.xml">
 <!ENTITY htmlhelp.show.menu SYSTEM "../params/htmlhelp.show.menu.xml">
+<!ENTITY htmlhelp.show.toolbar.text SYSTEM "../params/htmlhelp.show.toolbar.text.xml">
 <!ENTITY htmlhelp.title SYSTEM "../params/htmlhelp.title.xml">
 <!ENTITY htmlhelp.use.hhk SYSTEM "../params/htmlhelp.use.hhk.xml">
+<!ENTITY htmlhelp.window.geometry SYSTEM "../params/htmlhelp.window.geometry.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 2adf154b6c08fc39e9ec5d19984f72e01a0bb843..a66fe5732faf070ff82b72f4ea65da6eda504d78 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -331,11 +331,14 @@ url="http://docbook.sourceforge.net/projects/xsl/doc/tools/profiling.html">http:
 &htmlhelp.autolabel;
 &htmlhelp.chm;
 &htmlhelp.default.topic;
+&htmlhelp.display.progress;
 &htmlhelp.hhp;
 &htmlhelp.hhc;
 &htmlhelp.hhk;
 &htmlhelp.hhp.tail;
 &htmlhelp.hhp.window;
+&htmlhelp.hhp.windows;
+&htmlhelp.enhanced.decompilation;
 &htmlhelp.enumerate.images;
 &htmlhelp.force.map.and.alias;
 &htmlhelp.map.file;
@@ -344,8 +347,10 @@ url="http://docbook.sourceforge.net/projects/xsl/doc/tools/profiling.html">http:
 &htmlhelp.hhc.show.root;
 &htmlhelp.hhc.folders.instead.books;
 &htmlhelp.hhc.binary;
+&htmlhelp.hhc.width;
 &htmlhelp.title;
 &htmlhelp.show.menu;
+&htmlhelp.show.toolbar.text;
 &htmlhelp.show.advanced.search;
 &htmlhelp.show.favorities;
 &htmlhelp.button.hideshow;
@@ -367,6 +372,8 @@ url="http://docbook.sourceforge.net/projects/xsl/doc/tools/profiling.html">http:
 &htmlhelp.button.next;
 &htmlhelp.button.prev;
 &htmlhelp.button.zoom;
+&htmlhelp.remember.window.position;
+&htmlhelp.window.geometry;
 &htmlhelp.use.hhk;
 &htmlhelp.only;
 </reference>
@@ -512,7 +519,9 @@ around all these parameters.</para>
 <src:fragref linkend="htmlhelp.button.zoom.frag"/>
 <src:fragref linkend="htmlhelp.chm.frag"/>
 <src:fragref linkend="htmlhelp.default.topic.frag"/>
+<src:fragref linkend="htmlhelp.display.progress.frag"/>
 <src:fragref linkend="htmlhelp.encoding.frag"/>
+<src:fragref linkend="htmlhelp.enhanced.decompilation.frag"/>
 <src:fragref linkend="htmlhelp.enumerate.images.frag"/>
 <src:fragref linkend="htmlhelp.force.map.and.alias.frag"/>
 <src:fragref linkend="htmlhelp.hhc.binary.frag"/>
@@ -520,17 +529,22 @@ around all these parameters.</para>
 <src:fragref linkend="htmlhelp.hhc.frag"/>
 <src:fragref linkend="htmlhelp.hhc.section.depth.frag"/>
 <src:fragref linkend="htmlhelp.hhc.show.root.frag"/>
+<src:fragref linkend="htmlhelp.hhc.width.frag"/>
 <src:fragref linkend="htmlhelp.hhk.frag"/>
 <src:fragref linkend="htmlhelp.hhp.frag"/>
 <src:fragref linkend="htmlhelp.hhp.tail.frag"/>
 <src:fragref linkend="htmlhelp.hhp.window.frag"/>
+<src:fragref linkend="htmlhelp.hhp.windows.frag"/>
 <src:fragref linkend="htmlhelp.map.file.frag"/>
 <src:fragref linkend="htmlhelp.only.frag"/>
+<src:fragref linkend="htmlhelp.remember.window.position.frag"/>
 <src:fragref linkend="htmlhelp.show.advanced.search.frag"/>
 <src:fragref linkend="htmlhelp.show.favorities.frag"/>
 <src:fragref linkend="htmlhelp.show.menu.frag"/>
+<src:fragref linkend="htmlhelp.show.toolbar.text.frag"/>
 <src:fragref linkend="htmlhelp.title.frag"/>
 <src:fragref linkend="htmlhelp.use.hhk.frag"/>
+<src:fragref linkend="htmlhelp.window.geometry.frag"/>
 <src:fragref linkend="ignore.image.scaling.frag"/>
 <src:fragref linkend="inherit.keywords.frag"/>
 <src:fragref linkend="l10n.gentext.default.language.frag"/>

diff --git a/xsl/htmlhelp/htmlhelp-common.xsl b/xsl/htmlhelp/htmlhelp-common.xsl
index f3a80234da63318dc139ec9cb8d829de84c85ba4..b63e42bcaabfc0dcb91490a1037a7ed1d2372eeb 100644 (file)
--- a/xsl/htmlhelp/htmlhelp-common.xsl
+++ b/xsl/htmlhelp/htmlhelp-common.xsl
@@ -109,7 +109,9 @@
   <xsl:call-template name="toHex">
     <xsl:with-param name="n" select="9504 + $htmlhelp.show.menu * 65536
                                           + $htmlhelp.show.advanced.search * 131072
-                                          + $htmlhelp.show.favorities * 4096"/>
+                                          + $htmlhelp.show.favorities * 4096
+                                          + (1 - $htmlhelp.show.toolbar.text) * 64
+                                          + $htmlhelp.remember.window.position * 262144"/>
   </xsl:call-template>
 </xsl:variable>
 <xsl:variable name="xbuttons">
@@ -148,7 +150,16 @@ Contents file=</xsl:text><xsl:value-of select="$htmlhelp.hhc"/><xsl:text>
 </xsl:text></xsl:if>
 <xsl:text>Default topic=</xsl:text><xsl:value-of select="$default.topic"/>
 <xsl:text>
-Display compile progress=Yes
+Display compile progress=</xsl:text>
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.display.progress != 1">
+      <xsl:text>No</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>Yes</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+<xsl:text>
 Full-text search=Yes
 </xsl:text>
 <xsl:if test="$generate.index">
@@ -178,6 +189,16 @@ Title=</xsl:text>
       <xsl:value-of select="$htmlhelp.title"/>
     </xsl:otherwise>
   </xsl:choose>
+<xsl:text>
+Enhanced decompilation=</xsl:text>
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.enhanced.decompilation != 0">
+      <xsl:text>Yes</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>No</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
 
 <xsl:if test="$htmlhelp.hhp.window != ''">
   <xsl:text>
@@ -231,12 +252,15 @@ Title=</xsl:text>
 </xsl:if>
 <xsl:text>,</xsl:text>
 <xsl:value-of select="$xnavigation"/>
-<xsl:text>,,</xsl:text>
+<xsl:text>,</xsl:text><xsl:value-of select="$htmlhelp.hhc.width"/><xsl:text>,</xsl:text>
 <xsl:value-of select="$xbuttons"/>
-<xsl:text>,,,,,,,,0
+<xsl:text>,</xsl:text><xsl:value-of select="$htmlhelp.window.geometry"/><xsl:text>,,,,,,,0
 </xsl:text>
 </xsl:if>
 
+<xsl:if test="$htmlhelp.hhp.windows">
+  <xsl:value-of select="$htmlhelp.hhp.windows"/>
+</xsl:if>
 <xsl:text>
 
 [FILES]

diff --git a/xsl/params/htmlhelp.display.progress.xml b/xsl/params/htmlhelp.display.progress.xml
new file mode 100755 (executable)
index 0000000..5902153
--- /dev/null
+++ b/xsl/params/htmlhelp.display.progress.xml
@@ -0,0 +1,23 @@
+<refentry id="htmlhelp.display.progress">
+<refmeta>
+<refentrytitle>htmlhelp.display.progress</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>htmlhelp.display.progress</refname>
+<refpurpose>Display compile progress?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='htmlhelp.display.progress.frag'>
+<xsl:param name="htmlhelp.display.progress" select="1"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>You can swith off display of compile progress by setting this
+parameter to 0.</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/htmlhelp.enhanced.decompilation.xml b/xsl/params/htmlhelp.enhanced.decompilation.xml
new file mode 100755 (executable)
index 0000000..f5c5968
--- /dev/null
+++ b/xsl/params/htmlhelp.enhanced.decompilation.xml
@@ -0,0 +1,22 @@
+<refentry id="htmlhelp.enhanced.decompilation">
+<refmeta>
+<refentrytitle>htmlhelp.enhanced.decompilation</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>htmlhelp.enhanced.decompilation</refname>
+<refpurpose>Allow enhanced decompilation of CHM?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='htmlhelp.enhanced.decompilation.frag'>
+<xsl:param name="htmlhelp.enhanced.decompilation" select="0"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>When set to 1 this parameter enables enhanced decompilation of CHM.</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/htmlhelp.hhc.width.xml b/xsl/params/htmlhelp.hhc.width.xml
new file mode 100755 (executable)
index 0000000..eaf0f99
--- /dev/null
+++ b/xsl/params/htmlhelp.hhc.width.xml
@@ -0,0 +1,22 @@
+<refentry id="htmlhelp.hhc.width">
+<refmeta>
+<refentrytitle>htmlhelp.hhc.width</refentrytitle>
+<refmiscinfo role="type">integer</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>htmlhelp.hhc.width</refname>
+<refpurpose>Width of navigation (ToC) pane</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='htmlhelp.hhc.width.frag'>
+<xsl:param name="htmlhelp.hhc.width"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>This parameter specifies width of ToC pane in pixels.</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/htmlhelp.hhp.windows.xml b/xsl/params/htmlhelp.hhp.windows.xml
new file mode 100755 (executable)
index 0000000..31411ac
--- /dev/null
+++ b/xsl/params/htmlhelp.hhp.windows.xml
@@ -0,0 +1,24 @@
+<refentry id="htmlhelp.hhp.windows'">
+<refmeta>
+<refentrytitle>htmlhelp.hhp.windows</refentrytitle>
+<refmiscinfo role="type">string</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>htmlhelp.hhp.windows</refname>
+<refpurpose>Definition of additional windows</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='htmlhelp.hhp.windows.frag'>
+<xsl:param name="htmlhelp.hhp.windows"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Content of this parameter is placed at the end of [WINDOWS]
+section of project file. You can use it for defining your own
+addtional windows.</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/htmlhelp.remember.window.position.xml b/xsl/params/htmlhelp.remember.window.position.xml
new file mode 100755 (executable)
index 0000000..bd2123a
--- /dev/null
+++ b/xsl/params/htmlhelp.remember.window.position.xml
@@ -0,0 +1,23 @@
+<refentry id="htmlhelp.remember.window.position">
+<refmeta>
+<refentrytitle>htmlhelp.remember.window.position</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>htmlhelp.remember.window.position</refname>
+<refpurpose>Remember help window position?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='htmlhelp.remember.window.position.frag'>
+<xsl:param name="htmlhelp.remember.window.position" select="0"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>To remember help window position between starts set this
+parameter to 1.</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/htmlhelp.show.toolbar.text.xml b/xsl/params/htmlhelp.show.toolbar.text.xml
new file mode 100755 (executable)
index 0000000..3ef305f
--- /dev/null
+++ b/xsl/params/htmlhelp.show.toolbar.text.xml
@@ -0,0 +1,23 @@
+<refentry id="htmlhelp.show.toolbar.text'">
+<refmeta>
+<refentrytitle>htmlhelp.show.toolbar.text</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>htmlhelp.show.toolbar.text</refname>
+<refpurpose>Show text under toolbar buttons?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='htmlhelp.show.toolbar.text.frag'>
+<xsl:param name="htmlhelp.show.toolbar.text" select="1"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>You can switch off display of texts under toolbar buttons by
+setting this parameter to 0.</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/htmlhelp.window.geometry.xml b/xsl/params/htmlhelp.window.geometry.xml
new file mode 100755 (executable)
index 0000000..e412379
--- /dev/null
+++ b/xsl/params/htmlhelp.window.geometry.xml
@@ -0,0 +1,25 @@
+<refentry id="htmlhelp.window.geometry">
+<refmeta>
+<refentrytitle>htmlhelp.window.geometry</refentrytitle>
+<refmiscinfo role="type">string</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>htmlhelp.window.geometry</refname>
+<refpurpose>Set initial geometry of help window</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='htmlhelp.window.geometry.frag'>
+<xsl:param name="htmlhelp.window.geometry"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>This parameter specifies initial position of help
+window. E.g.</para>
+
+<programlisting><![CDATA[<xsl:param name="htmlhelp.window.geometry">[160,64,992,704]</xsl:param>]]></programlisting>
+
+</refsect1>
+</refentry>