texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp TODO texi2any.pl Texinfo/Convert/Inf...


From: Patrice Dumas
Subject: texinfo/tp TODO texi2any.pl Texinfo/Convert/Inf...
Date: Sun, 20 Mar 2011 13:00:59 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/03/20 13:00:50

Modified files:
        tp             : TODO texi2any.pl 
        tp/Texinfo/Convert: Info.pm Plaintext.pm 
        tp/t           : 10menu.t 
        tp/t/results/coverage: block_commands.pl center.pl def.pl 
                               flushleft_flushright.pl 
                               flushleft_flushright_in_quotation.pl 
                               hyphenation.pl insertcopying.pl 
                               item_container.pl multitable.pl 
                               preformatted.pl 
                               punctuation_in_line_commands.pl 
                               quotation_author.pl table.pl 
                               verbatiminclude.pl 
        tp/t/results/coverage_braces: ctrl.pl test_image.pl 
        tp/t/results/float: anchor_in_caption.pl cindex_in_caption.pl 
                            comment_space_comand_in_float.pl 
                            empty_listoffloats_with_floats.pl 
                            float_copying.pl float_with_at_commands.pl 
                            footnote_in_caption.pl simple.pl 
        tp/t/results/heading: heading_in_copying.pl 
                              heading_in_quotation.pl 
        tp/t/results/itemize: enumerate_argument.pl 
                              enumerate_in_example.pl 
                              inter_item_commands_in_enumerate.pl 
        tp/t/results/menu: dash_in_menu.pl detailmenu.pl 
                           detailmenu_on_subnodes.pl formats_in_menu.pl 
                           menu_title_before_entries.pl 
                           no_colon_in_menu.pl 
                           reference_to_external_manual.pl simple.pl 
        tp/t/results/misc_commands: 
                                    codequoteundirected_codequotebacktick.pl 
                                    comment_space_command_on_line.pl 
                                    comments_in_text.pl 
                                    definfoenclose.pl noindent_indent.pl 
                                    ref_in_center.pl 
                                    test_allowcodebreaks.pl 
        tp/t/results/multitable: inter_item_commands_in_multitable.pl 
        tp/t/results/paragraph: comment_in_quotation.pl 
                                paragraph_indent_asis.pl text_line.pl 
        tp/t/results/plaintext_tests: accents_in_var_enable_encoding.pl 
                                      insert_copying_and_paragraph.pl 
                                      insert_copying_inline_and_paragraph.pl 
                                      isolated_html_expanded.pl 
                                      line_passed_and_formats.pl 
                                      nested_multitable.pl 
                                      no_punctuation_commands.pl 
                                      no_punctuation_commands_frenchspacing.pl 
                                      protect_spaces_on_line.pl 
                                      punctuation.pl 
                                      punctuation_at_end_command.pl 
                                      punctuation_commands.pl 
                                      punctuation_commands_frenchspacing.pl 
                                      punctuation_frenchspacing.pl 
                                      punctuation_in_command.pl 
                                      settitle_and_empty_top.pl 
                                      sp_with_text_before_in_example.pl 
                                      star_at_command_formatting.pl 
                                      unknown_value.pl 
        tp/t/results/preformatted: caption_in_example.pl 
                                   quote_dash_in_display.pl 
                                   quote_dash_in_example.pl 
        tp/t/results/quotation: empty_quotation.pl 
                                space_at_commands_end_quotation_line.pl 
        tp/t/results/raw: braces_in_tex.pl misc_raw.pl 
                          misc_raw_comments.pl 
                          raw_commands_and_end_of_lines.pl 
        tp/t/results/sectioning: chapter_node_before_and_after_part.pl 
                                 section_below_unnumbered.pl 
                                 section_in_unnumbered_plaintext.pl 
                                 top_no_argument_and_content.pl 
        tp/t/results/test_count: flushright.pl multitable.pl 
                                 printindex.pl 
        tp/t/results/xtable: definfoenclose_on_table_line.pl 
                             empty_item_itemx.pl table_nested.pl 
Added files:
        tp/t/results/menu: simple_no_menu.pl 

Log message:
        Use SHOW_MENU in Plaintext.pm to determine if menus are to be shown.
        Ignore leading empty lines in Plaintext output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/10menu.t?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/center.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushleft_flushright.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/hyphenation.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/insertcopying.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/quotation_author.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/verbatiminclude.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/ctrl.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/test_image.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/anchor_in_caption.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/cindex_in_caption.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/comment_space_comand_in_float.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/empty_listoffloats_with_floats.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/float_copying.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/float_with_at_commands.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/footnote_in_caption.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/simple.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/heading/heading_in_copying.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/heading/heading_in_quotation.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/enumerate_argument.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/enumerate_in_example.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/inter_item_commands_in_enumerate.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/dash_in_menu.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/formats_in_menu.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_title_before_entries.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/no_colon_in_menu.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/reference_to_external_manual.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple_no_menu.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comments_in_text.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/definfoenclose.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/noindent_indent.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/ref_in_center.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/comment_in_quotation.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/paragraph_indent_asis.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/text_line.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/insert_copying_inline_and_paragraph.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/isolated_html_expanded.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/nested_multitable.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/protect_spaces_on_line.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_at_end_command.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_commands.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_in_command.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/settitle_and_empty_top.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/star_at_command_formatting.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/unknown_value.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/caption_in_example.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/quote_dash_in_display.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/quote_dash_in_example.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/empty_quotation.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/space_at_commands_end_quotation_line.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/braces_in_tex.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/misc_raw.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/misc_raw_comments.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_commands_and_end_of_lines.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_below_unnumbered.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/top_no_argument_and_content.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/flushright.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/multitable.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/printindex.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/empty_item_itemx.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/table_nested.pl?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- TODO        19 Mar 2011 10:09:33 -0000      1.113
+++ TODO        20 Mar 2011 13:00:29 -0000      1.114
@@ -78,6 +78,13 @@
 
 Force end lines before/after a menu?
 
+SHOW_MENU is used to determine if menus are shown in Plaintext, and is
+true in the default case.  
+
+HEADERS is not used to determine if node headers are output or not, this is 
+determined by the module used (Plaintext.pm or info.pm).  No idea whether
+it is right or wrong.
+
 With something like
 @deffn { category}
 the space is stripped everywhere but in sorting. Should be stripped in 

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- texi2any.pl 20 Mar 2011 01:17:25 -0000      1.23
+++ texi2any.pl 20 Mar 2011 13:00:30 -0000      1.24
@@ -420,7 +420,6 @@
                      set_from_cmdline('SPLIT_SIZE', undef);},
  'headers!' => sub { set_from_cmdline('HEADERS', $_[1]);
                      set_from_cmdline('SHOW_MENU', $_[1]);
-                     $parser_default_options->{'SHOW_MENU'} = $_[1];
                      $format = 'plaintext' if (!$_[1] and $format eq 'info'); 
},
  'output|out|o=s' => sub { 
     my $var = 'OUTFILE';
@@ -510,7 +509,9 @@
  'silent|quiet' => sub {set_from_cmdline('SILENT', $_[1]);
                          push @texi2dvi_args, '--'.$_[0];},
    
- 'plaintext' => sub {$format = $_[0];},
+ 'plaintext' => sub {$format = $_[0]; 
+                     set_from_cmdline('SHOW_MENU', 0);
+ },
  'html' => sub {$format = $_[0];},
  'info' => sub {$format = $_[0];},
  'docbook' => sub {$format = $_[0];},
@@ -557,7 +558,7 @@
 }
 
 foreach my $parser_settable_option ('TOP_NODE_UP', 'MAX_MACRO_CALL_NESTING',
-                                    'INLINE_INSERTCOPYING') {
+                                    'INLINE_INSERTCOPYING', 'SHOW_MENU') {
   $parser_default_options->{$parser_settable_option} = 
get_conf($parser_settable_option) 
     if (defined(get_conf($parser_settable_option)));
 }

Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- Texinfo/Convert/Info.pm     13 Mar 2011 15:00:01 -0000      1.46
+++ Texinfo/Convert/Info.pm     20 Mar 2011 13:00:30 -0000      1.47
@@ -518,7 +518,6 @@
   my $self = shift;
   my $node = shift;
 
