Use header.rule and footer.rule parameters when building page navigation

diff --git a/xsl/html/chunk-common.xsl b/xsl/html/chunk-common.xsl
index 0b15324b9792309eef4544aec59a8f159fd1e80d..d45183315f20f272cecfec862539504bdb50b2ef 100644 (file)
--- a/xsl/html/chunk-common.xsl
+++ b/xsl/html/chunk-common.xsl
@@ -713,7 +713,9 @@
           </td>
         </tr>
       </table>
-      <hr/>
+      <xsl:if test="$header.rule != 0">
+        <hr/>
+      </xsl:if>
     </div>
   </xsl:if>
 </xsl:template>
@@ -728,7 +730,9 @@
 
   <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
     <div class="navfooter">
-      <hr/>
+      <xsl:if test="$footer.rule != 0">
+        <hr/>
+      </xsl:if>
       <table width="100%" summary="Navigation footer">
         <tr>
           <td width="40%" align="left">

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 3f1185f71daa72ab438c472949182d30d7688bf4..644577627ad68fcf5f6bc139a269c89c89d8133c 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -43,6 +43,7 @@
 <!ENTITY ebnf.table.border SYSTEM "../params/ebnf.table.border.xml">
 <!ENTITY emphasis.propagates.style SYSTEM "../params/emphasis.propagates.style.xml">
 <!ENTITY firstterm.only.link SYSTEM "../params/firstterm.only.link.xml">
+<!ENTITY footer.rule SYSTEM "../params/footer.rule.xml">
 <!ENTITY formal.procedures SYSTEM "../params/formal.procedures.xml">
 <!ENTITY formal.title.placement SYSTEM "../params/formal.title.placement.xml">
 <!ENTITY funcsynopsis.decoration SYSTEM "../params/funcsynopsis.decoration.xml">
@@ -58,6 +59,7 @@
 <!ENTITY glossary.collection SYSTEM "../params/glossary.collection.xml">
 <!ENTITY glossterm.auto.link SYSTEM "../params/glossterm.auto.link.xml">
 <!ENTITY graphic.default.extension SYSTEM "../params/graphic.default.extension.xml">
+<!ENTITY header.rule SYSTEM "../params/header.rule.xml">
 <!ENTITY html.base SYSTEM "../params/html.base.xml">
 <!ENTITY html.cleanup SYSTEM "../params/html.cleanup.xml">
 <!ENTITY html.ext SYSTEM "../params/html.ext.xml">
@@ -68,6 +70,25 @@
 <!ENTITY html.stylesheet.type SYSTEM "../params/html.stylesheet.type.xml">
 <!ENTITY htmlhelp.alias.file SYSTEM "../params/htmlhelp.alias.file.xml">
 <!ENTITY htmlhelp.autolabel SYSTEM "../params/htmlhelp.autolabel.xml">
+<!ENTITY htmlhelp.button.back SYSTEM "../params/htmlhelp.button.back.xml">
+<!ENTITY htmlhelp.button.forward SYSTEM "../params/htmlhelp.button.forward.xml">
+<!ENTITY htmlhelp.button.hideshow SYSTEM "../params/htmlhelp.button.hideshow.xml">
+<!ENTITY htmlhelp.button.home SYSTEM "../params/htmlhelp.button.home.xml">
+<!ENTITY htmlhelp.button.home.url SYSTEM "../params/htmlhelp.button.home.url.xml">
+<!ENTITY htmlhelp.button.jump1 SYSTEM "../params/htmlhelp.button.jump1.xml">
+<!ENTITY htmlhelp.button.jump1.title SYSTEM "../params/htmlhelp.button.jump1.title.xml">
+<!ENTITY htmlhelp.button.jump1.url SYSTEM "../params/htmlhelp.button.jump1.url.xml">
+<!ENTITY htmlhelp.button.jump2 SYSTEM "../params/htmlhelp.button.jump2.xml">
+<!ENTITY htmlhelp.button.jump2.title SYSTEM "../params/htmlhelp.button.jump2.title.xml">
+<!ENTITY htmlhelp.button.jump2.url SYSTEM "../params/htmlhelp.button.jump2.url.xml">
+<!ENTITY htmlhelp.button.locate SYSTEM "../params/htmlhelp.button.locate.xml">
+<!ENTITY htmlhelp.button.next SYSTEM "../params/htmlhelp.button.next.xml">
+<!ENTITY htmlhelp.button.options SYSTEM "../params/htmlhelp.button.options.xml">
+<!ENTITY htmlhelp.button.prev SYSTEM "../params/htmlhelp.button.prev.xml">
+<!ENTITY htmlhelp.button.print SYSTEM "../params/htmlhelp.button.print.xml">
+<!ENTITY htmlhelp.button.refresh SYSTEM "../params/htmlhelp.button.refresh.xml">
+<!ENTITY htmlhelp.button.stop SYSTEM "../params/htmlhelp.button.stop.xml">
+<!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.encoding SYSTEM "../params/htmlhelp.encoding.xml">
@@ -84,29 +105,10 @@
 <!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.title SYSTEM "../params/htmlhelp.title.xml">
