Support menuchoice.menu.separator and menuchoice.separator

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index 79bf3ba6765aefe74433f68a87111a6011e983e3..4434bf0cbd88c606971f04fadc4d27383d0381a3 100644 (file)
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -764,9 +764,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/fo/param.ent b/xsl/fo/param.ent
index cc45283a4fe9f8beaa6bc2dd821c44a351ed4180..5ceba1534408095448bf4a075dbd78d9ed4b29e6 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -159,3 +159,5 @@
 <!ENTITY xep.extensions SYSTEM "../params/xep.extensions.xml">
 <!ENTITY xref.properties SYSTEM "../params/xref.properties.xml">
 <!ENTITY sidebar.properties SYSTEM "../params/sidebar.properties.xml">
+<!ENTITY menuchoice.separator SYSTEM "../params/menuchoice.separator.xml">
+<!ENTITY menuchoice.menu.separator SYSTEM "../params/menuchoice.menu.separator.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 88c567b446a7ec2d254d40aa7f849150a3551fb5..222ae1394c6e4c4418f4e12b9937f15c7bd52fb4 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -204,6 +204,8 @@ generate.section.toc.level;
 &shade.verbatim.style;
 &use.svg;
 &use.role.as.xrefstyle;
+&menuchoice.separator;
+&menuchoice.menu.separator;
 </reference>
 
 <reference><title>Pagination and General Styles</title>
@@ -474,6 +476,8 @@ around all these parameters.</para>
 <src:fragref linkend="list.item.spacing.frag"/>
 <src:fragref linkend="make.single.year.ranges.frag"/>
 <src:fragref linkend="make.year.ranges.frag"/>
+<src:fragref linkend="menuchoice.menu.separator.frag"/>
+<src:fragref linkend="menuchoice.separator.frag"/>
 <src:fragref linkend="monospace.font.family.frag"/>
 <src:fragref linkend="monospace.verbatim.properties.frag"/>
 <src:fragref linkend="nominal.table.width.frag"/>