-  
   my $result = '';
   return '' if (!defined($node->{'extra'}->{'normalized'}));
   if (!$self->{'empty_lines_count'}) {

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- Texinfo/Convert/Plaintext.pm        20 Mar 2011 01:17:26 -0000      1.121
+++ Texinfo/Convert/Plaintext.pm        20 Mar 2011 13:00:30 -0000      1.122
@@ -233,6 +233,9 @@
   'paragraphindent'      => 3,
   'firstparagraphindent' => 'none',
   'ENABLE_ENCODING'      => 1,
+# this default is for Info, but also when doing Texinfo fragments.  So this 
+# has to be explicitly set to 0 when doing real plaintext.
+  'SHOW_MENU'            => 1,
   'footnotestyle'        => 'end',
   'fillcolumn'           => 72,
 #  'perl_encoding'        => 'ascii',
@@ -492,6 +495,7 @@
   my $result = '';
 
   my $elements = Texinfo::Structuring::split_by_node($root);
+  $self->{'empty_lines_count'} = 1;
   if (!defined($elements)) {
     $result = $self->_convert($root);
     my $footnotes = $self->_footnotes();
@@ -1133,7 +1137,8 @@
     my $is_top_formatter = 0;
     $is_top_formatter = 1 if ($formatter->{'_top_formatter'});
     my $empty_lines_count = '';
-    $empty_lines_count = $self->{'empty_lines_count'} if 
defined($self->{'empty_lines_count'});
+    $empty_lines_count = $self->{'empty_lines_count'} 
+      if defined($self->{'empty_lines_count'});
     print STDERR "ROOT:$root (".join('|',@{$self->{'context'}})."), formatters 
".scalar(@{$self->{'formatters'}}) . " ->";
     print STDERR " cmd: $root->{'cmdname'}," if ($root->{'cmdname'});
     print STDERR " type: $root->{'type'}" if ($root->{'type'});
@@ -1171,10 +1176,11 @@
   # especially
   if ($root->{'type'} and ($root->{'type'} eq 'empty_line' 
                            or $root->{'type'} eq 'after_description_line')) {
+    if ($self->{'DEBUG'}) {
     my $count = $self->{'empty_lines_count'};
     $count = '' if (!defined($count));
-    print STDERR "EMPTY_LINE ($count)\n"
-      if ($self->{'DEBUG'});
+      print STDERR "EMPTY_LINE ($count)\n";
+    }
     delete $self->{'text_element_context'}->[-1]->{'counter'};
     $self->{'empty_lines_count'}++;
     if ($self->{'empty_lines_count'} <= 1
@@ -1681,6 +1687,9 @@
       # remark:
       # cartouche group and raggedright -> nothing on format stack
 
+      if ($menu_commands{$root->{'cmdname'}} and !$self->{'SHOW_MENU'}) {
+        return '';
+      }
       if ($self->{'preformatted_context_commands'}->{$root->{'cmdname'}}) {
         push @{$self->{'context'}}, $root->{'cmdname'};
       } elsif ($flush_commands{$root->{'cmdname'}}) {

Index: t/10menu.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/10menu.t,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/10menu.t  16 Mar 2011 01:16:43 -0000      1.15
+++ t/10menu.t  20 Mar 2011 13:00:31 -0000      1.16
@@ -2,19 +2,10 @@
 
 require 't/test_utils.pl';
 
-my @test_cases = (
-['menu_title_before_entries',
-'@node Top
+my $simple_menu_text = '
+Before menu.
 
 @menu
-Horizontal space
-* subnode::
address@hidden menu
-
address@hidden subnode
-'],
-['simple','
address@hidden
 comment
 * menu entry name : node.    description
 * node name::                description new
@@ -26,7 +17,23 @@
 new comment
 * last node entry ::
 @end menu
+
+After menu.
+';
+
+my @test_cases = (
+['menu_title_before_entries',
+'@node Top
+
address@hidden
+Horizontal space
+* subnode::
address@hidden menu
+
address@hidden subnode
 '],
+['simple', $simple_menu_text],
+['simple_no_menu', $simple_menu_text, {'SHOW_MENU' => 0}, {'SHOW_MENU' => 0}],
 ['menu_entry_node',
 '@menu
 * (f)a1::
@@ -262,7 +269,7 @@
 );
 
 foreach my $test (@test_cases) {
-  $test->[2]->{'test_formats'} = ['plaintext'];
+  push @{$test->[2]->{'test_formats'}}, 'plaintext';
 }
 
 our ($arg_test_case, $arg_generate, $arg_debug);

Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- t/results/coverage/block_commands.pl        6 Mar 2011 14:43:59 -0000       
1.33
+++ t/results/coverage/block_commands.pl        20 Mar 2011 13:00:31 -0000      
1.34
@@ -505,8 +505,7 @@
 
 
 
-$result_converted{'plaintext'}->{'block_commands'} = '
-in group
+$result_converted{'plaintext'}->{'block_commands'} = 'in group
 
      warning: in quotation
 

Index: t/results/coverage/center.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/center.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/center.pl        6 Mar 2011 14:43:59 -0000       1.4
+++ t/results/coverage/center.pl        20 Mar 2011 13:00:32 -0000      1.5
@@ -106,8 +106,7 @@
 
 
 
-$result_converted{'plaintext'}->{'center'} = '
-                          in center `in code\'
+$result_converted{'plaintext'}->{'center'} = '                          in 
center `in code\'
 
 ';
 

Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- t/results/coverage/def.pl   6 Mar 2011 14:43:59 -0000       1.35
+++ t/results/coverage/def.pl   20 Mar 2011 13:00:32 -0000      1.36
@@ -2256,8 +2256,7 @@
 
 
 
-$result_converted{'plaintext'}->{'def'} = '
- -- c--ategory: d--effn_name a--rguments...
+$result_converted{'plaintext'}->{'def'} = ' -- c--ategory: d--effn_name 
a--rguments...
      d-effn
 
  -- cate--gory: de--ffn_name ar--guments more args

Index: t/results/coverage/flushleft_flushright.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage/flushleft_flushright.pl  6 Mar 2011 14:43:59 -0000       
1.5
+++ t/results/coverage/flushleft_flushright.pl  20 Mar 2011 13:00:32 -0000      
1.6
@@ -283,8 +283,7 @@
 
 
 
-$result_converted{'plaintext'}->{'flushleft_flushright'} = '
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
+$result_converted{'plaintext'}->{'flushleft_flushright'} = 
'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
 ldskf dsflj
 lklsdlv l lll.  Bbb.
 

Index: t/results/coverage/flushleft_flushright_in_quotation.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage/flushleft_flushright_in_quotation.pl     6 Mar 2011 
14:43:59 -0000       1.5
+++ t/results/coverage/flushleft_flushright_in_quotation.pl     20 Mar 2011 
13:00:32 -0000      1.6
@@ -283,8 +283,7 @@
 
 
 
-$result_converted{'plaintext'}->{'flushleft_flushright_in_quotation'} = '
-     f l
+$result_converted{'plaintext'}->{'flushleft_flushright_in_quotation'} = '     
f l
 
                                                                     f r
 ';

Index: t/results/coverage/hyphenation.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/hyphenation.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/hyphenation.pl   6 Mar 2011 14:43:59 -0000       1.4
+++ t/results/coverage/hyphenation.pl   20 Mar 2011 13:00:32 -0000      1.5
@@ -68,7 +68,6 @@
 
 
 
-$result_converted{'plaintext'}->{'hyphenation'} = '
-';
+$result_converted{'plaintext'}->{'hyphenation'} = '';
 
 1;

Index: t/results/coverage/insertcopying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/insertcopying.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage/insertcopying.pl 6 Mar 2011 14:43:59 -0000       1.5
+++ t/results/coverage/insertcopying.pl 20 Mar 2011 13:00:32 -0000      1.6
@@ -237,8 +237,7 @@
 
 
 
-$result_converted{'plaintext'}->{'insertcopying'} = '
-License:
+$result_converted{'plaintext'}->{'insertcopying'} = 'License:
 
    License.
 

Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/coverage/item_container.pl        6 Mar 2011 14:43:59 -0000       
1.31
+++ t/results/coverage/item_container.pl        20 Mar 2011 13:00:32 -0000      
1.32
@@ -424,8 +424,7 @@
 
 
 
-$result_converted{'plaintext'}->{'item_container'} = '
-   + i-tem +
+$result_converted{'plaintext'}->{'item_container'} = '   + i-tem +
 
    * b-ullet
 

Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/coverage/multitable.pl    6 Mar 2011 14:44:00 -0000       1.32
+++ t/results/coverage/multitable.pl    20 Mar 2011 13:00:32 -0000      1.33
@@ -680,8 +680,7 @@
 
 
 
-$result_converted{'plaintext'}->{'multitable'} = '
-mu-ltitable headitem                        another tab
+$result_converted{'plaintext'}->{'multitable'} = 'mu-ltitable headitem         
               another tab
 --------------------------------------------------------------------------
 mu-ltitable item                            multitable tab
 mu-ltitable item 2                          multitable tab 2

Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- t/results/coverage/preformatted.pl  6 Mar 2011 14:44:00 -0000       1.35
+++ t/results/coverage/preformatted.pl  20 Mar 2011 13:00:32 -0000      1.36
@@ -386,8 +386,7 @@
 
 
 
-$result_converted{'plaintext'}->{'preformatted'} = '
-     e--xample  some
+$result_converted{'plaintext'}->{'preformatted'} = '     e--xample  some
 
         text
 

Index: t/results/coverage/punctuation_in_line_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/punctuation_in_line_commands.pl  6 Mar 2011 14:44:00 
-0000       1.4
+++ t/results/coverage/punctuation_in_line_commands.pl  20 Mar 2011 13:00:32 
-0000      1.5
@@ -1317,8 +1317,7 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_in_line_commands'} = '
-top! After punc
+$result_converted{'plaintext'}->{'punctuation_in_line_commands'} = 'top! After 
punc
 ***************
 
 item! After punc

Index: t/results/coverage/quotation_author.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage/quotation_author.pl      6 Mar 2011 14:44:00 -0000       
1.5
+++ t/results/coverage/quotation_author.pl      20 Mar 2011 13:00:32 -0000      
1.6
@@ -247,8 +247,7 @@
 
 
 
-$result_converted{'plaintext'}->{'quotation_author'} = '
-     quotation quotation continues.
+$result_converted{'plaintext'}->{'quotation_author'} = '     quotation 
quotation continues.
 
                            -- _First Author_
                           -- _Se~cond author_

Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/coverage/table.pl 6 Mar 2011 14:44:00 -0000       1.32
+++ t/results/coverage/table.pl 20 Mar 2011 13:00:32 -0000      1.33
@@ -655,8 +655,7 @@
 
 
 
-$result_converted{'plaintext'}->{'table'} = '
-table item
+$result_converted{'plaintext'}->{'table'} = 'table item
 table itemx
 
      In table

Index: t/results/coverage/verbatiminclude.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/coverage/verbatiminclude.pl       6 Mar 2011 14:44:00 -0000       
1.3
+++ t/results/coverage/verbatiminclude.pl       20 Mar 2011 13:00:32 -0000      
1.4
@@ -69,8 +69,7 @@
 
 
 
-$result_converted{'plaintext'}->{'verbatiminclude'} = '
-This is the @emph{included} file (include-value2.txi).
+$result_converted{'plaintext'}->{'verbatiminclude'} = 'This is the 
@emph{included} file (include-value2.txi).
 ';
 
 1;

Index: t/results/coverage_braces/ctrl.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/ctrl.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage_braces/ctrl.pl   6 Mar 2011 14:44:00 -0000       1.4
+++ t/results/coverage_braces/ctrl.pl   20 Mar 2011 13:00:33 -0000      1.5
@@ -157,8 +157,7 @@
 
 
 
-$result_converted{'plaintext'}->{'ctrl'} = '
-A
+$result_converted{'plaintext'}->{'ctrl'} = 'A
 
    With B.
 ';

Index: t/results/coverage_braces/test_image.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/coverage_braces/test_image.pl     19 Mar 2011 09:24:16 -0000      
1.1
+++ t/results/coverage_braces/test_image.pl     20 Mar 2011 13:00:33 -0000      
1.2
@@ -4252,8 +4252,7 @@
 
 
 
-$result_converted{'plaintext'}->{'test_image'} = '
-In text .
+$result_converted{'plaintext'}->{'test_image'} = 'In text .
 
    Insertcopying
    Text in copying. 

Index: t/results/float/anchor_in_caption.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/anchor_in_caption.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/float/anchor_in_caption.pl        6 Mar 2011 14:44:02 -0000       
1.3
+++ t/results/float/anchor_in_caption.pl        20 Mar 2011 13:00:34 -0000      
1.4
@@ -429,8 +429,7 @@
 
 
 
-$result_converted{'plaintext'}->{'anchor_in_caption'} = '
-* Menu:
+$result_converted{'plaintext'}->{'anchor_in_caption'} = '* Menu:
 
 * fl 1: label.                           in caption
 

Index: t/results/float/cindex_in_caption.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/cindex_in_caption.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/float/cindex_in_caption.pl        6 Mar 2011 14:44:02 -0000       
1.3
+++ t/results/float/cindex_in_caption.pl        20 Mar 2011 13:00:34 -0000      
1.4
@@ -514,8 +514,7 @@
 
 
 
-$result_converted{'plaintext'}->{'cindex_in_caption'} = '
-* Menu:
+$result_converted{'plaintext'}->{'cindex_in_caption'} = '* Menu:
 
 * fl 1: label.                           in caption
 

Index: t/results/float/comment_space_comand_in_float.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/float/comment_space_comand_in_float.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/float/comment_space_comand_in_float.pl    16 Mar 2011 01:16:44 
-0000      1.1
+++ t/results/float/comment_space_comand_in_float.pl    20 Mar 2011 13:00:35 
-0000      1.2
@@ -383,8 +383,7 @@
 
 
 
-$result_converted{'plaintext'}->{'comment_space_comand_in_float'} = '
-Float
+$result_converted{'plaintext'}->{'comment_space_comand_in_float'} = 'Float
 
 Text   1
 

Index: t/results/float/empty_listoffloats_with_floats.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/float/empty_listoffloats_with_floats.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/float/empty_listoffloats_with_floats.pl   6 Mar 2011 14:44:02 
-0000       1.3
+++ t/results/float/empty_listoffloats_with_floats.pl   20 Mar 2011 13:00:37 
-0000      1.4
@@ -714,8 +714,7 @@
 
 
 
-$result_converted{'plaintext'}->{'empty_listoffloats_with_floats'} = '
-Label no caption.
+$result_converted{'plaintext'}->{'empty_listoffloats_with_floats'} = 'Label no 
caption.
 
 1
 

Index: t/results/float/float_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/float_copying.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/float/float_copying.pl    14 Mar 2011 21:43:09 -0000      1.1
+++ t/results/float/float_copying.pl    20 Mar 2011 13:00:37 -0000      1.2
@@ -1488,8 +1488,7 @@
 
 
 
-$result_converted{'plaintext'}->{'float_copying'} = '
-Top
+$result_converted{'plaintext'}->{'float_copying'} = 'Top
 ***
 
 Public domain is not really a licence, as it means than the author

Index: t/results/float/float_with_at_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/float/float_with_at_commands.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/float/float_with_at_commands.pl   13 Mar 2011 23:19:56 -0000      
1.1
+++ t/results/float/float_with_at_commands.pl   20 Mar 2011 13:00:37 -0000      
1.2
@@ -497,8 +497,7 @@
 
 
 
-$result_converted{'plaintext'}->{'float_with_at_commands'} = '
-Ceci est notre premie`re entre\'e.
+$result_converted{'plaintext'}->{'float_with_at_commands'} = 'Ceci est notre 
premie`re entre\'e.
 
 entre\'e 1: La premie`re entre\'e est importante
 

Index: t/results/float/footnote_in_caption.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/footnote_in_caption.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/float/footnote_in_caption.pl      6 Mar 2011 14:44:02 -0000       
1.6
+++ t/results/float/footnote_in_caption.pl      20 Mar 2011 13:00:37 -0000      
1.7
@@ -423,8 +423,7 @@
 
 
 
-$result_converted{'plaintext'}->{'footnote_in_caption'} = '
-* Menu:
+$result_converted{'plaintext'}->{'footnote_in_caption'} = '* Menu:
 
 * fl 1: label.                           in caption(0)
 

Index: t/results/float/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/simple.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/float/simple.pl   6 Mar 2011 14:44:02 -0000       1.8
+++ t/results/float/simple.pl   20 Mar 2011 13:00:38 -0000      1.9
@@ -245,8 +245,7 @@
 
 
 
-$result_converted{'plaintext'}->{'simple'} = '
-In float.
+$result_converted{'plaintext'}->{'simple'} = 'In float.
 
 Type 1: Caption.
 ';

Index: t/results/heading/heading_in_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/heading/heading_in_copying.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/heading/heading_in_copying.pl     13 Mar 2011 15:00:21 -0000      
1.1
+++ t/results/heading/heading_in_copying.pl     20 Mar 2011 13:00:38 -0000      
1.2
@@ -442,8 +442,7 @@
 
 
 
-$result_converted{'plaintext'}->{'heading_in_copying'} = '
-in copying @ _heading_
+$result_converted{'plaintext'}->{'heading_in_copying'} = 'in copying @ 
_heading_
 ======================
 
 second in copying @ _subheading_

Index: t/results/heading/heading_in_quotation.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/heading/heading_in_quotation.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/heading/heading_in_quotation.pl   13 Mar 2011 15:00:22 -0000      
1.1
+++ t/results/heading/heading_in_quotation.pl   20 Mar 2011 13:00:38 -0000      
1.2
@@ -190,8 +190,7 @@
 
 
 
-$result_converted{'plaintext'}->{'heading_in_quotation'} = '
-     in quotation @ _heading_
+$result_converted{'plaintext'}->{'heading_in_quotation'} = '     in quotation 
@ _heading_
 =============================
 
 ';

Index: t/results/itemize/enumerate_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/enumerate_argument.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/itemize/enumerate_argument.pl     6 Mar 2011 14:44:04 -0000       
1.6
+++ t/results/itemize/enumerate_argument.pl     20 Mar 2011 13:00:38 -0000      
1.7
@@ -342,7 +342,6 @@
 
 
 
-$result_converted{'plaintext'}->{'enumerate_argument'} = '
-';
+$result_converted{'plaintext'}->{'enumerate_argument'} = '';
 
 1;

Index: t/results/itemize/enumerate_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/itemize/enumerate_in_example.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/itemize/enumerate_in_example.pl   7 Mar 2011 00:22:32 -0000       
1.5
+++ t/results/itemize/enumerate_in_example.pl   20 Mar 2011 13:00:38 -0000      
1.6
@@ -250,8 +250,7 @@
 
 
 
-$result_converted{'plaintext'}->{'enumerate_in_example'} = '
-       1. first item
+$result_converted{'plaintext'}->{'enumerate_in_example'} = '       1. first 
item
        2. second  item
 
           still second

Index: t/results/itemize/inter_item_commands_in_enumerate.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/itemize/inter_item_commands_in_enumerate.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/itemize/inter_item_commands_in_enumerate.pl       15 Mar 2011 
20:29:12 -0000      1.1
+++ t/results/itemize/inter_item_commands_in_enumerate.pl       20 Mar 2011 
13:00:38 -0000      1.2
@@ -150,8 +150,7 @@
 
 
 
-$result_converted{'plaintext'}->{'inter_item_commands_in_enumerate'} = '
-  1. e-numerate
+$result_converted{'plaintext'}->{'inter_item_commands_in_enumerate'} = '  1. 
e-numerate
 ';
 
 1;

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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/menu/dash_in_menu.pl      6 Mar 2011 14:44:05 -0000       1.4
+++ t/results/menu/dash_in_menu.pl      20 Mar 2011 13:00:39 -0000      1.5
@@ -234,8 +234,7 @@
 
 
 
-$result_converted{'plaintext'}->{'dash_in_menu'} = '
-* Menu:
+$result_converted{'plaintext'}->{'dash_in_menu'} = '* Menu:
 
 * entry--in: (manual)n---ode.         description -- in.
 

Index: t/results/menu/detailmenu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/menu/detailmenu.pl        6 Mar 2011 14:44:05 -0000       1.20
+++ t/results/menu/detailmenu.pl        20 Mar 2011 13:00:39 -0000      1.21
@@ -330,8 +330,7 @@
 
 
 
-$result_converted{'plaintext'}->{'detailmenu'} = '
-* Menu:
+$result_converted{'plaintext'}->{'detailmenu'} = '* Menu:
 
 * Copying Conditions::          Your rights.
 

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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/menu/detailmenu_on_subnodes.pl    13 Mar 2011 15:00:25 -0000      
1.1
+++ t/results/menu/detailmenu_on_subnodes.pl    20 Mar 2011 13:00:39 -0000      
1.2
@@ -1828,8 +1828,7 @@
 
 
 
-$result_converted{'plaintext'}->{'detailmenu_on_subnodes'} = '
-* Menu:
+$result_converted{'plaintext'}->{'detailmenu_on_subnodes'} = '* Menu:
 
 * chapter::
 * chapter 2::

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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/menu/formats_in_menu.pl   14 Mar 2011 21:43:09 -0000      1.2
+++ t/results/menu/formats_in_menu.pl   20 Mar 2011 13:00:39 -0000      1.3
@@ -880,8 +880,7 @@
 
 
 
-$result_converted{'plaintext'}->{'formats_in_menu'} = '
-* Menu:
+$result_converted{'plaintext'}->{'formats_in_menu'} = '* Menu:
 
 * (gcc):: text
 item

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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/menu/menu_title_before_entries.pl 16 Mar 2011 01:16:44 -0000      
1.1
+++ t/results/menu/menu_title_before_entries.pl 20 Mar 2011 13:00:39 -0000      
1.2
@@ -364,8 +364,7 @@
 
 
 
-$result_converted{'plaintext'}->{'menu_title_before_entries'} = '
-* Menu:
+$result_converted{'plaintext'}->{'menu_title_before_entries'} = '* Menu:
 
 Horizontal space
 * subnode::

Index: t/results/menu/no_colon_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/menu/no_colon_in_menu.pl  16 Mar 2011 01:16:44 -0000      1.1
+++ t/results/menu/no_colon_in_menu.pl  20 Mar 2011 13:00:39 -0000      1.2
@@ -219,8 +219,7 @@
 
 
 
-$result_converted{'plaintext'}->{'no_colon_in_menu'} = '
-* Menu:
+$result_converted{'plaintext'}->{'no_colon_in_menu'} = '* Menu:
 
 * a
 ';

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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/menu/reference_to_external_manual.pl      12 Mar 2011 00:24:39 
-0000      1.11
+++ t/results/menu/reference_to_external_manual.pl      20 Mar 2011 13:00:40 
-0000      1.12
@@ -289,8 +289,7 @@
 
 
 
-$result_converted{'plaintext'}->{'reference_to_external_manual'} = '
-* Menu:
+$result_converted{'plaintext'}->{'reference_to_external_manual'} = '* Menu:
 
 * (info)::
 ';

Index: t/results/menu/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/menu/simple.pl    6 Mar 2011 14:44:06 -0000       1.23
+++ t/results/menu/simple.pl    20 Mar 2011 13:00:40 -0000      1.24
@@ -13,6 +13,23 @@
       'type' => 'empty_line'
     },
     {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'Before menu.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
       'cmdname' => 'menu',
       'contents' => [
         {
@@ -97,7 +114,7 @@
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 4,
+            'line_nr' => 6,
             'macro' => ''
           },
           'parent' => {},
@@ -147,7 +164,7 @@
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 5,
+            'line_nr' => 7,
             'macro' => ''
           },
           'parent' => {},
@@ -212,7 +229,7 @@
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 6,
+            'line_nr' => 8,
             'macro' => ''
           },
           'parent' => {},
@@ -272,7 +289,7 @@
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 7,
+            'line_nr' => 9,
             'macro' => ''
           },
           'parent' => {},
@@ -351,7 +368,7 @@
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 12,
+            'line_nr' => 14,
             'macro' => ''
           },
           'parent' => {},
@@ -389,7 +406,7 @@
           },
           'line_nr' => {
             'file_name' => '',
-            'line_nr' => 13,
+            'line_nr' => 15,
             'macro' => ''
           },
           'parent' => {}
@@ -400,83 +417,108 @@
       },
       'line_nr' => {
         'file_name' => '',
-        'line_nr' => 2,
+        'line_nr' => 4,
         'macro' => ''
       },
       'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'After menu.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
     }
   ],
   'type' => 'text_root'
 };
 $result_trees{'simple'}{'contents'}[0]{'parent'} = $result_trees{'simple'};
 $result_trees{'simple'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'simple'}{'contents'}[1]{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[4]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[5];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[5]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[4]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[5];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[5]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'} 
= $result_trees{'simple'}{'contents'}[1]{'contents'}[7];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[3];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[9]{'args'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[9]{'args'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[9]{'args'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[9];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[9]{'extra'}{'command'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[9]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'extra'}{'end_command'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[9];
 $result_trees{'simple'}{'contents'}[1]{'parent'} = $result_trees{'simple'};
+$result_trees{'simple'}{'contents'}[2]{'parent'} = $result_trees{'simple'};
+$result_trees{'simple'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'simple'}{'contents'}[3]{'contents'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[4]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[5];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[5]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'args'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'args'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'args'}[1]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[4]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[5];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[5]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'args'}[3]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[4]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[5];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[5];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[5];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[5];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'contents'}[0]{'parent'} 
= $result_trees{'simple'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[9];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'extra'}{'command'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'extra'}{'end_command'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[9];
+$result_trees{'simple'}{'contents'}[3]{'parent'} = $result_trees{'simple'};
+$result_trees{'simple'}{'contents'}[4]{'parent'} = $result_trees{'simple'};
+$result_trees{'simple'}{'contents'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[5];
+$result_trees{'simple'}{'contents'}[5]{'parent'} = $result_trees{'simple'};
 
 $result_texis{'simple'} = '
+Before menu.
+
 @menu
 comment
 * menu entry name : node.    description
@@ -489,10 +531,14 @@
 new comment
 * last node entry ::
 @end menu
+
+After menu.
 ';
 
 
 $result_texts{'simple'} = '
+Before menu.
+
 comment
 * menu entry name : node.    description
 * node name::                description new
@@ -503,23 +549,25 @@
 
 new comment
 * last node entry ::
+
+After menu.
 ';
 
 $result_errors{'simple'} = [
   {
-    'error_line' => ':2: @menu seen before first @node
+    'error_line' => ':4: @menu seen before first @node
 ',
     'file_name' => '',
-    'line_nr' => 2,
+    'line_nr' => 4,
     'macro' => '',
     'text' => '@menu seen before first @node',
     'type' => 'error'
   },
   {
-    'error_line' => ':2: perhaps your @top node should be wrapped in @ifnottex 
rather than @ifinfo?
+    'error_line' => ':4: perhaps your @top node should be wrapped in @ifnottex 
rather than @ifinfo?
 ',
     'file_name' => '',
-    'line_nr' => 2,
+    'line_nr' => 4,
     'macro' => '',
     'text' => 'perhaps your @top node should be wrapped in @ifnottex rather 
than @ifinfo?',
     'type' => 'error continuation'
@@ -528,7 +576,8 @@
 
 
 
-$result_converted{'plaintext'}->{'simple'} = '
+$result_converted{'plaintext'}->{'simple'} = 'Before menu.
+
 * Menu:
 
 comment
@@ -541,6 +590,8 @@
 
 new comment
 * last node entry ::
+
+   After menu.
 ';
 
 1;

Index: t/results/misc_commands/codequoteundirected_codequotebacktick.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/misc_commands/codequoteundirected_codequotebacktick.pl    14 Mar 
2011 22:18:21 -0000      1.1
+++ t/results/misc_commands/codequoteundirected_codequotebacktick.pl    20 Mar 
2011 13:00:42 -0000      1.2
@@ -5095,8 +5095,7 @@
 
 
 
-$result_converted{'plaintext'}->{'codequoteundirected_codequotebacktick'} = '
-test quotes
+$result_converted{'plaintext'}->{'codequoteundirected_codequotebacktick'} = 
'test quotes
 ***********
 
 "simple-double-three--four---" `simple\' quotedblleft: ``

Index: t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/misc_commands/comment_space_command_on_line.pl    16 Mar 2011 
01:16:44 -0000      1.1
+++ t/results/misc_commands/comment_space_command_on_line.pl    20 Mar 2011 
13:00:42 -0000      1.2
@@ -841,8 +841,7 @@
 
 
 
-$result_converted{'plaintext'}->{'comment_space_command_on_line'} = '
-top element 
+$result_converted{'plaintext'}->{'comment_space_command_on_line'} = 'top 
element 
 ************
 
 Heading  

Index: t/results/misc_commands/comments_in_text.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/comments_in_text.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/misc_commands/comments_in_text.pl 6 Mar 2011 14:44:06 -0000       
1.2
+++ t/results/misc_commands/comments_in_text.pl 20 Mar 2011 13:00:42 -0000      
1.3
@@ -158,8 +158,7 @@
 
 
 
-$result_converted{'plaintext'}->{'comments_in_text'} = '
-Text line followed by a comment on the same line and another below Text
+$result_converted{'plaintext'}->{'comments_in_text'} = 'Text line followed by 
a comment on the same line and another below Text
 line after the comment followed by a comment Text line after the text
 line followed by the comment.
 

Index: t/results/misc_commands/definfoenclose.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/definfoenclose.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/misc_commands/definfoenclose.pl   6 Mar 2011 14:44:06 -0000       
1.26
+++ t/results/misc_commands/definfoenclose.pl   20 Mar 2011 13:00:42 -0000      
1.27
@@ -425,8 +425,7 @@
 
 
 
-$result_converted{'plaintext'}->{'definfoenclose'} = '
-definfoenclose phoo,//,\\
+$result_converted{'plaintext'}->{'definfoenclose'} = 'definfoenclose phoo,//,\\
 
    //bar\\
 

Index: t/results/misc_commands/noindent_indent.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/noindent_indent.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/misc_commands/noindent_indent.pl  6 Mar 2011 14:44:06 -0000       
1.2
+++ t/results/misc_commands/noindent_indent.pl  20 Mar 2011 13:00:42 -0000      
1.3
@@ -203,8 +203,7 @@
 
 
 
-$result_converted{'plaintext'}->{'noindent_indent'} = '
-   First para
+$result_converted{'plaintext'}->{'noindent_indent'} = '   First para
 
 qsddsqkdsqkkmljsqjsqodmmdsqdsmqj dqs sdq sqd sdq dsq sdq sqd sqd sdq sdq
 qsd dsq sdq dsq dssdq sdq sdq sdq dsq sdq dsq dsq sdq dsq sdqsd q

Index: t/results/misc_commands/ref_in_center.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/ref_in_center.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/misc_commands/ref_in_center.pl    13 Mar 2011 22:01:24 -0000      
1.1
+++ t/results/misc_commands/ref_in_center.pl    20 Mar 2011 13:00:42 -0000      
1.2
@@ -324,8 +324,7 @@
 
 
 
-$result_converted{'plaintext'}->{'ref_in_center'} = '
-                              *note Top::
+$result_converted{'plaintext'}->{'ref_in_center'} = '                          
    *note Top::
 
                               *note Top::
    very long

Index: t/results/misc_commands/test_allowcodebreaks.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/misc_commands/test_allowcodebreaks.pl     6 Mar 2011 14:44:06 
-0000       1.5
+++ t/results/misc_commands/test_allowcodebreaks.pl     20 Mar 2011 13:00:43 
-0000      1.6
@@ -2628,8 +2628,7 @@
 
 
 
-$result_converted{'plaintext'}->{'test_allowcodebreaks'} = '
-Before first allowcodebreaks Out of code -- out-of-code.  `1aaa\' `2aaa-\'
+$result_converted{'plaintext'}->{'test_allowcodebreaks'} = 'Before first 
allowcodebreaks Out of code -- out-of-code.  `1aaa\' `2aaa-\'
 `-3bbb\' `4aaa-bbb\' ` 5aaa-bb\' `6aaa-bb \' `ccc 7aaa-bbb\' `ccc 8aaa-bbb
 ddd\' `9aaa-bbb rrr_vv\' `fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor\'
 

Index: t/results/multitable/inter_item_commands_in_multitable.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/multitable/inter_item_commands_in_multitable.pl   15 Mar 2011 
20:29:12 -0000      1.1
+++ t/results/multitable/inter_item_commands_in_multitable.pl   20 Mar 2011 
13:00:43 -0000      1.2
@@ -787,8 +787,7 @@
 
 
 
-$result_converted{'plaintext'}->{'inter_item_commands_in_multitable'} = '
-truc
+$result_converted{'plaintext'}->{'inter_item_commands_in_multitable'} = 'truc
 
 trouc
 

Index: t/results/paragraph/comment_in_quotation.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/paragraph/comment_in_quotation.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/paragraph/comment_in_quotation.pl 6 Mar 2011 14:44:07 -0000       
1.3
+++ t/results/paragraph/comment_in_quotation.pl 20 Mar 2011 13:00:43 -0000      
1.4
@@ -227,8 +227,7 @@
 
 
 
-$result_converted{'plaintext'}->{'comment_in_quotation'} = '
-     Quotation
+$result_converted{'plaintext'}->{'comment_in_quotation'} = '     Quotation
 
      Quotation no space
 ';

Index: t/results/paragraph/paragraph_indent_asis.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/paragraph/paragraph_indent_asis.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/paragraph/paragraph_indent_asis.pl        6 Mar 2011 14:44:07 
-0000       1.5
+++ t/results/paragraph/paragraph_indent_asis.pl        20 Mar 2011 13:00:44 
-0000      1.6
@@ -207,8 +207,7 @@
 
 
 
-$result_converted{'plaintext'}->{'paragraph_indent_asis'} = '
-  para fff
+$result_converted{'plaintext'}->{'paragraph_indent_asis'} = '  para fff
 
        in quotation
 

Index: t/results/paragraph/text_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/text_line.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/paragraph/text_line.pl    6 Mar 2011 14:44:07 -0000       1.15
+++ t/results/paragraph/text_line.pl    20 Mar 2011 13:00:44 -0000      1.16
@@ -52,8 +52,7 @@
 
 
 
-$result_converted{'plaintext'}->{'text_line'} = '
-text
+$result_converted{'plaintext'}->{'text_line'} = 'text
 
 ';
 

Index: t/results/plaintext_tests/accents_in_var_enable_encoding.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/accents_in_var_enable_encoding.pl 6 Mar 2011 
14:44:07 -0000       1.1
+++ t/results/plaintext_tests/accents_in_var_enable_encoding.pl 20 Mar 2011 
13:00:44 -0000      1.2
@@ -167,8 +167,7 @@
 
 
 
-$result_converted{'plaintext'}->{'accents_in_var_enable_encoding'} = '
-AAç r̆ è.
+$result_converted{'plaintext'}->{'accents_in_var_enable_encoding'} = 'AAç r̆ 
è.
 ';
 
 1;

Index: t/results/plaintext_tests/insert_copying_and_paragraph.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/insert_copying_and_paragraph.pl   19 Mar 2011 
00:04:28 -0000      1.1
+++ t/results/plaintext_tests/insert_copying_and_paragraph.pl   20 Mar 2011 
13:00:44 -0000      1.2
@@ -138,8 +138,7 @@
 
 
 
-$result_converted{'plaintext'}->{'insert_copying_and_paragraph'} = '
-Insertcopying
+$result_converted{'plaintext'}->{'insert_copying_and_paragraph'} = 
'Insertcopying
    In copying.
 ';
 

Index: t/results/plaintext_tests/insert_copying_inline_and_paragraph.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/insert_copying_inline_and_paragraph.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/insert_copying_inline_and_paragraph.pl    19 Mar 
2011 00:04:28 -0000      1.1
+++ t/results/plaintext_tests/insert_copying_inline_and_paragraph.pl    20 Mar 
2011 13:00:44 -0000      1.2
@@ -133,8 +133,7 @@
 
 
 
-$result_converted{'plaintext'}->{'insert_copying_inline_and_paragraph'} = '
-Insertcopying In copying.
+$result_converted{'plaintext'}->{'insert_copying_inline_and_paragraph'} = 
'Insertcopying In copying.
 ';
 
 1;

Index: t/results/plaintext_tests/isolated_html_expanded.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/isolated_html_expanded.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/plaintext_tests/isolated_html_expanded.pl 6 Mar 2011 14:44:07 
-0000       1.2
+++ t/results/plaintext_tests/isolated_html_expanded.pl 20 Mar 2011 13:00:44 
-0000      1.3
@@ -64,8 +64,7 @@
 
 
 
-$result_converted{'plaintext'}->{'isolated_html_expanded'} = '
-html
+$result_converted{'plaintext'}->{'isolated_html_expanded'} = 'html
 ';
 
 1;

Index: t/results/plaintext_tests/line_passed_and_formats.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/plaintext_tests/line_passed_and_formats.pl        12 Mar 2011 
00:24:39 -0000      1.5
+++ t/results/plaintext_tests/line_passed_and_formats.pl        20 Mar 2011 
13:00:44 -0000      1.6
@@ -3184,8 +3184,7 @@
 
 
 
-$result_converted{'plaintext'}->{'line_passed_and_formats'} = '
-     special: Quotation special.
+$result_converted{'plaintext'}->{'line_passed_and_formats'} = '     special: 
Quotation special.
           Nested quotation sdflkmsfdlkmfsdqmlkfsdq mlfdsqlkmfdsqmlkfdsq
           klm fsqdlkmfdsq fdsfsdqmlkfsqd m lqlkmf qskmlfq sklm fqds
 

Index: t/results/plaintext_tests/nested_multitable.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/nested_multitable.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/plaintext_tests/nested_multitable.pl      6 Mar 2011 14:44:07 
-0000       1.4
+++ t/results/plaintext_tests/nested_multitable.pl      20 Mar 2011 13:00:44 
-0000      1.5
@@ -497,8 +497,7 @@
 
 
 
-$result_converted{'plaintext'}->{'nested_multitable'} = '
-AAAA   machin        bidule
+$result_converted{'plaintext'}->{'nested_multitable'} = 'AAAA   machin        
bidule
 other item           in tab
 ';
 

Index: t/results/plaintext_tests/no_punctuation_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/no_punctuation_commands.pl        6 Mar 2011 
23:20:36 -0000       1.1
+++ t/results/plaintext_tests/no_punctuation_commands.pl        20 Mar 2011 
13:00:44 -0000      1.2
@@ -451,8 +451,7 @@
 
 
 
-$result_converted{'plaintext'}->{'no_punctuation_commands'} = '
-Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+$result_converted{'plaintext'}->{'no_punctuation_commands'} = 'Dot. Exclam! 
Question? Dot. Exclam! Question? GAAA.
 
    End of lines Dot. Exclam! Question? End.
 

Index: t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl  6 Mar 
2011 23:20:36 -0000       1.1
+++ t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl  20 Mar 
2011 13:00:45 -0000      1.2
@@ -491,8 +491,7 @@
 
 
 
-$result_converted{'plaintext'}->{'no_punctuation_commands_frenchspacing'} = '
-Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
+$result_converted{'plaintext'}->{'no_punctuation_commands_frenchspacing'} = 
'Dot. Exclam! Question? Dot. Exclam! Question? GAAA.
 
    End of lines Dot. Exclam! Question? End.
 

Index: t/results/plaintext_tests/protect_spaces_on_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/protect_spaces_on_line.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/plaintext_tests/protect_spaces_on_line.pl 6 Mar 2011 14:44:07 
-0000       1.5
+++ t/results/plaintext_tests/protect_spaces_on_line.pl 20 Mar 2011 13:00:45 
-0000      1.6
@@ -284,8 +284,7 @@
 
 
 
-$result_converted{'plaintext'}->{'protect_spaces_on_line'} = '
-Before samp.  `a\'.  after samp, w in   w. after dot afterw
+$result_converted{'plaintext'}->{'protect_spaces_on_line'} = 'Before samp.  
`a\'.  after samp, w in   w. after dot afterw
 
 before samp.  `a\'.  after samp, w in   w. after dot afterw
 ';

Index: t/results/plaintext_tests/punctuation.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/punctuation.pl    6 Mar 2011 23:20:36 -0000       
1.1
+++ t/results/plaintext_tests/punctuation.pl    20 Mar 2011 13:00:45 -0000      
1.2
@@ -251,8 +251,7 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation'} = '
-Dot.  Exclam!  Question?  Dot.  Exclam!  Question?  GAAA.
+$result_converted{'plaintext'}->{'punctuation'} = 'Dot.  Exclam!  Question?  
Dot.  Exclam!  Question?  GAAA.
 
    End of lines Dot.  Exclam!  Question?  End.
 

Index: t/results/plaintext_tests/punctuation_at_end_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_at_end_command.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/plaintext_tests/punctuation_at_end_command.pl     6 Mar 2011 
21:31:56 -0000       1.2
+++ t/results/plaintext_tests/punctuation_at_end_command.pl     20 Mar 2011 
13:00:45 -0000      1.3
@@ -368,8 +368,7 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_at_end_command'} = '
-Text.  Email .  <.> dmn 1. and text.  indicateurl <.> and then kbd `.\'
+$result_converted{'plaintext'}->{'punctuation_at_end_command'} = 'Text.  Email 
.  <.> dmn 1. and text.  indicateurl <.> and then kbd `.\'
 and math . and cite `.\' and emph _._  text.  asis in code `.\' text.  a
 dot before a emph open ._  and in emph._
 ';

Index: t/results/plaintext_tests/punctuation_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_commands.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/punctuation_commands.pl   6 Mar 2011 23:20:36 
-0000       1.1
+++ t/results/plaintext_tests/punctuation_commands.pl   20 Mar 2011 13:00:45 
-0000      1.2
@@ -567,8 +567,7 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_commands'} = '
-Dot.  Exclam!  Question?  Dot.  Exclam!  Question?  GAAA.
+$result_converted{'plaintext'}->{'punctuation_commands'} = 'Dot.  Exclam!  
Question?  Dot.  Exclam!  Question?  GAAA.
 
    Enddots...  Enddots...  GBBB.
 

Index: t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/punctuation_commands_frenchspacing.pl     6 Mar 
2011 23:20:37 -0000       1.1
+++ t/results/plaintext_tests/punctuation_commands_frenchspacing.pl     20 Mar 
2011 13:00:45 -0000      1.2
@@ -607,8 +607,7 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_commands_frenchspacing'} = '
-Dot.  Exclam!  Question?  Dot.  Exclam!  Question?  GAAA.
+$result_converted{'plaintext'}->{'punctuation_commands_frenchspacing'} = 'Dot. 
 Exclam!  Question?  Dot.  Exclam!  Question?  GAAA.
 
    Enddots...  Enddots...  GBBB.
 

Index: t/results/plaintext_tests/punctuation_frenchspacing.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/punctuation_frenchspacing.pl      6 Mar 2011 
23:20:37 -0000       1.1
+++ t/results/plaintext_tests/punctuation_frenchspacing.pl      20 Mar 2011 
13:00:45 -0000      1.2
@@ -291,8 +291,7 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_frenchspacing'} = '
-Dot.  Exclam!  Question?  Dot.  Exclam!  Question?  GAAA.
+$result_converted{'plaintext'}->{'punctuation_frenchspacing'} = 'Dot.  Exclam! 
 Question?  Dot.  Exclam!  Question?  GAAA.
 
    End of lines Dot.  Exclam!  Question?  End.
 

Index: t/results/plaintext_tests/punctuation_in_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/punctuation_in_command.pl 6 Mar 2011 20:43:32 
-0000       1.1
+++ t/results/plaintext_tests/punctuation_in_command.pl 20 Mar 2011 13:00:46 
-0000      1.2
@@ -330,8 +330,7 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_in_command'} = '
-Text.  Email a.  b <a. b> dmn 1. 2 and text.  indicateurl <i. u> and
+$result_converted{'plaintext'}->{'punctuation_in_command'} = 'Text.  Email a.  
b <a. b> dmn 1. 2 and text.  indicateurl <i. u> and
 then kbd `k. d\' and math m. a and cite `c. e\' and emph _e.  h_ text.
 asis in code `a. c\'
 ';

Index: t/results/plaintext_tests/settitle_and_empty_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/settitle_and_empty_top.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/plaintext_tests/settitle_and_empty_top.pl 6 Mar 2011 14:44:07 
-0000       1.2
+++ t/results/plaintext_tests/settitle_and_empty_top.pl 20 Mar 2011 13:00:46 
-0000      1.3
@@ -134,8 +134,7 @@
 
 
 
-$result_converted{'plaintext'}->{'settitle_and_empty_top'} = '
-Title
+$result_converted{'plaintext'}->{'settitle_and_empty_top'} = 'Title
 *****
 
 ';

Index: t/results/plaintext_tests/sp_with_text_before_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/sp_with_text_before_in_example.pl 6 Mar 2011 
23:20:37 -0000       1.1
+++ t/results/plaintext_tests/sp_with_text_before_in_example.pl 20 Mar 2011 
13:00:46 -0000      1.2
@@ -163,8 +163,7 @@
 
 
 
-$result_converted{'plaintext'}->{'sp_with_text_before_in_example'} = '
-     sp
+$result_converted{'plaintext'}->{'sp_with_text_before_in_example'} = '     sp
 
 
 

Index: t/results/plaintext_tests/star_at_command_formatting.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/star_at_command_formatting.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/plaintext_tests/star_at_command_formatting.pl     6 Mar 2011 
14:44:07 -0000       1.5
+++ t/results/plaintext_tests/star_at_command_formatting.pl     20 Mar 2011 
13:00:46 -0000      1.6
@@ -1452,8 +1452,7 @@
 
 
 
-$result_converted{'plaintext'}->{'star_at_command_formatting'} = '
-Some text
+$result_converted{'plaintext'}->{'star_at_command_formatting'} = 'Some text
 more text.  Even more text.
 not at eol.
 

Index: t/results/plaintext_tests/unknown_value.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/unknown_value.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/unknown_value.pl  14 Mar 2011 21:43:09 -0000      
1.1
+++ t/results/plaintext_tests/unknown_value.pl  20 Mar 2011 13:00:46 -0000      
1.2
@@ -39,8 +39,7 @@
 
 
 
-$result_converted{'plaintext'}->{'unknown_value'} = '
-{No value for `unknown\'}
+$result_converted{'plaintext'}->{'unknown_value'} = '{No value for `unknown\'}
 ';
 
 1;

Index: t/results/preformatted/caption_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/caption_in_example.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/preformatted/caption_in_example.pl        6 Mar 2011 14:44:07 
-0000       1.5
+++ t/results/preformatted/caption_in_example.pl        20 Mar 2011 13:00:46 
-0000      1.6
@@ -336,8 +336,7 @@
 
 
 
-$result_converted{'plaintext'}->{'caption_in_example'} = '
-     in example
+$result_converted{'plaintext'}->{'caption_in_example'} = '     in example
 
 
 

Index: t/results/preformatted/quote_dash_in_display.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_display.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/preformatted/quote_dash_in_display.pl     19 Mar 2011 16:20:32 
-0000      1.1
+++ t/results/preformatted/quote_dash_in_display.pl     20 Mar 2011 13:00:46 
-0000      1.2
@@ -120,8 +120,7 @@
 
 
 
-$result_converted{'plaintext'}->{'quote_dash_in_display'} = '
-     and now - yes--now and "so".
+$result_converted{'plaintext'}->{'quote_dash_in_display'} = '     and now - 
yes--now and "so".
 
 ';
 

Index: t/results/preformatted/quote_dash_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_example.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/preformatted/quote_dash_in_example.pl     6 Mar 2011 14:44:08 
-0000       1.4
+++ t/results/preformatted/quote_dash_in_example.pl     20 Mar 2011 13:00:46 
-0000      1.5
@@ -120,8 +120,7 @@
 
 
 
-$result_converted{'plaintext'}->{'quote_dash_in_example'} = '
-     and now -- yes---now and ``so\'\'.
+$result_converted{'plaintext'}->{'quote_dash_in_example'} = '     and now -- 
yes---now and ``so\'\'.
 
 ';
 

Index: t/results/quotation/empty_quotation.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/quotation/empty_quotation.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/quotation/empty_quotation.pl      14 Mar 2011 21:43:09 -0000      
1.1
+++ t/results/quotation/empty_quotation.pl      20 Mar 2011 13:00:47 -0000      
1.2
@@ -414,8 +414,7 @@
 
 
 
-$result_converted{'plaintext'}->{'empty_quotation'} = '
-     Empty: 
+$result_converted{'plaintext'}->{'empty_quotation'} = '     Empty: 
      : 
 
      : ';

Index: t/results/quotation/space_at_commands_end_quotation_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/quotation/space_at_commands_end_quotation_line.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/quotation/space_at_commands_end_quotation_line.pl 14 Mar 2011 
21:43:10 -0000      1.1
+++ t/results/quotation/space_at_commands_end_quotation_line.pl 20 Mar 2011 
13:00:47 -0000      1.2
@@ -332,8 +332,7 @@
 
 
 
-$result_converted{'plaintext'}->{'space_at_commands_end_quotation_line'} = '
-     @ at the end of line  : A @ at the end of the @quotation line.
+$result_converted{'plaintext'}->{'space_at_commands_end_quotation_line'} = '   
  @ at the end of line  : A @ at the end of the @quotation line.
 
      @  at the end of line  : A @  at the end of the @quotation line.
 ';

Index: t/results/raw/braces_in_tex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/braces_in_tex.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/raw/braces_in_tex.pl      6 Mar 2011 14:44:08 -0000       1.5
+++ t/results/raw/braces_in_tex.pl      20 Mar 2011 13:00:47 -0000      1.6
@@ -266,7 +266,6 @@
 
 
 
-$result_converted{'plaintext'}->{'braces_in_tex'} = '
-';
+$result_converted{'plaintext'}->{'braces_in_tex'} = '';
 
 1;

Index: t/results/raw/misc_raw.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/misc_raw.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/raw/misc_raw.pl   19 Mar 2011 16:20:32 -0000      1.18
+++ t/results/raw/misc_raw.pl   20 Mar 2011 13:00:47 -0000      1.19
@@ -160,8 +160,7 @@
 
 
 
-$result_converted{'plaintext'}->{'misc_raw'} = '
-in  v---erbatim``
+$result_converted{'plaintext'}->{'misc_raw'} = 'in  v---erbatim``
 in verbatim2
 ';
 

Index: t/results/raw/misc_raw_comments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/misc_raw_comments.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/raw/misc_raw_comments.pl  6 Mar 2011 14:44:08 -0000       1.18
+++ t/results/raw/misc_raw_comments.pl  20 Mar 2011 13:00:47 -0000      1.19
@@ -186,8 +186,7 @@
 
 
 
-$result_converted{'plaintext'}->{'misc_raw_comments'} = '
-in verbatim @c in verbatim
+$result_converted{'plaintext'}->{'misc_raw_comments'} = 'in verbatim @c in 
verbatim
 in verbatim2
 ';
 

Index: t/results/raw/raw_commands_and_end_of_lines.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/raw/raw_commands_and_end_of_lines.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/raw/raw_commands_and_end_of_lines.pl      6 Mar 2011 23:52:48 
-0000       1.1
+++ t/results/raw/raw_commands_and_end_of_lines.pl      20 Mar 2011 13:00:47 
-0000      1.2
@@ -1320,8 +1320,7 @@
 
 
 
-$result_converted{'plaintext'}->{'raw_commands_and_end_of_lines'} = '
-Block commands on a line end commands on a line.
+$result_converted{'plaintext'}->{'raw_commands_and_end_of_lines'} = 'Block 
commands on a line end commands on a line.
 
    Before the opening command end commands on a line.
 

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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/sectioning/chapter_node_before_and_after_part.pl  6 Mar 2011 
14:44:08 -0000       1.3
+++ t/results/sectioning/chapter_node_before_and_after_part.pl  20 Mar 2011 
13:00:48 -0000      1.4
@@ -579,8 +579,7 @@
 
 
 
-$result_converted{'plaintext'}->{'chapter_node_before_and_after_part'} = '
-1 chapter
+$result_converted{'plaintext'}->{'chapter_node_before_and_after_part'} = '1 
chapter
 *********
 
 * Menu:

Index: t/results/sectioning/section_below_unnumbered.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/section_below_unnumbered.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/sectioning/section_below_unnumbered.pl    6 Mar 2011 14:44:09 
-0000       1.4
+++ t/results/sectioning/section_below_unnumbered.pl    20 Mar 2011 13:00:48 
-0000      1.5
@@ -884,8 +884,7 @@
 
 
 
-$result_converted{'plaintext'}->{'section_below_unnumbered'} = '
-Top
+$result_converted{'plaintext'}->{'section_below_unnumbered'} = 'Top
 Unn
   Sec
 Top

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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/sectioning/section_in_unnumbered_plaintext.pl     6 Mar 2011 
14:44:09 -0000       1.3
+++ t/results/sectioning/section_in_unnumbered_plaintext.pl     20 Mar 2011 
13:00:48 -0000      1.4
@@ -8097,8 +8097,7 @@
 
 
 
-$result_converted{'plaintext'}->{'section_in_unnumbered_plaintext'} = '
-Test section in unnumbered
+$result_converted{'plaintext'}->{'section_in_unnumbered_plaintext'} = 'Test 
section in unnumbered
 1 chapter
   1.1 section in chapter
 unnumbered

Index: t/results/sectioning/top_no_argument_and_content.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_content.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/sectioning/top_no_argument_and_content.pl 6 Mar 2011 14:44:09 
-0000       1.3
+++ t/results/sectioning/top_no_argument_and_content.pl 20 Mar 2011 13:00:48 
-0000      1.4
@@ -95,8 +95,7 @@
 
 
 
-$result_converted{'plaintext'}->{'top_no_argument_and_content'} = '
-A.
+$result_converted{'plaintext'}->{'top_no_argument_and_content'} = 'A.
 ';
 
 1;

Index: t/results/test_count/flushright.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/flushright.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/test_count/flushright.pl  6 Mar 2011 14:44:09 -0000       1.9
+++ t/results/test_count/flushright.pl  20 Mar 2011 13:00:49 -0000      1.10
@@ -383,13 +383,13 @@
 
 $result_converted{'debugcount'}->{'flushright'} = ' [1] (0,0) :text_root
   [2] (0,0) :empty_line:text|\\n|
-  [2] (1,1)
-  [3] (1,1) @flushright
-   [4] (1,1) :empty_line_after_command:text|\\n|
-   [4] (1,1)
-   [5] (1,1) :empty_spaces_before_paragraph:text|  |
-   [5] (1,1)
-   [6] (1,1) :paragraph
+  [2] (0,0)
+  [3] (0,0) @flushright
+   [4] (0,0) :empty_line_after_command:text|\\n|
+   [4] (0,0)
+   [5] (0,0) :empty_spaces_before_paragraph:text|  |
+   [5] (0,0)
+   [6] (0,0) :paragraph
     [7] (0,0) :text|aaa bb |
     [7] (6,0)
     [8] (6,0) @anchor
@@ -415,36 +415,35 @@
     [16] (25,1)
     [17] (25,1) :text|dsdbf\\n|
     [17] (32,2)
-   [6] (143,3)
- locations  (1) l 1 b 68 (2) l 2 b 134 (3) l 2 b 138
-   [18] (143,3) :empty_line:text|\\n|
-   [18] (144,4)
-   [19] (144,4) :paragraph
+   [6] (142,2)
+ locations  (1) l 0 b 67 (2) l 1 b 133 (3) l 1 b 137
+   [18] (142,2) :empty_line:text|\\n|
+   [18] (143,3)
+   [19] (143,3) :paragraph
     [20] (0,0) :text|dqs\\n|
     [20] (4,1)
     [21] (4,1) :text|sqdd\\n|
     [21] (9,2)
-   [19] (286,6)
-   [22] (286,6) :empty_line:text|\\n|
-   [22] (287,7)
-   [23] (287,7) @anchor
-   [23] (287,7)
- locations  (4) l 7 b 287
-   [24] (287,7) :empty_spaces_after_close_brace:text|\\n|
-   [24] (287,7)
-   [25] (287,7) :empty_line:text|\\n|
-   [25] (287,7)
-   [26] (287,7) :paragraph
+   [19] (285,5)
+   [22] (285,5) :empty_line:text|\\n|
+   [22] (286,6)
+   [23] (286,6) @anchor
+   [23] (286,6)
+ locations  (4) l 6 b 286
+   [24] (286,6) :empty_spaces_after_close_brace:text|\\n|
+   [24] (286,6)
+   [25] (286,6) :empty_line:text|\\n|
+   [25] (286,6)
+   [26] (286,6) :paragraph
     [27] (0,0) :text|new para.\\n|
     [27] (10,1)
-   [26] (358,8)
-   [28] (358,8) :empty_line:text|\\n|
-   [28] (359,9)
-   [29] (359,9) @end
-   [29] (359,9)
-  [3] (359,9)
- [1] (359,9)
-
+   [26] (357,7)
+   [28] (357,7) :empty_line:text|\\n|
+   [28] (358,8)
+   [29] (358,8) @end
+   [29] (358,8)
+  [3] (358,8)
+ [1] (358,8)
                                                              aaa bb ada
                                                    dad sff sd and dsdbf
 

Index: t/results/test_count/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/multitable.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/test_count/multitable.pl  6 Mar 2011 14:44:09 -0000       1.9
+++ t/results/test_count/multitable.pl  20 Mar 2011 13:00:49 -0000      1.10
@@ -409,8 +409,8 @@
 
 $result_converted{'debugcount'}->{'multitable'} = ' [1] (0,0) :text_root
   [2] (0,0) :empty_line:text|\\n|
-  [2] (1,1)
-  [3] (1,1) @multitable
+  [2] (0,0)
+  [3] (0,0) @multitable
    [4] (0,0) :bracketed_multitable_prototype
     [5] (0,0) :text|aaa|
     [5] (0,0)
@@ -423,16 +423,16 @@
     [9] (0,0) :text|ccc|
     [9] (0,0)
    [8] (0,0)
-   [10] (1,1) :row
-    [11] (1,1) @item
+   [10] (0,0) :row
+    [11] (0,0) @item
      [12] (0,0) :empty_spaces_after_command:text| |
      [12] (0,0)
      [13] (0,0) :paragraph
       [14] (0,0) :text|aaa |
       [14] (4,1)
      [13] (4,1)
-    [11] (1,1)
-    [15] (1,1) @tab
+    [11] (0,0)
+    [15] (0,0) @tab
      [16] (0,0) :empty_spaces_after_command:text| |
      [16] (0,0)
      [17] (0,0) :paragraph
@@ -444,23 +444,23 @@
       [20] (2,0) :empty_spaces_after_close_brace:text|\\n|
       [20] (2,0)
      [17] (3,1)
-    [15] (1,1)
-    [21] (1,1) @tab
+    [15] (0,0)
+    [21] (0,0) @tab
      [22] (0,0) :empty_spaces_after_command:text| |
      [22] (0,0)
      [23] (0,0) :paragraph
       [24] (0,0) :text|ccc\\n|
       [24] (4,1)
      [23] (4,1)
-    [21] (1,1)
-   [10] (17,2)
- locations  (1) l 1 b 9
-   [25] (17,2) :row
-    [26] (17,2) @item
+    [21] (0,0)
+   [10] (16,1)
+ locations  (1) l 0 b 8
+   [25] (16,1) :row
+    [26] (16,1) @item
      [27] (0,0) :empty_spaces_after_command:text| |
      [27] (0,0)
-    [26] (17,2)
-    [28] (17,2) @tab
+    [26] (16,1)
+    [28] (16,1) @tab
      [29] (0,0) :empty_spaces_after_command:text| |
      [29] (0,0)
      [30] (0,0) @anchor
@@ -468,14 +468,13 @@
  locations  (2) l 0 b 0
      [31] (0,0) :empty_spaces_after_close_brace:text|\\n|
      [31] (0,0)
-    [28] (17,2)
-   [25] (24,3)
- locations  (2) l 2 b 23
-   [32] (24,3) @end
-   [32] (24,3)
-  [3] (24,3)
- [1] (24,3)
-
+    [28] (16,1)
+   [25] (23,2)
+ locations  (2) l 1 b 22
+   [32] (23,2) @end
+   [32] (23,2)
+  [3] (23,2)
+ [1] (23,2)
 aaa   bb    ccc
       
 ';

Index: t/results/test_count/printindex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/printindex.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/test_count/printindex.pl  6 Mar 2011 14:44:09 -0000       1.3
+++ t/results/test_count/printindex.pl  20 Mar 2011 13:00:49 -0000      1.4
@@ -511,117 +511,116 @@
   [2] (0,0) :text_root
   [2] (0,0)
   [3] (0,0) @node
-   [4] (18,0) :code
-    [5] (18,0) :text|Top|
-    [5] (18,0)
- locations  (1) l 0 b 1
-   [4] (18,0)
-   [6] (28,0) :code
-    [7] (28,0) :text|(|
-    [7] (28,0)
-    [8] (28,0) :text|dir|
-    [8] (28,0)
-    [9] (28,0) :text|)|
-    [9] (28,0)
-   [6] (28,0)
-   [10] (35,3) :empty_line:text|\\n|
-   [10] (35,3)
-   [11] (35,3) @cindex
-   [11] (35,3)
+   [4] (17,0) :code
+    [5] (17,0) :text|Top|
+    [5] (17,0)
+ locations  (1) l 0 b 0
+   [4] (17,0)
+   [6] (27,0) :code
+    [7] (27,0) :text|(|
+    [7] (27,0)
+    [8] (27,0) :text|dir|
+    [8] (27,0)
+    [9] (27,0) :text|)|
+    [9] (27,0)
+   [6] (27,0)
+   [10] (34,3) :empty_line:text|\\n|
+   [10] (34,3)
+   [11] (34,3) @cindex
+   [11] (34,3)
  locations  (2) l 3
-   [12] (35,3) @cindex
-   [12] (35,3)
+   [12] (34,3) @cindex
+   [12] (34,3)
  locations  (3) l 3
-   [13] (35,3) @cindex
-   [13] (35,3)
+   [13] (34,3) @cindex
+   [13] (34,3)
  locations  (4) l 3
-   [14] (35,3) :empty_line:text|\\n|
-   [14] (35,3)
-   [15] (35,3) @printindex
-    [16] (56,6) :frenchspacing
-     [17] (56,6) :text|after index|
-     [17] (61,6)
-    [16] (61,6)
-    [18] (97,6) :code
-     [19] (97,6) :text|Top|
-     [19] (97,6)
-    [18] (97,6)
-    [20] (129,7) :frenchspacing
-     [21] (129,7) :text|index entry|
-     [21] (134,7)
-    [20] (134,7)
-    [22] (170,7) :code
-     [23] (170,7) :text|Top|
-     [23] (170,7)
-    [22] (170,7)
-    [24] (202,8) :frenchspacing
-     [25] (202,8) :text|index entry|
-     [25] (207,8)
-    [24] (207,8)
-    [26] (243,8) :code
-     [27] (243,8) :text|Top|
-     [27] (243,8)
-    [26] (243,8)
-    [28] (275,9) :frenchspacing
-     [29] (275,9) 
:text|looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong index 
entry|
-     [29] (343,9)
-    [28] (343,9)
-    [30] (353,9) :code
-     [31] (353,9) :text|Top|
-     [31] (353,9)
-    [30] (353,9)
-   [15] (432,12)
-   [32] (432,12) :empty_line:text|\\n|
-   [32] (432,12)
-   [33] (432,12) @cindex
-   [33] (432,12)
+   [14] (34,3) :empty_line:text|\\n|
+   [14] (34,3)
+   [15] (34,3) @printindex
+    [16] (55,6) :frenchspacing
+     [17] (55,6) :text|after index|
+     [17] (60,6)
+    [16] (60,6)
+    [18] (96,6) :code
+     [19] (96,6) :text|Top|
+     [19] (96,6)
+    [18] (96,6)
+    [20] (128,7) :frenchspacing
+     [21] (128,7) :text|index entry|
+     [21] (133,7)
+    [20] (133,7)
+    [22] (169,7) :code
+     [23] (169,7) :text|Top|
+     [23] (169,7)
+    [22] (169,7)
+    [24] (201,8) :frenchspacing
+     [25] (201,8) :text|index entry|
+     [25] (206,8)
+    [24] (206,8)
+    [26] (242,8) :code
+     [27] (242,8) :text|Top|
+     [27] (242,8)
+    [26] (242,8)
+    [28] (274,9) :frenchspacing
+     [29] (274,9) 
:text|looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong index 
entry|
+     [29] (342,9)
+    [28] (342,9)
+    [30] (352,9) :code
+     [31] (352,9) :text|Top|
+     [31] (352,9)
+    [30] (352,9)
+   [15] (431,12)
+   [32] (431,12) :empty_line:text|\\n|
+   [32] (431,12)
+   [33] (431,12) @cindex
+   [33] (431,12)
  locations  (5) l 12
-   [34] (432,12) :empty_line:text|\\n|
-   [34] (432,12)
-   [35] (432,12) @printindex
-    [36] (453,15) :frenchspacing
-     [37] (453,15) :text|after index|
-     [37] (458,15)
-    [36] (458,15)
-    [38] (494,15) :code
-     [39] (494,15) :text|Top|
-     [39] (494,15)
-    [38] (494,15)
-    [40] (526,16) :frenchspacing
-     [41] (526,16) :text|index entry|
-     [41] (531,16)
-    [40] (531,16)
-    [42] (567,16) :code
-     [43] (567,16) :text|Top|
-     [43] (567,16)
-    [42] (567,16)
-    [44] (599,17) :frenchspacing
-     [45] (599,17) :text|index entry|
-     [45] (604,17)
-    [44] (604,17)
-    [46] (640,17) :code
-     [47] (640,17) :text|Top|
-     [47] (640,17)
-    [46] (640,17)
-    [48] (672,18) :frenchspacing
-     [49] (672,18) 
:text|looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong index 
entry|
-     [49] (740,18)
-    [48] (740,18)
-    [50] (750,18) :code
-     [51] (750,18) :text|Top|
-     [51] (750,18)
-    [50] (750,18)
-   [35] (829,21)
-   [52] (829,21) :empty_line:text|\\n|
-   [52] (829,21)
-   [53] (829,21) @anchor
-   [53] (829,21)
- locations  (6) l 21 b 829
-   [54] (829,21) :empty_spaces_after_close_brace:text|\\n|
-   [54] (829,21)
-  [3] (829,21)
- [1] (829,21)
-
+   [34] (431,12) :empty_line:text|\\n|
+   [34] (431,12)
+   [35] (431,12) @printindex
+    [36] (452,15) :frenchspacing
+     [37] (452,15) :text|after index|
+     [37] (457,15)
+    [36] (457,15)
+    [38] (493,15) :code
+     [39] (493,15) :text|Top|
+     [39] (493,15)
+    [38] (493,15)
+    [40] (525,16) :frenchspacing
+     [41] (525,16) :text|index entry|
+     [41] (530,16)
+    [40] (530,16)
+    [42] (566,16) :code
+     [43] (566,16) :text|Top|
+     [43] (566,16)
+    [42] (566,16)
+    [44] (598,17) :frenchspacing
+     [45] (598,17) :text|index entry|
+     [45] (603,17)
+    [44] (603,17)
+    [46] (639,17) :code
+     [47] (639,17) :text|Top|
+     [47] (639,17)
+    [46] (639,17)
+    [48] (671,18) :frenchspacing
+     [49] (671,18) 
:text|looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong index 
entry|
+     [49] (739,18)
+    [48] (739,18)
+    [50] (749,18) :code
+     [51] (749,18) :text|Top|
+     [51] (749,18)
+    [50] (749,18)
+   [35] (828,21)
+   [52] (828,21) :empty_line:text|\\n|
+   [52] (828,21)
+   [53] (828,21) @anchor
+   [53] (828,21)
+ locations  (6) l 21 b 828
+   [54] (828,21) :empty_spaces_after_close_brace:text|\\n|
+   [54] (828,21)
+  [3] (828,21)
+ [1] (828,21)
 
 File: ,  Node: Top,  Up: (dir)
 

Index: t/results/xtable/definfoenclose_on_table_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/xtable/definfoenclose_on_table_line.pl    6 Mar 2011 14:44:10 
-0000       1.4
+++ t/results/xtable/definfoenclose_on_table_line.pl    20 Mar 2011 13:00:50 
-0000      1.5
@@ -288,8 +288,7 @@
 
 
 
-$result_converted{'plaintext'}->{'definfoenclose_on_table_line'} = '
-:item:
+$result_converted{'plaintext'}->{'definfoenclose_on_table_line'} = ':item:
 :item x:
 
      table content.

Index: t/results/xtable/empty_item_itemx.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/empty_item_itemx.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/xtable/empty_item_itemx.pl        6 Mar 2011 14:44:10 -0000       
1.6
+++ t/results/xtable/empty_item_itemx.pl        20 Mar 2011 13:00:50 -0000      
1.7
@@ -404,8 +404,7 @@
 
 
 
-$result_converted{'plaintext'}->{'empty_item_itemx'} = '
-     VTable
+$result_converted{'plaintext'}->{'empty_item_itemx'} = '     VTable
 
 first item
 after an empty itemx, before an empty item

Index: t/results/xtable/table_nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/table_nested.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/xtable/table_nested.pl    16 Mar 2011 01:16:44 -0000      1.1
+++ t/results/xtable/table_nested.pl    20 Mar 2011 13:00:50 -0000      1.2
@@ -2522,8 +2522,7 @@
 
 
 
-$result_converted{'plaintext'}->{'table_nested'} = '
-Quotation
+$result_converted{'plaintext'}->{'table_nested'} = 'Quotation
      first item
      second itemx
 

Index: t/results/menu/simple_no_menu.pl
===================================================================
RCS file: t/results/menu/simple_no_menu.pl
diff -N t/results/menu/simple_no_menu.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/menu/simple_no_menu.pl    20 Mar 2011 13:00:41 -0000      1.1
@@ -0,0 +1,565 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors);
+
+use utf8;
+
+$result_trees{'simple_no_menu'} = {
+  'contents' => [
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'Before menu.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'menu',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'contents' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'comment
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'preformatted'
+            }
+          ],
+          'parent' => {},
+          'type' => 'menu_comment'
+        },
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => '* ',
+              'type' => 'menu_entry_leading_text'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'menu entry name '
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_name'
+            },
+            {
+              'parent' => {},
+              'text' => ': ',
+              'type' => 'menu_entry_separator'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'node'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_node'
+            },
+            {
+              'parent' => {},
+              'text' => '.    ',
+              'type' => 'menu_entry_separator'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'description
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_description'
+            }
+          ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'node'
+            }
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 6,
+            'macro' => ''
+          },
+          'parent' => {},
+          'type' => 'menu_entry'
+        },
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => '* ',
+              'type' => 'menu_entry_leading_text'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'node name'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_node'
+            },
+            {
+              'parent' => {},
+              'text' => '::                ',
+              'type' => 'menu_entry_separator'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'description new
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_description'
+            }
+          ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'node-name'
+            }
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 7,
+            'macro' => ''
+          },
+          'parent' => {},
+          'type' => 'menu_entry'
+        },
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => '* ',
+              'type' => 'menu_entry_leading_text'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'other entry'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_name'
+            },
+            {
+              'parent' => {},
+              'text' => ': ',
+              'type' => 'menu_entry_separator'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'node'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_node'
+            },
+            {
+              'parent' => {},
+              'text' => ',    ',
+              'type' => 'menu_entry_separator'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => '
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_description'
+            }
+          ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'node'
+            }
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 8,
+            'macro' => ''
+          },
+          'parent' => {},
+          'type' => 'menu_entry'
+        },
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => '* ',
+              'type' => 'menu_entry_leading_text'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'last'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_node'
+            },
+            {
+              'parent' => {},
+              'text' => '::',
+              'type' => 'menu_entry_separator'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => '
+'
+                },
+                {
+                  'parent' => {},
+                  'text' => '                 description next line
+'
+                },
+                {
+                  'parent' => {},
+                  'text' => '                 still description
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_description'
+            }
+          ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'last'
+            }
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 9,
+            'macro' => ''
+          },
+          'parent' => {},
+          'type' => 'menu_entry'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'after_description_line'
+        },
+        {
+          'contents' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'new comment
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'preformatted'
+            }
+          ],
+          'parent' => {},
+          'type' => 'menu_comment'
+        },
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => '* ',
+              'type' => 'menu_entry_leading_text'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'last node entry'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'space_at_end_menu_node'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_node'
+            },
+            {
+              'parent' => {},
+              'text' => '::',
+              'type' => 'menu_entry_separator'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => '
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_description'
+            }
+          ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {},
+                {}
+              ],
+              'normalized' => 'last-node-entry'
+            }
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 14,
+            'macro' => ''
+          },
+          'parent' => {},
+          'type' => 'menu_entry'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'menu'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'menu',
+            'text_arg' => 'menu'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 15,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'end_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 4,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'After menu.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'simple_no_menu'}{'contents'}[0]{'parent'} = 
$result_trees{'simple_no_menu'};
+$result_trees{'simple_no_menu'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[1]{'parent'} = 
$result_trees{'simple_no_menu'};
+$result_trees{'simple_no_menu'}{'contents'}[2]{'parent'} = 
$result_trees{'simple_no_menu'};
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[3]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[4]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[5];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[5]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'args'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'args'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'args'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'args'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'args'}[3]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'args'}[1]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[3]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[3]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[4]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[5];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[5]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'args'}[3]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[4]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[3]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[3]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'extra'}{'command'}
 = $result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'extra'}{'end_command'} = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'parent'} = 
$result_trees{'simple_no_menu'};
+$result_trees{'simple_no_menu'}{'contents'}[4]{'parent'} = 
$result_trees{'simple_no_menu'};
+$result_trees{'simple_no_menu'}{'contents'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[5];
+$result_trees{'simple_no_menu'}{'contents'}[5]{'parent'} = 
$result_trees{'simple_no_menu'};
+
+$result_texis{'simple_no_menu'} = '
+Before menu.
+
address@hidden
+comment
+* menu entry name : node.    description
+* node name::                description new
+* other entry: node,    
+* last::
+                 description next line
+                 still description
+
+new comment
+* last node entry ::
address@hidden menu
+
+After menu.
+';
+
+
+$result_texts{'simple_no_menu'} = '
+Before menu.
+
+comment
+* menu entry name : node.    description
+* node name::                description new
+* other entry: node,    
+* last::
+                 description next line
+                 still description
+
+new comment
+* last node entry ::
+
+After menu.
+';
+
+$result_errors{'simple_no_menu'} = [];
+
+
+
+$result_converted{'plaintext'}->{'simple_no_menu'} = 'Before menu.
+
+   After menu.
+';
+
+1;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]