-<!ENTITY htmlhelp.show.menu SYSTEM "../params/htmlhelp.show.menu.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.button.hideshow SYSTEM "../params/htmlhelp.button.hideshow.xml">
-<!ENTITY htmlhelp.button.back SYSTEM "../params/htmlhelp.button.back.xml">
-<!ENTITY htmlhelp.button.forward SYSTEM "../params/htmlhelp.button.forward.xml">
-<!ENTITY htmlhelp.button.stop SYSTEM "../params/htmlhelp.button.stop.xml">
-<!ENTITY htmlhelp.button.refresh SYSTEM "../params/htmlhelp.button.refresh.xml">
-<!ENTITY htmlhelp.button.home SYSTEM "../params/htmlhelp.button.home.xml">
-<!ENTITY htmlhelp.button.home.url SYSTEM "../params/htmlhelp.button.home.url.xml">
-<!ENTITY htmlhelp.button.options SYSTEM "../params/htmlhelp.button.options.xml">
-<!ENTITY htmlhelp.button.print SYSTEM "../params/htmlhelp.button.print.xml">
-<!ENTITY htmlhelp.button.locate SYSTEM "../params/htmlhelp.button.locate.xml">
-<!ENTITY htmlhelp.button.jump1 SYSTEM "../params/htmlhelp.button.jump1.xml">
-<!ENTITY htmlhelp.button.jump1.url SYSTEM "../params/htmlhelp.button.jump1.url.xml">
-<!ENTITY htmlhelp.button.jump1.title SYSTEM "../params/htmlhelp.button.jump1.title.xml">
-<!ENTITY htmlhelp.button.jump2 SYSTEM "../params/htmlhelp.button.jump2.xml">
-<!ENTITY htmlhelp.button.jump2.url SYSTEM "../params/htmlhelp.button.jump2.url.xml">
-<!ENTITY htmlhelp.button.jump2.title SYSTEM "../params/htmlhelp.button.jump2.title.xml">
-<!ENTITY htmlhelp.button.next SYSTEM "../params/htmlhelp.button.next.xml">
-<!ENTITY htmlhelp.button.prev SYSTEM "../params/htmlhelp.button.prev.xml">
-<!ENTITY htmlhelp.button.zoom SYSTEM "../params/htmlhelp.button.zoom.xml">
+<!ENTITY htmlhelp.show.menu SYSTEM "../params/htmlhelp.show.menu.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">
@@ -174,9 +176,9 @@
 <!ENTITY show.comments SYSTEM "../params/show.comments.xml">
 <!ENTITY show.revisionflag SYSTEM "../params/show.revisionflag.xml">
 <!ENTITY spacing.paras SYSTEM "../params/spacing.paras.xml">
-<!ENTITY suppress.navigation SYSTEM "../params/suppress.navigation.xml">
-<!ENTITY suppress.header.navigation SYSTEM "../params/suppress.header.navigation.xml">
 <!ENTITY suppress.footer.navigation SYSTEM "../params/suppress.footer.navigation.xml">
+<!ENTITY suppress.header.navigation SYSTEM "../params/suppress.header.navigation.xml">
+<!ENTITY suppress.navigation SYSTEM "../params/suppress.navigation.xml">
 <!ENTITY table.border.color SYSTEM "../params/table.border.color.xml">
 <!ENTITY table.border.style SYSTEM "../params/table.border.style.xml">
 <!ENTITY table.border.thickness SYSTEM "../params/table.border.thickness.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 61d47c553b779ccc4d2acbbc2ab18030486245e4..15146e8408a12932cf434ceba72236cc92d38b42 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -148,6 +148,8 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &suppress.navigation;
 &suppress.header.navigation;
 &suppress.footer.navigation;
