texinfo-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp Texinfo/Convert/XML.pm t/results/con...

From: Patrice Dumas
Subject: texinfo/tp Texinfo/Convert/XML.pm t/results/con...
Date: Sun, 26 Aug 2012 15:27:37 +0000 
CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/08/26 15:27:36

Modified files:
        tp/Texinfo/Convert: XML.pm 
        tp/t/results/converters_tests: at_commands_in_refs.pl 
                                       ref_in_sectioning.pl 
                                       some_at_commands_in_ref_nodes.pl 
                                       spaces_in_empty_node_names.pl 
                                       spaces_in_node_names.pl 
                                       things_before_setfilename.pl 
                                       things_before_setfilename_no_element.pl 
        tp/t/results/menu: block_commands_in_menu_description.pl 
                           comment_on_menu_line.pl dash_in_menu.pl 
                           detailmenu.pl detailmenu_in_description.pl 
                           detailmenu_on_subnodes.pl 
                           entry_after_detailmenu.pl 
                           example_in_menu_comment.pl 
                           example_in_menu_description.pl 
                           formats_in_menu.pl 
                           inlineraw_in_menu_description.pl 
                           menu_entry_name.pl menu_entry_name_comment.pl 
                           menu_entry_no_entry_location.pl 
                           menu_entry_node.pl 
                           menu_entry_node_comments.pl 
                           menu_in_example.pl menu_pointing_to_anchor.pl 
                           menu_title_before_entries.pl 
                           reference_to_external_manual.pl sc_in_menu.pl 
                           simple.pl simple_no_menu.pl 
                           verb_in_menu_description.pl 
        tp/t/results/sectioning: chapter_between_nodes.pl 
                                 chapter_node_before_and_after_part.pl 
                                 double_part.pl 
                                 explicit_node_directions.pl 
                                 more_sections_than_nodes.pl 
                                 node_part_chapter_after_chapter.pl 
                                 node_part_chapter_after_top.pl 
                                 nodes_after_top_before_chapter_nodes.pl 
                                 nodes_no_node_top_explicit_directions.pl 
                                 part_chapter_after_top.pl 
                                 part_node_after_top.pl 
                                 part_node_before_top.pl 
                                 part_node_chapter_after_top.pl 
                                 part_node_chapter_appendix.pl 
                                 part_node_chapter_node_appendix.pl 
                                 part_node_node_part_appendix.pl 
                                 part_node_part_appendix.pl 
                                 part_node_part_node_appendix.pl 
                                 section_before_top.pl 
                                 section_in_unnumbered_plaintext.pl 
                                 two_nodes_between_chapters.pl 
        tp/t/results/xml_tests: image_inline_or_not.pl 
        tp/tests/layout/res_parser/formatting_xml: formatting.xml 

Log message:
        Keep menu entry leading text and separator information in XML.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/comment_on_menu_line.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/dash_in_menu.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu_in_description.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/entry_after_detailmenu.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/example_in_menu_comment.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/example_in_menu_description.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/formats_in_menu.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_name.pl?cvsroot=texinfo&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_name_comment.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_no_entry_location.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_node.pl?cvsroot=texinfo&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_node_comments.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_in_example.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_title_before_entries.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/reference_to_external_manual.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/sc_in_menu.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple.pl?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple_no_menu.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/verb_in_menu_description.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_part.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/explicit_node_directions.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_after_top.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_before_top.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_appendix.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_node_appendix.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_part_appendix.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_part_node_appendix.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_top.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.8&r2=1.9

Patches:
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- Texinfo/Convert/XML.pm      26 Aug 2012 14:15:04 -0000      1.72
+++ Texinfo/Convert/XML.pm      26 Aug 2012 15:27:32 -0000      1.73
@@ -209,16 +209,11 @@
  'deftp'     => 'datatype',
 );
 
-# FIXME none should be ignored
 my %ignored_types;
-foreach my $type (#'empty_line_after_command',
+foreach my $type (
+            # those are put as spaces in the corresponding @-command
             'empty_spaces_after_command', 
             'empty_spaces_before_argument', 
-            #'empty_spaces_before_paragraph',
-            #'empty_spaces_after_close_brace', 
-            #'empty_space_at_end_def_bracketed',
-            'menu_entry_separator',
-            'menu_entry_leading_text',
   ) {
   $ignored_types{$type} = 1;
 }
@@ -1063,11 +1058,18 @@
   }
   if ($root->{'type'}) {
     if (defined($type_elements{$root->{'type'}})) {
-      my $attribute;
+      my $attribute = '';
       if ($root->{'type'} eq 'preformatted') {
         $attribute = ' xml:space="preserve"';
-      } else {
-        $attribute = '';
+      } elsif ($root->{'type'} eq 'menu_entry') {
+        $attribute .= ' leadingtext="'.$self->xml_protect_text(
+                              $self->_convert($root->{'args'}->[0])).'"';
+      } elsif (($root->{'type'} eq 'menu_entry_node' 
+                or $root->{'type'} eq 'menu_entry_name')
+               and $self->{'pending_menu_entry_separator'}) {
+        $attribute .= ' separator="'.$self->xml_protect_text(
+               $self->_convert($self->{'pending_menu_entry_separator'})).'"';
+        delete $self->{'pending_menu_entry_separator'};
       }
       $result .= "<$type_elements{$root->{'type'}}${attribute}>";
     }
@@ -1144,8 +1146,20 @@
     pop @{$self->{'document_context'}->[-1]->{'monospace'}}
       if ($in_code);
   }
