Support menuchoice.menu.separator, menuchoice.separator, and bibliography.numbered

diff --git a/xsl/html/biblio.xsl b/xsl/html/biblio.xsl
index 646ab17ffd04f74f49ad9316c3fbaeb2e067b957..67c17a4bdd3bb30f2b666d33ee3360f3068af8cf 100644 (file)
--- a/xsl/html/biblio.xsl
+++ b/xsl/html/biblio.xsl
@@ -163,6 +163,11 @@
   <xsl:param name="node" select="."/>
 
   <xsl:choose>
+    <xsl:when test="$bibliography.numbered != 0">
+      <xsl:text>[</xsl:text>
+      <xsl:number from="bibliography" count="biblioentry|bibliomixed" format="1"/>
+      <xsl:text>] </xsl:text>
+    </xsl:when>
     <xsl:when test="local-name($node/child::*[1]) = 'abbrev'">
       <xsl:text>[</xsl:text>
       <xsl:apply-templates select="$node/abbrev[1]"/>

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index 46c59f0569d04eddffc886e215b6f99f9361c2e6..46e2d2bf2a284523757c2eb5e645a6f55dbb78d5 100644 (file)
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -930,9 +930,11 @@
       <xsl:choose>
         <xsl:when test="name($node)='guimenuitem'
                         or name($node)='guisubmenu'">
-          <xsl:text>-&gt;</xsl:text>
+          <xsl:value-of select="$menuchoice.menu.separator"/>
         </xsl:when>
-        <xsl:otherwise>+</xsl:otherwise>
+        <xsl:otherwise>
+          <xsl:value-of select="$menuchoice.separator"/>
+        </xsl:otherwise>
       </xsl:choose>
       <xsl:apply-templates select="$node"/>
       <xsl:call-template name="process.menuchoice">

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 7ef8e2ac901363e067e3c0c0bdde24ef293b3a3e..0b5f9ee4c2c1ed275fbebc3d93bc93c6485cd0f1 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -206,3 +206,6 @@
 <!ENTITY para.propagates.style SYSTEM "../params/para.propagates.style.xml">
 <!ENTITY html.cellpadding SYSTEM "../params/html.cellpadding.xml">
 <!ENTITY html.cellspacing SYSTEM "../params/html.cellspacing.xml">
+<!ENTITY menuchoice.separator SYSTEM "../params/menuchoice.separator.xml">
+<!ENTITY menuchoice.menu.separator SYSTEM "../params/menuchoice.menu.separator.xml">
+<!ENTITY bibliography.numbered SYSTEM "../params/bibliography.numbered.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index b90bdeaa026eb20282ea490b903fb1324a0f12c2..597b0298c8ee71bb3d9cd7654b414bd5290c90ac 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -208,6 +208,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 <reference><title>Bibliography</title>
 &biblioentry.item.separator;
 &bibliography.collection;
+&bibliography.numbered;
 </reference>
 
 <reference><title>Glossary</title>
@@ -235,6 +236,8 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &points.per.em;
 &use.svg;
 &use.role.as.xrefstyle;
+&menuchoice.separator;
+&menuchoice.menu.separator;
 </reference>
 
 <reference><title>Graphics</title>
@@ -373,6 +376,7 @@ around all these parameters.</para>
 <src:fragref linkend="base.dir.frag"/>
 <src:fragref linkend="biblioentry.item.separator.frag"/>
 <src:fragref linkend="bibliography.collection.frag"/>
+<src:fragref linkend="bibliography.numbered.frag"/>
 <src:fragref linkend="bridgehead.in.toc.frag"/>
 <src:fragref linkend="callout.defaultcolumn.frag"/>
 <src:fragref linkend="callout.graphics.extension.frag"/>
@@ -480,6 +484,8 @@ around all these parameters.</para>
 <src:fragref linkend="make.year.ranges.frag"/>
 <src:fragref linkend="manifest.frag"/>
 <src:fragref linkend="manual.toc.frag"/>
+<src:fragref linkend="menuchoice.menu.separator.frag"/>
+<src:fragref linkend="menuchoice.separator.frag"/>
 <src:fragref linkend="navig.graphics.extension.frag"/>
 <src:fragref linkend="navig.graphics.frag"/>
 <src:fragref linkend="navig.graphics.path.frag"/>