+&header.rule;
+&footer.rule;
 </reference>
 
 <reference><title>Meta/*Info</title>
@@ -387,6 +389,7 @@ around all these parameters.</para>
 <src:fragref linkend="ebnf.table.border.frag"/>
 <src:fragref linkend="emphasis.propagates.style.frag"/>
 <src:fragref linkend="firstterm.only.link.frag"/>
+<src:fragref linkend="footer.rule.frag"/>
 <src:fragref linkend="formal.procedures.frag"/>
 <src:fragref linkend="formal.title.placement.frag"/>
 <src:fragref linkend="funcsynopsis.decoration.frag"/>
@@ -402,6 +405,7 @@ around all these parameters.</para>
 <src:fragref linkend="glossary.collection.frag"/>
 <src:fragref linkend="glossterm.auto.link.frag"/>
 <src:fragref linkend="graphic.default.extension.frag"/>
+<src:fragref linkend="header.rule.frag"/>
 <src:fragref linkend="html.base.frag"/>
 <src:fragref linkend="html.cleanup.frag"/>
 <src:fragref linkend="html.ext.frag"/>
@@ -412,45 +416,45 @@ around all these parameters.</para>
 <src:fragref linkend="html.stylesheet.type.frag"/>
 <src:fragref linkend="htmlhelp.alias.file.frag"/>
 <src:fragref linkend="htmlhelp.autolabel.frag"/>
+<src:fragref linkend="htmlhelp.button.back.frag"/>
+<src:fragref linkend="htmlhelp.button.forward.frag"/>
+<src:fragref linkend="htmlhelp.button.hideshow.frag"/>
+<src:fragref linkend="htmlhelp.button.home.frag"/>
+<src:fragref linkend="htmlhelp.button.home.url.frag"/>
+<src:fragref linkend="htmlhelp.button.jump1.frag"/>
+<src:fragref linkend="htmlhelp.button.jump1.title.frag"/>
+<src:fragref linkend="htmlhelp.button.jump1.url.frag"/>
+<src:fragref linkend="htmlhelp.button.jump2.frag"/>
+<src:fragref linkend="htmlhelp.button.jump2.title.frag"/>
+<src:fragref linkend="htmlhelp.button.jump2.url.frag"/>
+<src:fragref linkend="htmlhelp.button.locate.frag"/>
+<src:fragref linkend="htmlhelp.button.next.frag"/>
+<src:fragref linkend="htmlhelp.button.options.frag"/>
+<src:fragref linkend="htmlhelp.button.prev.frag"/>
+<src:fragref linkend="htmlhelp.button.print.frag"/>
+<src:fragref linkend="htmlhelp.button.refresh.frag"/>
+<src:fragref linkend="htmlhelp.button.stop.frag"/>
+<src:fragref linkend="htmlhelp.button.zoom.frag"/>
 <src:fragref linkend="htmlhelp.chm.frag"/>
 <src:fragref linkend="htmlhelp.default.topic.frag"/>
 <src:fragref linkend="htmlhelp.encoding.frag"/>
 <src:fragref linkend="htmlhelp.enumerate.images.frag"/>
 <src:fragref linkend="htmlhelp.force.map.and.alias.frag"/>
+<src:fragref linkend="htmlhelp.hhc.binary.frag"/>
 <src:fragref linkend="htmlhelp.hhc.folders.instead.books.frag"/>
 <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.binary.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.map.file.frag"/>
-<src:fragref linkend="htmlhelp.title.frag"/>
-<src:fragref linkend="htmlhelp.show.menu.frag"/>
+<src:fragref linkend="htmlhelp.only.frag"/>
 <src:fragref linkend="htmlhelp.show.advanced.search.frag"/>
 <src:fragref linkend="htmlhelp.show.favorities.frag"/>
-<src:fragref linkend="htmlhelp.button.hideshow.frag"/>
-<src:fragref linkend="htmlhelp.button.back.frag"/>
-<src:fragref linkend="htmlhelp.button.forward.frag"/>
-<src:fragref linkend="htmlhelp.button.stop.frag"/>
-<src:fragref linkend="htmlhelp.button.refresh.frag"/>
-<src:fragref linkend="htmlhelp.button.home.frag"/>
-<src:fragref linkend="htmlhelp.button.home.url.frag"/>
-<src:fragref linkend="htmlhelp.button.options.frag"/>
-<src:fragref linkend="htmlhelp.button.print.frag"/>
-<src:fragref linkend="htmlhelp.button.locate.frag"/>
-<src:fragref linkend="htmlhelp.button.jump1.frag"/>
-<src:fragref linkend="htmlhelp.button.jump1.url.frag"/>
-<src:fragref linkend="htmlhelp.button.jump1.title.frag"/>
-<src:fragref linkend="htmlhelp.button.jump2.frag"/>
-<src:fragref linkend="htmlhelp.button.jump2.url.frag"/>
-<src:fragref linkend="htmlhelp.button.jump2.title.frag"/>
-<src:fragref linkend="htmlhelp.button.next.frag"/>
-<src:fragref linkend="htmlhelp.button.prev.frag"/>
-<src:fragref linkend="htmlhelp.button.zoom.frag"/>
-<src:fragref linkend="htmlhelp.only.frag"/>
+<src:fragref linkend="htmlhelp.show.menu.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"/>
@@ -517,9 +521,9 @@ around all these parameters.</para>
 <src:fragref linkend="show.comments.frag"/>
 <src:fragref linkend="show.revisionflag.frag"/>
 <src:fragref linkend="spacing.paras.frag"/>
-<src:fragref linkend="suppress.navigation.frag"/>
-<src:fragref linkend="suppress.header.navigation.frag"/>
 <src:fragref linkend="suppress.footer.navigation.frag"/>
+<src:fragref linkend="suppress.header.navigation.frag"/>
+<src:fragref linkend="suppress.navigation.frag"/>
 <src:fragref linkend="table.border.color.frag"/>
 <src:fragref linkend="table.border.style.frag"/>
 <src:fragref linkend="table.border.thickness.frag"/>