+  my $arg_nr = -1;
   if ($root->{'type'} and $root->{'type'} eq 'menu_entry') {
     foreach my $arg (@{$root->{'args'}}) {
+      $arg_nr++;
+      # menu_entry_leading_text is added as attribute leadingtext of menu_entry
+      # menu_entry_separator is recorded here and then added ass attribute
+      # separator
+      next if ($arg->{'type'} eq 'menu_entry_leading_text'
+               or $arg->{'type'} eq 'menu_entry_separator');
+      if ($root->{'args'}->[$arg_nr +1]
+          and $root->{'args'}->[$arg_nr +1]->{'type'}
+          and $root->{'args'}->[$arg_nr +1]->{'type'} eq 
'menu_entry_separator') {
+        $self->{'pending_menu_entry_separator'} = $root->{'args'}->[$arg_nr 
+1];
+      }
       my $in_code;
       if ($arg->{'type'} eq 'menu_entry_node') {
         $in_code = 1;

Index: t/results/converters_tests/at_commands_in_refs.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/converters_tests/at_commands_in_refs.pl   26 Aug 2012 14:15:10 
-0000      1.19
+++ t/results/converters_tests/at_commands_in_refs.pl   26 Aug 2012 15:27:33 
-0000      1.20
@@ -22325,32 +22325,32 @@
 <top spaces=" "><sectiontitle>Top</sectiontitle>
 
 <menu>
-<menuentry><menunode>&hyphenbreak; &lbrace; 
&rbrace;</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><spacecmd 
type="spc"/> <spacecmd type="tab"/> &eosexcl; &linebreak; &eosperiod; &noeos; 
.&noeos; &eosquest; &arobase;</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>&atchar; &lbracechar; 
&rbracechar; &backslashchar; &hashchar;</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>&latex; &tex; 
&bullet; &comma; &copyright; &dots; &enddots;</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>&equiv; &errorglyph; 
&euro; &iexcl; &expansion; &minus;</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>&ge; &le; 
&rarr;</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>&ordf; &ordm; &point; 
&pound; &printglyph; &iquest; &registered;</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>&result; &deg; 
a&nbsp;b <today/> &aring;</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>&Aring; &aelig; 
&oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &lslash; &Lslash; &ETH; &eth; 
&THORN; &thorn;</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><accent 
type="uml">a</accent> <accent type="tilde">e</accent> <accent 
type="circ"><dotless>i</dotless></accent> <accent type="circ">a</accent> 
<accent type="grave">a</accent> <accent type="acute" bracketed="off">e</accent> 
<accent type="cedil">c</accent> <accent type="macr">e</accent> <accent 
type="ring">e</accent> <accent type="doubleacute">e</accent> <accent 
type="ogon">e</accent></menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><accent 
type="dotaccent">e</accent> <accent type="breve">e</accent> <accent 
type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> <accent 
type="caron">e</accent> <dotless>j</dotless> <accent 
type="tieaccent">ee</accent></menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><dotless>i</dotless> 
<accent type="grave"><accent type="macr" bracketed="off">E</accent></accent> 
<accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent></menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>&ldquo; &rdquo; 
&lsquo; &rsquo; &bdquo; &sbquo;</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>&laquo; &raquo; 
&laquo; &raquo; &lsaquo; &rsaquo;</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>`` \'\' --- -- ` 
\'</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><acronym><acronymword>AAA</acronymword><acronymdesc
 spaces=" ">fff</acronymdesc></acronym> 
<acronym><acronymword>AAA</acronymword></acronym> 
<acronym><acronymword>BBB</acronymword></acronym></menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><abbr><abbrword>CCC</abbrword><abbrdesc
 spaces=" ">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr> 
<abbr><abbrword>DDD</abbrword></abbr></menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><email><emailaddress>someone&arobase;somewher</emailaddress><emailname
 spaces=" ">the someone</emailname></email> 
<email><emailaddress>no_explain&arobase;there</emailaddress></email></menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><image 
where="inline"><imagefile>f--ile1</imagefile></image>  <image 
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><verb delimiter="."> 
@ {} . </verb></menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><cite>cite 
<asis>asis</asis></cite> <w>in &arobase;w <b>b</b></w> <r>in r</r> <sc>sc</sc> 
<strong>str</strong> <t>t</t> <var>var</var> <dfn>dfn</dfn> 
<i>i</i></menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><env>env</env> 
<code>code</code> <option>option</option> <samp>samp</samp> 
<command>command</command> <file>file</file> <kbd>C-x 
<key>ESC</key></kbd></menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>8.27<dmn>in</dmn></menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><sansserif>sansserif</sansserif>
 <slanted>slanted</slanted></menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><indicateurl>indicateurl</indicateurl></menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><url><urefurl>http://somewhere_aaa</urefurl></url>
 <url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url> 
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></menunode><menudescription><pre
 xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">&hyphenbreak; &lbrace; 
&rbrace;</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><spacecmd type="spc"/> <spacecmd type="tab"/> &eosexcl; 
&linebreak; &eosperiod; &noeos; .&noeos; &eosquest; 
&arobase;</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">&atchar; &lbracechar; &rbracechar; &backslashchar; 
&hashchar;</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">&latex; &tex; &bullet; &comma; &copyright; &dots; 
&enddots;</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">&equiv; &errorglyph; &euro; &iexcl; &expansion; 
&minus;</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">&ge; &le; &rarr;</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">&ordf; &ordm; &point; &pound; &printglyph; &iquest; 
&registered;</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">&result; &deg; a&nbsp;b <today/> 
&aring;</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; 
&szlig; &lslash; &Lslash; &ETH; &eth; &THORN; 
&thorn;</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><accent type="uml">a</accent> <accent type="tilde">e</accent> 
<accent type="circ"><dotless>i</dotless></accent> <accent 
type="circ">a</accent> <accent type="grave">a</accent> <accent type="acute" 
bracketed="off">e</accent> <accent type="cedil">c</accent> <accent 
type="macr">e</accent> <accent type="ring">e</accent> <accent 
type="doubleacute">e</accent> <accent 
type="ogon">e</accent></menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><accent type="dotaccent">e</accent> <accent 
type="breve">e</accent> <accent type="ubaraccent">e</accent> <accent 
type="udotaccent">e</accent> <accent type="caron">e</accent> 
<dotless>j</dotless> <accent 
type="tieaccent">ee</accent></menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><dotless>i</dotless> <accent type="grave"><accent type="macr" 
bracketed="off">E</accent></accent> <accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent></menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; 
&sbquo;</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">&laquo; &raquo; &laquo; &raquo; &lsaquo; 
&rsaquo;</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">`` \'\' --- -- ` \'</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><acronym><acronymword>AAA</acronymword><acronymdesc spaces=" 
">fff</acronymdesc></acronym> <acronym><acronymword>AAA</acronymword></acronym> 
<acronym><acronymword>BBB</acronymword></acronym></menunode><menudescription><pre
 xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><abbr><abbrword>CCC</abbrword><abbrdesc spaces=" 
">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr> 
<abbr><abbrword>DDD</abbrword></abbr></menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><email><emailaddress>someone&arobase;somewher</emailaddress><emailname
 spaces=" ">the someone</emailname></email> 
<email><emailaddress>no_explain&arobase;there</emailaddress></email></menunode><menudescription><pre
 xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><image where="inline"><imagefile>f--ile1</imagefile></image>  
<image 
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></menunode><menudescription><pre
 xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><verb delimiter="."> @ {} . 
</verb></menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><cite>cite <asis>asis</asis></cite> <w>in &arobase;w 
<b>b</b></w> <r>in r</r> <sc>sc</sc> <strong>str</strong> <t>t</t> 
<var>var</var> <dfn>dfn</dfn> <i>i</i></menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><env>env</env> <code>code</code> <option>option</option> 
<samp>samp</samp> <command>command</command> <file>file</file> <kbd>C-x 
<key>ESC</key></kbd></menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">8.27<dmn>in</dmn></menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><sansserif>sansserif</sansserif> 
<slanted>slanted</slanted></menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><indicateurl>indicateurl</indicateurl></menunode><menudescription><pre
 xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><url><urefurl>http://somewhere_aaa</urefurl></url> 
<url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url> 
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></menunode><menudescription><pre
 xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/converters_tests/ref_in_sectioning.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/converters_tests/ref_in_sectioning.pl     26 Aug 2012 14:15:14 
-0000      1.10
+++ t/results/converters_tests/ref_in_sectioning.pl     26 Aug 2012 15:27:33 
-0000      1.11
@@ -3156,8 +3156,8 @@
 <top spaces=" "><sectiontitle>for example 
<ref><xrefnodename>node</xrefnodename></ref> 
(<pxref><xrefnodename>node</xrefnodename></pxref>) 
(<pxref><xrefnodename>Top</xrefnodename><xrefinfofile spaces=" 
">file</xrefinfofile><xrefprintedname spaces=" 
">Manual</xrefprintedname></pxref>)</sectiontitle>
 
 <menu>
-<menuentry><menunode>node</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>chap</menunode><menudescription><pre
 xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">node</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chap</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/converters_tests/some_at_commands_in_ref_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/some_at_commands_in_ref_nodes.pl 26 Aug 2012 
14:15:16 -0000      1.5
+++ t/results/converters_tests/some_at_commands_in_ref_nodes.pl 26 Aug 2012 
15:27:33 -0000      1.6
@@ -1771,7 +1771,7 @@
 <top spaces=" "><sectiontitle>Top</sectiontitle>
 
 <menu>
-<menuentry><menunode>A <sc>sc <accent type="tilde" bracketed="off">n</accent> 
&aring; &tex;</sc> node <accent type="uml" bracketed="off">i</accent> <accent 
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent 
type="macr" bracketed="off">E</accent></accent> &lslash; <accent 
type="cedil"><accent type="acute" bracketed="off">C</accent></accent> 
&iexcl;</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">A <sc>sc <accent 
type="tilde" bracketed="off">n</accent> &aring; &tex;</sc> node <accent 
type="uml" bracketed="off">i</accent> <accent 
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent 
type="macr" bracketed="off">E</accent></accent> &lslash; <accent 
type="cedil"><accent type="acute" bracketed="off">C</accent></accent> 
&iexcl;</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/converters_tests/spaces_in_empty_node_names.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/converters_tests/spaces_in_empty_node_names.pl    24 Aug 2012 
16:43:18 -0000      1.3
+++ t/results/converters_tests/spaces_in_empty_node_names.pl    26 Aug 2012 
15:27:33 -0000      1.4
@@ -1090,9 +1090,9 @@
 $result_converted{'xml'}->{'spaces_in_empty_node_names'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
 
 <menu>
-<menuentry><menunode><spacecmd type="spc"/><spacecmd 
type="spc"/></menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><verb delimiter=":">  
</verb></menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><spacecmd 
type="spc"/></menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::"><spacecmd 
type="spc"/><spacecmd type="spc"/></menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><verb delimiter=":">  </verb></menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><spacecmd type="spc"/></menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="" spaces=" "><nodename></nodename></node>

Index: t/results/converters_tests/spaces_in_node_names.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/converters_tests/spaces_in_node_names.pl  24 Aug 2012 16:43:18 
-0000      1.3
+++ t/results/converters_tests/spaces_in_node_names.pl  26 Aug 2012 15:27:33 
-0000      1.4
@@ -1177,9 +1177,9 @@
 $result_converted{'xml'}->{'spaces_in_node_names'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">a<spacecmd 
type="spc"/><spacecmd type="spc"/></nodenext><nodeup 
automatic="on">(dir)</nodeup></node>
 
 <menu>
-<menuentry><menunode>a<spacecmd type="spc"/><spacecmd 
type="spc"/></menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>b<verb delimiter=":"> 
 </verb></menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>c<spacecmd 
type="spc"/></menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">a<spacecmd 
type="spc"/><spacecmd type="spc"/></menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">b<verb delimiter=":">  </verb></menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">c<spacecmd type="spc"/></menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="a--" spaces=" "><nodename>a<spacecmd type="spc"/><spacecmd 
type="spc"/></nodename><nodenext automatic="on">b<verb delimiter=":">  
</verb></nodenext><nodeprev automatic="on">Top</nodeprev><nodeup 
automatic="on">Top</nodeup></node>

Index: t/results/converters_tests/things_before_setfilename.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/converters_tests/things_before_setfilename.pl     26 Aug 2012 
14:15:20 -0000      1.11
+++ t/results/converters_tests/things_before_setfilename.pl     26 Aug 2012 
15:27:33 -0000      1.12
@@ -1846,7 +1846,7 @@
 <contents></contents>
 
 <menu>
-<menuentry><menunode>An anchor</menunode><menudescription><pre 
xml:space="preserve">menu entry pointing to the anchor.
+<menuentry leadingtext="* "><menunode separator="::                ">An 
anchor</menunode><menudescription><pre xml:space="preserve">menu entry pointing 
to the anchor.
 </pre></menudescription></menuentry></menu>
 
 <cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>

Index: t/results/converters_tests/things_before_setfilename_no_element.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/converters_tests/things_before_setfilename_no_element.pl  26 Aug 
2012 14:15:21 -0000      1.11
+++ t/results/converters_tests/things_before_setfilename_no_element.pl  26 Aug 
2012 15:27:33 -0000      1.12
@@ -1665,7 +1665,7 @@
 <contents></contents>
 
 <menu>
-<menuentry><menunode>An anchor</menunode><menudescription><pre 
xml:space="preserve">menu entry pointing to the anchor.
+<menuentry leadingtext="* "><menunode separator="::                ">An 
anchor</menunode><menudescription><pre xml:space="preserve">menu entry pointing 
to the anchor.
 </pre></menudescription></menuentry></menu>
 
 <cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>

Index: t/results/menu/block_commands_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/menu/block_commands_in_menu_description.pl        24 Aug 2012 
16:43:20 -0000      1.6
+++ t/results/menu/block_commands_in_menu_description.pl        26 Aug 2012 
15:27:33 -0000      1.7
@@ -1056,7 +1056,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>(manual)</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">(manual)</menunode><menudescription><pre xml:space="preserve">
 </pre><itemize commandarg="bullet">
 <beforefirstitem><pre xml:space="preserve">
 </pre></beforefirstitem><listitem><prepend>&bullet;</prepend><pre 
xml:space="preserve">in item

Index: t/results/menu/comment_on_menu_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/menu/comment_on_menu_line.pl      24 Aug 2012 16:43:21 -0000      
1.17
+++ t/results/menu/comment_on_menu_line.pl      26 Aug 2012 15:27:33 -0000      
1.18
@@ -577,7 +577,7 @@
 $result_converted{'xml'}->{'comment_on_menu_line'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">first</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 
 <menu spaces="  "><!-- c -->
-<menuentry><menunode>first</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">first</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <chapter spaces=" "><sectiontitle>first</sectiontitle>

Index: t/results/menu/dash_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/dash_in_menu.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/menu/dash_in_menu.pl      23 Aug 2012 18:15:06 -0000      1.21
+++ t/results/menu/dash_in_menu.pl      26 Aug 2012 15:27:33 -0000      1.22
@@ -336,7 +336,7 @@
 
 $result_converted{'xml'}->{'dash_in_menu'} = '
 <menu>
-<menuentry><menutitle>entry&textmdash;in</menutitle><menunode>(manual)n---ode</menunode><menudescription><pre
 xml:space="preserve">description &textmdash; in.
+<menuentry leadingtext="* "><menutitle separator=": 
">entry&textmdash;in</menutitle><menunode separator=".         
">(manual)n---ode</menunode><menudescription><pre 
xml:space="preserve">description &textmdash; in.
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 comment &textmdash; in.
 </pre></menucomment></menu>

Index: t/results/menu/detailmenu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/menu/detailmenu.pl        23 Aug 2012 18:15:06 -0000      1.36
+++ t/results/menu/detailmenu.pl        26 Aug 2012 15:27:34 -0000      1.37
@@ -466,10 +466,10 @@
 
 $result_converted{'xml'}->{'detailmenu'} = '
 <menu>
-<menuentry><menunode>Copying Conditions</menunode><menudescription><pre 
xml:space="preserve">Your rights.
+<menuentry leadingtext="* "><menunode separator="::          ">Copying 
Conditions</menunode><menudescription><pre xml:space="preserve">Your rights.
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 </pre></menucomment><detailmenu>
-<menuentry><menunode>detailmenu</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">detailmenu</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 </menu>
 ';

Index: t/results/menu/detailmenu_in_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/detailmenu_in_description.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/menu/detailmenu_in_description.pl 23 Aug 2012 18:15:06 -0000      
1.10
+++ t/results/menu/detailmenu_in_description.pl 26 Aug 2012 15:27:34 -0000      
1.11
@@ -441,9 +441,9 @@
 
 $result_converted{'xml'}->{'detailmenu_in_description'} = '
 <menu>
-<menuentry><menunode>Copying Conditions</menunode><menudescription><pre 
xml:space="preserve">Your rights.
+<menuentry leadingtext="* "><menunode separator="::          ">Copying 
Conditions</menunode><menudescription><pre xml:space="preserve">Your rights.
 </pre></menudescription></menuentry><detailmenu>
-<menuentry><menunode>detailmenu</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">detailmenu</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 </menu>
 ';

Index: t/results/menu/detailmenu_on_subnodes.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/menu/detailmenu_on_subnodes.pl    24 Aug 2012 16:43:21 -0000      
1.23
+++ t/results/menu/detailmenu_on_subnodes.pl    26 Aug 2012 15:27:34 -0000      
1.24
@@ -2321,18 +2321,18 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>chapter 
2</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">chapter</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chapter 2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 </pre></menucomment><detailmenu>
-<menuentry><menunode>section</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">section</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 <menucomment><pre xml:space="preserve">
 </pre></menucomment><detailmenu>
 <menucomment><pre xml:space="preserve">Chap 2
 
-</pre></menucomment><menuentry><menunode>section chap 
2</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>unnumberedsec</menunode><menudescription><pre
 xml:space="preserve">
+</pre></menucomment><menuentry leadingtext="* "><menunode 
separator="::">section chap 2</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumberedsec</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 </menu>
 
@@ -2341,7 +2341,7 @@
 <chapter spaces=" "><sectiontitle>chapter</sectiontitle>
 
 <menu>
-<menuentry><menunode>section</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">section</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="section" spaces=" "><nodename>section</nodename><nodeup 
automatic="on">chapter</nodeup></node>
@@ -2353,8 +2353,8 @@
 <chapter spaces=" "><sectiontitle>chapter 2</sectiontitle>
 
 <menu>
-<menuentry><menunode>section chap 2</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>unnumberedsec</menunode><menudescription><pre
 xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">section chap 
2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumberedsec</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="section-chap-2" spaces=" "><nodename>section chap 
2</nodename><nodenext automatic="on">unnumberedsec</nodenext><nodeup 
automatic="on">chapter 2</nodeup></node>

Index: t/results/menu/entry_after_detailmenu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/menu/entry_after_detailmenu.pl    24 Aug 2012 16:43:21 -0000      
1.13
+++ t/results/menu/entry_after_detailmenu.pl    26 Aug 2012 15:27:34 -0000      
1.14
@@ -1008,17 +1008,17 @@
 
 <menu>
 <detailmenu>
-<menuentry><menunode>second</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">second</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 <menucomment><pre xml:space="preserve">
 Menu comment
 
-</pre></menucomment><menuentry><menunode>first</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menucomment><menuentry leadingtext="* "><menunode 
separator="::">first</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 </pre></menucomment><detailmenu>
-<menuentry><menunode>second</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">second</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
-<menuentry><menunode>second</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">second</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="first" spaces=" "><nodename>first</nodename><nodenext 
automatic="on">second</nodenext><nodeprev automatic="on">Top</nodeprev><nodeup 
automatic="on">Top</nodeup></node>

Index: t/results/menu/example_in_menu_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/example_in_menu_comment.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/menu/example_in_menu_comment.pl   23 Aug 2012 18:15:07 -0000      
1.20
+++ t/results/menu/example_in_menu_comment.pl   26 Aug 2012 15:27:34 -0000      
1.21
@@ -444,7 +444,7 @@
 
 
 $result_converted{'xml'}->{'example_in_menu_comment'} = '<menu>
-<menuentry><menunode>entry</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">entry</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 </pre><example>
 <pre xml:space="preserve">in 

Index: t/results/menu/example_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/menu/example_in_menu_description.pl       24 Aug 2012 16:43:21 
-0000      1.6
+++ t/results/menu/example_in_menu_description.pl       26 Aug 2012 15:27:34 
-0000      1.7
@@ -606,7 +606,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>(manual)</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">(manual)</menunode><menudescription><pre xml:space="preserve">
 </pre><example>
 <pre xml:space="preserve">in 
 

Index: t/results/menu/formats_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/menu/formats_in_menu.pl   24 Aug 2012 16:43:21 -0000      1.27
+++ t/results/menu/formats_in_menu.pl   26 Aug 2012 15:27:34 -0000      1.28
@@ -1215,25 +1215,25 @@
 $result_converted{'xml'}->{'formats_in_menu'} = '<node name="Top" spaces=" 
"><nodename>Top</nodename><nodenext automatic="on">(gcc)</nodenext><nodeup 
automatic="on">(dir)</nodeup></node>
 
 <menu>
-<menuentry><menunode>(gcc)</menunode><menudescription><pre 
xml:space="preserve">text
+<menuentry leadingtext="* "><menunode separator=":: 
">(gcc)</menunode><menudescription><pre xml:space="preserve">text
 </pre><table commandarg="asis" spaces=" ">
 <tableentry><tableterm><item><itemformat 
command="asis">item</itemformat></item>
 </tableterm><tableitem><pre xml:space="preserve">* table line::
 </pre></tableitem></tableentry></table>
 </menudescription></menuentry><menucomment><pre xml:space="preserve">
-</pre></menucomment><menuentry><menunode>(info)</menunode><menudescription><pre
 xml:space="preserve">
+</pre></menucomment><menuentry leadingtext="* "><menunode 
separator="::">(info)</menunode><menudescription><pre xml:space="preserve">
 </pre><verbatim xml:space="preserve">
 some @ verb{x atim
 * texinfo:: in @ verbatim
 </verbatim>
 
-<pre 
xml:space="preserve"></pre></menudescription></menuentry><menuentry><menunode>(manual2)</menunode><menudescription><pre
 xml:space="preserve">%
+<pre xml:space="preserve"></pre></menudescription></menuentry><menuentry 
leadingtext="* "><menunode separator=":: 
">(manual2)</menunode><menudescription><pre xml:space="preserve">%
 <html>
 
 &lt;i&gt;&lt;/i&gt;
 </html>
 Log$
-</pre></menudescription></menuentry><menuentry><menunode>(truc)</menunode><menudescription><pre
 xml:space="preserve"><acronym><acronymword>description
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator=":: ">(truc)</menunode><menudescription><pre 
xml:space="preserve"><acronym><acronymword>description
 * acronym::</acronymword></acronym>
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 </pre><example>

Index: t/results/menu/inlineraw_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/menu/inlineraw_in_menu_description.pl     26 Aug 2012 14:15:37 
-0000      1.7
+++ t/results/menu/inlineraw_in_menu_description.pl     26 Aug 2012 15:27:34 
-0000      1.8
@@ -571,7 +571,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>(manual)</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">(manual)</menunode><menudescription><pre xml:space="preserve">
 <inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent spaces=" 
">in inline raw
 
 end inlineraw</inlinerawcontent></inlineraw>

Index: t/results/menu/menu_entry_name.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_entry_name.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- t/results/menu/menu_entry_name.pl   23 Aug 2012 18:15:07 -0000      1.35
+++ t/results/menu/menu_entry_name.pl   26 Aug 2012 15:27:34 -0000      1.36
@@ -1203,16 +1203,16 @@
 
 
 $result_converted{'xml'}->{'menu_entry_name'} = '<menu>
-<menuentry><menutitle>a</menutitle><menunode>(f)b
-</menunode><menudescription><pre 
xml:space="preserve"></pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b1.c</menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b2.c</menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b3.c</menunode><menudescription><pre
 xml:space="preserve">d
-</pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b1.</menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menutitle>a 
</menutitle><menunode>(f) b2 .</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menutitle>a.n</menutitle><menunode>(f)b3.</menunode><menudescription><pre
 xml:space="preserve">d
-</pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b1.c</menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b2.c</menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b3.c</menunode><menudescription><pre
 xml:space="preserve">d
+<menuentry leadingtext="* "><menutitle separator=": 
">a</menutitle><menunode>(f)b
+</menunode><menudescription><pre 
xml:space="preserve"></pre></menudescription></menuentry><menuentry 
leadingtext="* "><menutitle separator=": ">a</menutitle><menunode 
separator=",">(f)b1.c</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode separator=",     
">(f)b2.c</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode separator=",    
">(f)b3.c</menunode><menudescription><pre xml:space="preserve">d
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode separator=". 
">(f)b1.</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a </menutitle><menunode separator=".">(f) b2 
.</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a.n</menutitle><menunode separator=".         
">(f)b3.</menunode><menudescription><pre xml:space="preserve">d
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode 
separator=".">(f)b1.c</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode separator=".  
">(f)b2.c</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode separator=". 
">(f)b3.c</menunode><menudescription><pre xml:space="preserve">d
 </pre></menudescription></menuentry></menu>
 ';
 

Index: t/results/menu/menu_entry_name_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_entry_name_comment.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/menu/menu_entry_name_comment.pl   23 Aug 2012 18:15:08 -0000      
1.36
+++ t/results/menu/menu_entry_name_comment.pl   26 Aug 2012 15:27:34 -0000      
1.37
@@ -734,11 +734,11 @@
 
 
 $result_converted{'xml'}->{'menu_entry_name_comment'} = '<menu>
-<menuentry><menutitle>a</menutitle><menunode>(f)b</menunode><menudescription><pre
 xml:space="preserve"><!-- c c -->
-</pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b
 </menunode><menudescription><pre xml:space="preserve"><!-- c c -->
-</pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b1c.c</menunode><menudescription><pre
 xml:space="preserve"><!-- c c -->
-</pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b2c.c</menunode><menudescription><pre
 xml:space="preserve"><!-- c c -->
-</pre></menudescription></menuentry><menuentry><menutitle>a</menutitle><menunode>(f)b3c.c</menunode><menudescription><pre
 xml:space="preserve">d<!-- c c -->
+<menuentry leadingtext="* "><menutitle separator=": 
">a</menutitle><menunode>(f)b</menunode><menudescription><pre 
xml:space="preserve"><!-- c c -->
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode>(f)b </menunode><menudescription><pre 
xml:space="preserve"><!-- c c -->
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode 
separator=",">(f)b1c.c</menunode><menudescription><pre 
xml:space="preserve"><!-- c c -->
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode separator=",     
">(f)b2c.c</menunode><menudescription><pre xml:space="preserve"><!-- c c -->
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode separator=",    
">(f)b3c.c</menunode><menudescription><pre xml:space="preserve">d<!-- c c -->
 </pre></menudescription></menuentry></menu>
 ';
 

Index: t/results/menu/menu_entry_no_entry_location.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry_location.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/menu/menu_entry_no_entry_location.pl      23 Aug 2012 18:15:08 
-0000      1.14
+++ t/results/menu/menu_entry_no_entry_location.pl      26 Aug 2012 15:27:34 
-0000      1.15
@@ -450,13 +450,13 @@
 
 
 $result_converted{'xml'}->{'menu_entry_no_entry_location'} = '<menu>
-<menuentry><menunode>(manual)</menunode><menudescription><pre 
xml:space="preserve">begin description
+<menuentry leadingtext="* "><menunode separator=":: 
">(manual)</menunode><menudescription><pre xml:space="preserve">begin 
description
 * not an entry ?
-</pre></menudescription></menuentry><menuentry><menunode>(manual)</menunode><menudescription><pre
 xml:space="preserve">an entry
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator=":: ">(manual)</menunode><menudescription><pre 
xml:space="preserve">an entry
   in description
 * and here ?
 with text.
-</pre></menudescription></menuentry><menuentry><menunode>(last 
manual)</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">(last manual)</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 ';
 

Index: t/results/menu/menu_entry_node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_entry_node.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- t/results/menu/menu_entry_node.pl   23 Aug 2012 18:15:08 -0000      1.35
+++ t/results/menu/menu_entry_node.pl   26 Aug 2012 15:27:34 -0000      1.36
@@ -532,10 +532,10 @@
 
 
 $result_converted{'xml'}->{'menu_entry_node'} = '<menu>
-<menuentry><menunode>(f)a1</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>(f)a2</menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>(f)a3</menunode><menudescription><pre
 xml:space="preserve">d
-</pre></menudescription></menuentry><menuentry><menunode>(f)&arobase;a&noeos;</menunode><menudescription><pre
 xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">(f)a1</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::  ">(f)a2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::         ">(f)a3</menunode><menudescription><pre 
xml:space="preserve">d
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator=":: ">(f)&arobase;a&noeos;</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 ';
 

Index: t/results/menu/menu_entry_node_comments.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_entry_node_comments.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/menu/menu_entry_node_comments.pl  23 Aug 2012 18:15:08 -0000      
1.36
+++ t/results/menu/menu_entry_node_comments.pl  26 Aug 2012 15:27:34 -0000      
1.37
@@ -557,10 +557,10 @@
 
 
 $result_converted{'xml'}->{'menu_entry_node_comments'} = '<menu>
-<menuentry><menunode>(f)a1c</menunode><menudescription><pre 
xml:space="preserve"><!-- c c -->
-</pre></menudescription></menuentry><menuentry><menunode>(f)a2c</menunode><menudescription><pre
 xml:space="preserve"><!-- c c -->
-</pre></menudescription></menuentry><menuentry><menunode>(f)a3c</menunode><menudescription><pre
 xml:space="preserve">d<!-- c c -->
-</pre></menudescription></menuentry><menuentry><menunode>(f) a4 
</menunode><menudescription><pre xml:space="preserve"><!-- c c -->
+<menuentry leadingtext="* "><menunode 
separator="::">(f)a1c</menunode><menudescription><pre xml:space="preserve"><!-- 
c c -->
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::  ">(f)a2c</menunode><menudescription><pre 
xml:space="preserve"><!-- c c -->
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::         ">(f)a3c</menunode><menudescription><pre 
xml:space="preserve">d<!-- c c -->
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::   ">(f) a4 </menunode><menudescription><pre 
xml:space="preserve"><!-- c c -->
 </pre></menudescription></menuentry></menu>
 ';
 

Index: t/results/menu/menu_in_example.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/menu/menu_in_example.pl   24 Aug 2012 16:43:21 -0000      1.12
+++ t/results/menu/menu_in_example.pl   26 Aug 2012 15:27:35 -0000      1.13
@@ -894,7 +894,7 @@
 
 <example>
 <menu>
-<menuentry><menunode>(entry)</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">(entry)</menunode><menudescription><pre xml:space="preserve">
 </pre><cartouche>
 <pre xml:space="preserve">in cartouche in description in menu in example
 </pre></cartouche>
@@ -903,8 +903,8 @@
 <pre xml:space="preserve">in cartouche in menu comment in menu in example
 </pre></cartouche>
 <pre xml:space="preserve">
-</pre></menucomment><menuentry><menunode>(node) 
menu</menunode><menudescription><pre xml:space="preserve">a node in menu
-</pre></menudescription></menuentry><menuentry><menutitle>a menu 
name</menutitle><menunode>(other) node</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menucomment><menuentry leadingtext="* "><menunode separator="::      
">(node) menu</menunode><menudescription><pre xml:space="preserve">a node in 
menu
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=":">a menu name</menutitle><menunode separator=". ">(other) 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 </example>
 ';

Index: t/results/menu/menu_pointing_to_anchor.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/menu/menu_pointing_to_anchor.pl   24 Aug 2012 16:43:21 -0000      
1.8
+++ t/results/menu/menu_pointing_to_anchor.pl   26 Aug 2012 15:27:35 -0000      
1.9
@@ -560,7 +560,7 @@
 <anchor name="An-anchor">An anchor</anchor>
 
 <menu>
-<menuentry><menunode>An anchor</menunode><menudescription><pre 
xml:space="preserve">menu entry pointing to the anchor.
+<menuentry leadingtext="* "><menunode separator="::                ">An 
anchor</menunode><menudescription><pre xml:space="preserve">menu entry pointing 
to the anchor.
 </pre></menudescription></menuentry></menu>
 </top>
 ';

Index: t/results/menu/menu_title_before_entries.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/menu/menu_title_before_entries.pl 24 Aug 2012 16:43:21 -0000      
1.18
+++ t/results/menu/menu_title_before_entries.pl 26 Aug 2012 15:27:35 -0000      
1.19
@@ -496,7 +496,7 @@
 
 <menu>
 <menucomment><pre xml:space="preserve">Horizontal space
-</pre></menucomment><menuentry><menunode>subnode</menunode><menudescription><pre
 xml:space="preserve">
+</pre></menucomment><menuentry leadingtext="* "><menunode 
separator="::">subnode</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="subnode" spaces=" "><nodename>subnode</nodename><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>

Index: t/results/menu/reference_to_external_manual.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/menu/reference_to_external_manual.pl      24 Aug 2012 16:43:21 
-0000      1.26
+++ t/results/menu/reference_to_external_manual.pl      26 Aug 2012 15:27:35 
-0000      1.27
@@ -401,7 +401,7 @@
 <node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">(info)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 
 <menu>
-<menuentry><menunode>(info)</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">(info)</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 ';
 

Index: t/results/menu/sc_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/menu/sc_in_menu.pl        24 Aug 2012 16:43:21 -0000      1.10
+++ t/results/menu/sc_in_menu.pl        26 Aug 2012 15:27:35 -0000      1.11
@@ -1319,7 +1319,7 @@
 <node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on"><sc>node</sc></nodenext><nodeup 
automatic="on">(dir)</nodeup></node>
 
 <menu>
-<menuentry><menutitle><sc>value</sc></menutitle><menunode><sc>node</sc></menunode><menudescription><pre
 xml:space="preserve"><sc>descrip tion</sc>
+<menuentry leadingtext="* "><menutitle 
separator=":"><sc>value</sc></menutitle><menunode separator=".   
"><sc>node</sc></menunode><menudescription><pre 
xml:space="preserve"><sc>descrip tion</sc>
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 <sc>menu comment</sc>
 
@@ -1334,7 +1334,7 @@
 
 <example>
 <menu>
-<menuentry><menutitle><sc>example 
value</sc></menutitle><menunode>(dir)<sc>example 
node</sc></menunode><menudescription><pre xml:space="preserve"><sc>example 
descrip tion</sc>
+<menuentry leadingtext="* "><menutitle separator=":"><sc>example 
value</sc></menutitle><menunode separator=".   ">(dir)<sc>example 
node</sc></menunode><menudescription><pre xml:space="preserve"><sc>example 
descrip tion</sc>
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 <sc>example comment</sc>
 </pre></menucomment></menu>

Index: t/results/menu/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- t/results/menu/simple.pl    23 Aug 2012 18:15:09 -0000      1.39
+++ t/results/menu/simple.pl    26 Aug 2012 15:27:35 -0000      1.40
@@ -745,15 +745,15 @@
 </para>
 <menu>
 <menucomment><pre xml:space="preserve">comment
-</pre></menucomment><menuentry><menutitle>menu entry name 
</menutitle><menunode>node</menunode><menudescription><pre 
xml:space="preserve">description
-</pre></menudescription></menuentry><menuentry><menunode>node 
name</menunode><menudescription><pre xml:space="preserve">description new
-</pre></menudescription></menuentry><menuentry><menutitle>other 
entry</menutitle><menunode>node</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>last</menunode><menudescription><pre
 xml:space="preserve">
+</pre></menucomment><menuentry leadingtext="* "><menutitle separator=": ">menu 
entry name </menutitle><menunode separator=".    
">node</menunode><menudescription><pre xml:space="preserve">description
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::                ">node name</menunode><menudescription><pre 
xml:space="preserve">description new
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">other entry</menutitle><menunode separator=",    
">node</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">last</menunode><menudescription><pre xml:space="preserve">
                  description next line
                  still description
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 new comment
-</pre></menucomment><menuentry><menunode>last node entry 
</menunode><menudescription><pre xml:space="preserve">
+</pre></menucomment><menuentry leadingtext="* "><menunode separator="::">last 
node entry </menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <para>After menu.

Index: t/results/menu/simple_no_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple_no_menu.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/menu/simple_no_menu.pl    23 Aug 2012 18:15:09 -0000      1.15
+++ t/results/menu/simple_no_menu.pl    26 Aug 2012 15:27:35 -0000      1.16
@@ -696,15 +696,15 @@
 </para>
 <menu>
 <menucomment><pre xml:space="preserve">comment
-</pre></menucomment><menuentry><menutitle>menu entry name 
</menutitle><menunode>node</menunode><menudescription><pre 
xml:space="preserve">description
-</pre></menudescription></menuentry><menuentry><menunode>node 
name</menunode><menudescription><pre xml:space="preserve">description new
-</pre></menudescription></menuentry><menuentry><menutitle>other 
entry</menutitle><menunode>node</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>last</menunode><menudescription><pre
 xml:space="preserve">
+</pre></menucomment><menuentry leadingtext="* "><menutitle separator=": ">menu 
entry name </menutitle><menunode separator=".    
">node</menunode><menudescription><pre xml:space="preserve">description
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::                ">node name</menunode><menudescription><pre 
xml:space="preserve">description new
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">other entry</menutitle><menunode separator=",    
">node</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">last</menunode><menudescription><pre xml:space="preserve">
                  description next line
                  still description
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 new comment
-</pre></menucomment><menuentry><menunode>last node entry 
</menunode><menudescription><pre xml:space="preserve">
+</pre></menucomment><menuentry leadingtext="* "><menunode separator="::">last 
node entry </menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <para>After menu.

Index: t/results/menu/verb_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/menu/verb_in_menu_description.pl  24 Aug 2012 16:43:21 -0000      
1.6
+++ t/results/menu/verb_in_menu_description.pl  26 Aug 2012 15:27:35 -0000      
1.7
@@ -539,7 +539,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>(manual)</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">(manual)</menunode><menudescription><pre xml:space="preserve">
 <verb delimiter=":"> in verb
 
 </verb>

Index: t/results/sectioning/chapter_between_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/chapter_between_nodes.pl       24 Aug 2012 20:42:59 
-0000      1.9
+++ t/results/sectioning/chapter_between_nodes.pl       26 Aug 2012 15:27:35 
-0000      1.10
@@ -890,7 +890,7 @@
 <para>Top node
 </para>
 <menu>
-<menuentry><menunode>section node</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">section 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/chapter_node_before_and_after_part.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/sectioning/chapter_node_before_and_after_part.pl  24 Aug 2012 
20:42:59 -0000      1.32
+++ t/results/sectioning/chapter_node_before_and_after_part.pl  26 Aug 2012 
15:27:35 -0000      1.33
@@ -823,7 +823,7 @@
 <chapter spaces=" "><sectiontitle>chapter</sectiontitle>
 
 <menu>
-<menuentry><menunode>after</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">after</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </chapter>

Index: t/results/sectioning/double_part.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/double_part.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/sectioning/double_part.pl 24 Aug 2012 16:43:23 -0000      1.27
+++ t/results/sectioning/double_part.pl 26 Aug 2012 15:27:35 -0000      1.28
@@ -986,7 +986,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>node chapter</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">node 
chapter</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/explicit_node_directions.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/explicit_node_directions.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/sectioning/explicit_node_directions.pl    26 Aug 2012 14:15:52 
-0000      1.7
+++ t/results/sectioning/explicit_node_directions.pl    26 Aug 2012 15:27:35 
-0000      1.8
@@ -972,8 +972,8 @@
 $result_converted{'xml'}->{'explicit_node_directions'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">second 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <para>Top node
 </para><menu>
-<menuentry><menunode>second node</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>third 
node</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">second 
node</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">third node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="second-node" spaces=" "><nodename>second node</nodename><nodenext 
spaces=" ">third 
node</nodenext><nodeprev>Top</nodeprev><nodeup>Top</nodeup></node>

Index: t/results/sectioning/more_sections_than_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/sectioning/more_sections_than_nodes.pl    26 Aug 2012 14:15:52 
-0000      1.4
+++ t/results/sectioning/more_sections_than_nodes.pl    26 Aug 2012 15:27:35 
-0000      1.5
@@ -2090,9 +2090,9 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>n c2</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>n 
c3</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>n c3 s1 
s2</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">n 
c2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">n c3</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">n c3 s1 s2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>
@@ -2110,7 +2110,7 @@
 <chapter spaces=" "><sectiontitle>c3</sectiontitle>
 
 <menu> 
-<menuentry><menunode>n c3 s 2</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">n c3 s 
2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <section spaces=" "><sectiontitle>C3 s1</sectiontitle>

Index: t/results/sectioning/node_part_chapter_after_chapter.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/sectioning/node_part_chapter_after_chapter.pl     24 Aug 2012 
20:43:00 -0000      1.37
+++ t/results/sectioning/node_part_chapter_after_chapter.pl     26 Aug 2012 
15:27:35 -0000      1.38
@@ -1298,8 +1298,8 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter node</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>part chapter 
node</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">part chapter node</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/node_part_chapter_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/sectioning/node_part_chapter_after_top.pl 24 Aug 2012 16:43:23 
-0000      1.26
+++ t/results/sectioning/node_part_chapter_after_top.pl 26 Aug 2012 15:27:35 
-0000      1.27
@@ -881,7 +881,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter node</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/sectioning/nodes_after_top_before_chapter_nodes.pl        26 Aug 
2012 14:15:53 -0000      1.7
+++ t/results/sectioning/nodes_after_top_before_chapter_nodes.pl        26 Aug 
2012 15:27:35 -0000      1.8
@@ -1064,8 +1064,8 @@
 $result_converted{'xml'}->{'nodes_after_top_before_chapter_nodes'} = '<node 
name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">second 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <para>Top node
 </para><menu>
-<menuentry><menunode>second node</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>third 
node</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">second 
node</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">third node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="second-node" spaces=" "><nodename>second node</nodename><nodenext 
spaces=" ">third 
node</nodenext><nodeprev>Top</nodeprev><nodeup>Top</nodeup></node>

Index: t/results/sectioning/nodes_no_node_top_explicit_directions.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/nodes_no_node_top_explicit_directions.pl       24 Aug 
2012 16:43:24 -0000      1.6
+++ t/results/sectioning/nodes_no_node_top_explicit_directions.pl       26 Aug 
2012 15:27:35 -0000      1.7
@@ -710,7 +710,7 @@
 <para>first node
 </para>
 <menu>
-<menuentry><menunode>second node</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">second 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="second-node" spaces=" "><nodename>second 
node</nodename><nodeprev>first</nodeprev><nodeup>first</nodeup></node>

Index: t/results/sectioning/part_chapter_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/sectioning/part_chapter_after_top.pl      24 Aug 2012 16:43:24 
-0000      1.25
+++ t/results/sectioning/part_chapter_after_top.pl      26 Aug 2012 15:27:36 
-0000      1.26
@@ -871,7 +871,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">chapter</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/part_node_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_after_top.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/sectioning/part_node_after_top.pl 24 Aug 2012 16:43:24 -0000      
1.17
+++ t/results/sectioning/part_node_after_top.pl 26 Aug 2012 15:27:36 -0000      
1.18
@@ -766,7 +766,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>part node after top</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">part node after 
top</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="part-node-after-top" spaces=" "><nodename>part node after 
top</nodename><nodeprev automatic="on">Top</nodeprev><nodeup 
automatic="on">Top</nodeup></node>

Index: t/results/sectioning/part_node_before_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_before_top.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/sectioning/part_node_before_top.pl        26 Aug 2012 14:15:53 
-0000      1.27
+++ t/results/sectioning/part_node_before_top.pl        26 Aug 2012 15:27:36 
-0000      1.28
@@ -821,7 +821,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>part node before top</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">part node before 
top</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 </top>
 ';

Index: t/results/sectioning/part_node_chapter_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/sectioning/part_node_chapter_after_top.pl 26 Aug 2012 14:15:54 
-0000      1.37
+++ t/results/sectioning/part_node_chapter_after_top.pl 26 Aug 2012 15:27:36 
-0000      1.38
@@ -1203,8 +1203,8 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>a node after part</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>chapter</menunode><menudescription><pre
 xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">a node after 
part</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chapter</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/part_node_chapter_appendix.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_appendix.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/part_node_chapter_appendix.pl  24 Aug 2012 16:43:24 
-0000      1.6
+++ t/results/sectioning/part_node_chapter_appendix.pl  26 Aug 2012 15:27:36 
-0000      1.7
@@ -1003,7 +1003,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter node</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/part_node_chapter_node_appendix.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_node_appendix.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/part_node_chapter_node_appendix.pl     24 Aug 2012 
16:43:24 -0000      1.6
+++ t/results/sectioning/part_node_chapter_node_appendix.pl     26 Aug 2012 
15:27:36 -0000      1.7
@@ -1212,8 +1212,8 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter node</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>appendix 
node</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">appendix node</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/part_node_node_part_appendix.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/part_node_node_part_appendix.pl        24 Aug 2012 
16:43:24 -0000      1.6
+++ t/results/sectioning/part_node_node_part_appendix.pl        26 Aug 2012 
15:27:36 -0000      1.7
@@ -1315,8 +1315,8 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter node</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>appendix 
part</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">appendix part</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/part_node_part_appendix.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_part_appendix.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/part_node_part_appendix.pl     24 Aug 2012 16:43:24 
-0000      1.6
+++ t/results/sectioning/part_node_part_appendix.pl     26 Aug 2012 15:27:36 
-0000      1.7
@@ -1091,7 +1091,7 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter node</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/part_node_part_node_appendix.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_part_node_appendix.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/part_node_part_node_appendix.pl        24 Aug 2012 
16:43:24 -0000      1.6
+++ t/results/sectioning/part_node_part_node_appendix.pl        26 Aug 2012 
15:27:36 -0000      1.7
@@ -1305,8 +1305,8 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter node</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>appendix 
node</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">appendix node</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/sectioning/section_before_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/section_before_top.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/sectioning/section_before_top.pl  24 Aug 2012 16:43:24 -0000      
1.28
+++ t/results/sectioning/section_before_top.pl  26 Aug 2012 15:27:36 -0000      
1.29
@@ -689,7 +689,7 @@
 <unnumberedsec originalcommand="top" spaces=" 
"><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>section node</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">section 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 </unnumberedsec>
 ';

Index: t/results/sectioning/section_in_unnumbered_plaintext.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/sectioning/section_in_unnumbered_plaintext.pl     24 Aug 2012 
20:43:00 -0000      1.32
+++ t/results/sectioning/section_in_unnumbered_plaintext.pl     26 Aug 2012 
15:27:36 -0000      1.33
@@ -9622,11 +9622,11 @@
 <para>Menu:
 </para>
 <menu>
-<menuentry><menunode>chapter</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>unnumbered</menunode><menudescription><pre
 xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>chapter 
2</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>chapter 
3</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>unnumbered 
4</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode 
separator="::">chapter</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumbered</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chapter 2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chapter 3</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumbered 4</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>
@@ -9634,7 +9634,7 @@
 <chapter spaces=" "><sectiontitle>chapter</sectiontitle>
 
 <menu>
-<menuentry><menunode>section in chapter</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">section in 
chapter</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="section-in-chapter" spaces=" "><nodename>section in 
chapter</nodename><nodeup automatic="on">chapter</nodeup></node>
@@ -9646,7 +9646,7 @@
 <unnumbered spaces=" "><sectiontitle>unnumbered</sectiontitle>
 
 <menu>
-<menuentry><menunode>section in unnumbered</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">section in 
unnumbered</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="section-in-unnumbered" spaces=" "><nodename>section in 
unnumbered</nodename><nodeup automatic="on">unnumbered</nodeup></node>
@@ -9658,18 +9658,18 @@
 <chapter spaces=" "><sectiontitle>chapter 2</sectiontitle>
 
 <menu>
-<menuentry><menunode>unnumberedsec 2</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>unnumberedsec 
2-1</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">unnumberedsec 
2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumberedsec 2-1</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="unnumberedsec-2" spaces=" "><nodename>unnumberedsec 
2</nodename><nodenext automatic="on">unnumberedsec 2-1</nodenext><nodeup 
automatic="on">chapter 2</nodeup></node>
 <unnumberedsec spaces=" "><sectiontitle>unnumbered section 2</sectiontitle>
 
 <menu>
-<menuentry><menunode>unnumbered sub 2</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>numbered sub 
2</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>unnumbered sub2 
2</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>numbered sub2 
2</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">unnumbered sub 
2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">numbered sub 2</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumbered sub2 2</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">numbered sub2 2</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="unnumbered-sub-2" spaces=" "><nodename>unnumbered sub 
2</nodename><nodenext automatic="on">numbered sub 2</nodenext><nodeup 
automatic="on">unnumberedsec 2</nodeup></node>
@@ -9693,7 +9693,7 @@
 <unnumberedsec spaces=" "><sectiontitle>unnumberedsec 2-1</sectiontitle>
 
 <menu>
-<menuentry><menunode>numbered sub 2-1</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">numbered sub 
2-1</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="numbered-sub-2_002d1" spaces=" "><nodename>numbered sub 
2-1</nodename><nodeup automatic="on">unnumberedsec 2-1</nodeup></node>
@@ -9707,21 +9707,21 @@
 <chapter spaces=" "><sectiontitle>chapter 3</sectiontitle>
 
 <menu>
-<menuentry><menunode>unnumberedsec 3</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>section 
3-1</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>unnumberedsec 
3-2</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>section 
3-3</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>unnumberedsec 
3-4</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">unnumberedsec 
3</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">section 3-1</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumberedsec 3-2</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">section 3-3</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumberedsec 3-4</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="unnumberedsec-3" spaces=" "><nodename>unnumberedsec 
3</nodename><nodenext automatic="on">section 3-1</nodenext><nodeup 
automatic="on">chapter 3</nodeup></node>
 <unnumberedsec spaces=" "><sectiontitle>unnumbered section 3</sectiontitle>
 
 <menu>
-<menuentry><menunode>unnumbered sub 3</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>numbered sub 
3</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>unnumbered sub2 
3</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>numbered sub2 
3</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">unnumbered sub 
3</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">numbered sub 3</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumbered sub2 3</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">numbered sub2 3</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="unnumbered-sub-3" spaces=" "><nodename>unnumbered sub 
3</nodename><nodenext automatic="on">numbered sub 3</nodenext><nodeup 
automatic="on">unnumberedsec 3</nodeup></node>
@@ -9749,7 +9749,7 @@
 <unnumberedsec spaces=" "><sectiontitle>unnumberedsec 3-2</sectiontitle>
 
 <menu>
-<menuentry><menunode>numbered sub 3-2</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">numbered sub 
3-2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="numbered-sub-3_002d2" spaces=" "><nodename>numbered sub 
3-2</nodename><nodeup automatic="on">unnumberedsec 3-2</nodeup></node>
@@ -9761,7 +9761,7 @@
 <section spaces=" "><sectiontitle>section 3-3</sectiontitle>
 
 <menu>
-<menuentry><menunode>subsection 3-3</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">subsection 
3-3</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="subsection-3_002d3" spaces=" "><nodename>subsection 
3-3</nodename><nodeup automatic="on">section 3-3</nodeup></node>
@@ -9773,7 +9773,7 @@
 <unnumberedsec spaces=" "><sectiontitle>unnumberedsec 3-4</sectiontitle>
 
 <menu>
-<menuentry><menunode>numbered sub 3-4</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">numbered sub 
3-4</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="numbered-sub-3_002d4" spaces=" "><nodename>numbered sub 
3-4</nodename><nodeup automatic="on">unnumberedsec 3-4</nodeup></node>
@@ -9786,17 +9786,17 @@
 <unnumbered spaces=" "><sectiontitle>unnumbered  4</sectiontitle>
 
 <menu>
-<menuentry><menunode>unnumberedsec 4</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">unnumberedsec 
4</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="unnumberedsec-4" spaces=" "><nodename>unnumberedsec 
4</nodename><nodeup automatic="on">unnumbered 4</nodeup></node>
 <unnumberedsec spaces=" "><sectiontitle>unnumbered section 4</sectiontitle>
 
 <menu>
-<menuentry><menunode>unnumbered sub 4</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>numbered sub 
4</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>unnumbered sub2 
4</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>numbered sub2 
4</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">unnumbered sub 
4</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">numbered sub 4</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumbered sub2 4</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">numbered sub2 4</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="unnumbered-sub-4" spaces=" "><nodename>unnumbered sub 
4</nodename><nodenext automatic="on">numbered sub 4</nodenext><nodeup 
automatic="on">unnumberedsec 4</nodeup></node>

Index: t/results/sectioning/two_nodes_between_chapters.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/sectioning/two_nodes_between_chapters.pl  26 Aug 2012 14:15:55 
-0000      1.15
+++ t/results/sectioning/two_nodes_between_chapters.pl  26 Aug 2012 15:27:36 
-0000      1.16
@@ -1361,9 +1361,9 @@
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter 1</menunode><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>node between 
chapters</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>chapter 
2</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">chapter 
1</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">node between chapters</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chapter 2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 </top>

Index: t/results/xml_tests/image_inline_or_not.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/xml_tests/image_inline_or_not.pl  24 Aug 2012 16:43:25 -0000      
1.11
+++ t/results/xml_tests/image_inline_or_not.pl  26 Aug 2012 15:27:36 -0000      
1.12
@@ -2352,8 +2352,8 @@
 </tableitem></tableentry></table>
 
 <menu>
-<menuentry><menunode><image 
where="inline"><imagefile>node_image</imagefile></image></menunode><menudescription><pre
 xml:space="preserve"><image 
where="inline"><imagefile>image_in_description</imagefile></image>
-</pre></menudescription></menuentry><menuentry><menutitle><image 
where="inline"><imagefile>in_menu_entry_name</imagefile></image></menutitle><menunode>(somewhere)<image
 
where="inline"><imagefile>extnode</imagefile></image></menunode><menudescription><pre
 xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator=":: "><image 
where="inline"><imagefile>node_image</imagefile></image></menunode><menudescription><pre
 xml:space="preserve"><image 
where="inline"><imagefile>image_in_description</imagefile></image>
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": "><image 
where="inline"><imagefile>in_menu_entry_name</imagefile></image></menutitle><menunode
 separator=".">(somewhere)<image 
where="inline"><imagefile>extnode</imagefile></image></menunode><menudescription><pre
 xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 <image where="inline"><imagefile>in_menu_comment</imagefile></image>
 </pre></menucomment></menu>

Index: tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tests/layout/res_parser/formatting_xml/formatting.xml       26 Aug 2012 
14:15:58 -0000      1.8
+++ tests/layout/res_parser/formatting_xml/formatting.xml       26 Aug 2012 
15:27:36 -0000      1.9
@@ -8,11 +8,11 @@
 <top spaces=" "><sectiontitle>Top section</sectiontitle>
 
 <menu>
-<menuentry><menunode>chapter</menunode><menudescription><pre 
xml:space="preserve">chapter
+<menuentry leadingtext="* "><menunode separator="::               
">chapter</menunode><menudescription><pre xml:space="preserve">chapter
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 Menu comment
 
-</pre></menucomment><menuentry><menutitle>description</menutitle><menunode>chapter2</menunode><menudescription><pre
 xml:space="preserve">Chapter 2
+</pre></menucomment><menuentry leadingtext="* "><menutitle 
separator=":">description</menutitle><menunode separator=".   
">chapter2</menunode><menudescription><pre xml:space="preserve">Chapter 2
 </pre></menudescription></menuentry></menu>
 
 <macro name="mymacro" line=" mymacro">
@@ -3179,7 +3179,7 @@
 </para>
 <format>
 <menu> 
-<menuentry><menunode>s--ect&comma;ion</menunode><menudescription><pre 
xml:space="preserve">s&textndash;ect&comma;ion
+<menuentry leadingtext="* "><menunode separator=":: 
">s--ect&comma;ion</menunode><menudescription><pre 
xml:space="preserve">s&textndash;ect&comma;ion
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 Menu comment
 
&textldquo;simple-double&textndash;three&textmdash;four&textmdash;-&textrdquo;&linebreak;
@@ -3191,13 +3191,13 @@
 <section spaces=" "><sectiontitle>A section</sectiontitle>
 
 <menu>
-<menuentry><menunode>subsection</menunode><menudescription><pre 
xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator=":: 
">subsection</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 </pre></menucomment><detailmenu>
 <menucomment><pre xml:space="preserve">In detailmenu
 
-</pre></menucomment><menuentry><menunode>subsubsection 
``simple-double--</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>subsubsection 
three---four----''</menunode><menudescription><pre xml:space="preserve">
+</pre></menucomment><menuentry leadingtext="* "><menunode 
separator="::">subsubsection ``simple-double--</menunode><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">subsubsection three---four----''</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 </menu>
 
@@ -3205,8 +3205,8 @@
 <subsection spaces=" "><sectiontitle>subsection</sectiontitle>
 
 <menu>
-<menuentry><menunode>subsubsection 
``simple-double--</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode>subsubsection 
three---four----''</menunode><menudescription><pre xml:space="preserve">
+<menuentry leadingtext="* "><menunode separator="::">subsubsection 
``simple-double--</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">subsubsection three---four----''</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <anchor name="anchor">anchor</anchor>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]