texinfo/tp TODO Texinfo/Convert/Plaintext.pm Te...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/11/03 23:40:40

Modified files:
        tp             : TODO 
        tp/Texinfo/Convert: Plaintext.pm Text.pm 
        tp/t           : html_tests.t 
        tp/t/results/html_tests: simple_menu.pl 
        tp/t/results/menu: menu_entry_name_comment.pl 
                           menu_entry_node_comments.pl 
                           menu_no_closed_in_description.pl 
                           menu_no_closed_in_entry.pl 

Log message:
        In Texinfo::Convert::Text, @c in menu lines at the end of description
        is replaced by \n.
        
        Handle correctly simple menu in Texinfo::Convert::Text and 
        Texinfo::Convert::Plaintext.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.208&r2=1.209
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.183&r2=1.184
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/html_tests.t?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/simple_menu.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_name_comment.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_node_comments.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_no_closed_in_description.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_no_closed_in_entry.pl?cvsroot=texinfo&r1=1.15&r2=1.16

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -b -r1.208 -r1.209
--- TODO        3 Nov 2011 20:29:13 -0000       1.208
+++ TODO        3 Nov 2011 23:40:35 -0000       1.209
@@ -15,10 +15,6 @@
 Bugs
 ====
 
-Texinfo::Convert::Text
address@hidden in menu lines (and maybe at other places) should be replaced by 
-\n and not eat the end of line.
-
 sectioning/next_in_menu_is_below there should certainly be a warning for
 the subsection that is both below and next the section, because it is 
 next in menu.

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -b -r1.183 -r1.184
--- Texinfo/Convert/Plaintext.pm        2 Nov 2011 00:44:06 -0000       1.183
+++ Texinfo/Convert/Plaintext.pm        3 Nov 2011 23:40:37 -0000       1.184
@@ -2199,7 +2199,9 @@
           $result .= $self->_convert($arg);
         }
       }
-      $result = $self->ensure_end_of_line($result);
+      $result = $self->ensure_end_of_line($result) 
+        unless ($root->{'parent'}->{'type'} 
+                and $root->{'parent'}->{'type'} eq 'preformatted');
     } elsif ($root->{'type'} eq 'frenchspacing') {
       push @{$formatter->{'frenchspacing_stack'}}, 'on';
       $formatter->{'container'}->set_space_protection(undef,

Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- Texinfo/Convert/Text.pm     2 Nov 2011 23:08:17 -0000       1.77
+++ Texinfo/Convert/Text.pm     3 Nov 2011 23:40:37 -0000       1.78
@@ -500,6 +500,11 @@
         $result .= _convert($arg, $options);
       }
     }
+    if (!$root->{'parent'}->{'type'} 
+        or $root->{'parent'}->{'type'} ne 'preformatted') {
+      chomp($result);
+      $result .= "\n";
+    }
   }
   if ($root->{'contents'}) {
     if ($root->{'cmdname'} 

Index: t/html_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/html_tests.t,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/html_tests.t      2 Nov 2011 19:13:57 -0000       1.12
+++ t/html_tests.t      3 Nov 2011 23:40:38 -0000       1.13
@@ -125,7 +125,7 @@
 
 @end detailmenu
 @end menu
-' ,{'SIMPLE_MENU' => 1}
+' ,{'SIMPLE_MENU' => 1, 'test_formats' => ['info']}
 ],
 ['character_number_leading_toc_stoc',
 '@top top
@@ -181,10 +181,10 @@
 );
 
 foreach my $test (@test_cases) {
-  $test->[2]->{'test_formats'} = ['html'];
+  push @{$test->[2]->{'test_formats'}}, 'html';
 }
 foreach my $test (@test_cases_text) {
-  $test->[2]->{'test_formats'} = ['html_text'];
+  push @{$test->[2]->{'test_formats'}}, 'html_text';
 }
 
 our ($arg_test_case, $arg_generate, $arg_debug);

Index: t/results/html_tests/simple_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/html_tests/simple_menu.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/html_tests/simple_menu.pl 1 Nov 2011 12:01:39 -0000       1.5
+++ t/results/html_tests/simple_menu.pl 3 Nov 2011 23:40:39 -0000       1.6
@@ -1819,6 +1819,66 @@
 
 
 
+$result_converted{'info'}->{'simple_menu'} = 'This is , produced by tp version 
from .
+
+* Menu:
+
+* (ggg):: description
+   * idescr
+AAA
+
+CCC
+
+   * iaa
+
+BBB
+
+   * ibb
+* (manual)::
+
+comment
+
+* (after_comment):: description
+in description
+* (after_description)::
+
+* (detailggg):: detaildescription
+   * idetaildescr
+detailAAA
+
+detailCCC
+
+   * detailiaa
+
+detailBBB
+
+   * detailibb
+* (detailmanual)::
+
+detailcomment
+
+* (detailafter_comment):: detaildescription
+in detaildescription
+* (detailafter_description)::
+
+
+
+Tag Table:
+
+End Tag Table
+';
+
+$result_converted_errors{'info'}->{'simple_menu'} = [
+  {
+    'error_line' => 'warning: Document without nodes.
+',
+    'text' => 'Document without nodes.',
+    'type' => 'warning'
+  }
+];
+
+
+
 $result_converted{'html'}->{'simple_menu'} = '<!DOCTYPE html PUBLIC 
"-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->

Index: t/results/menu/menu_entry_name_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_entry_name_comment.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/menu/menu_entry_name_comment.pl   1 Nov 2011 12:01:42 -0000       
1.29
+++ t/results/menu/menu_entry_name_comment.pl   3 Nov 2011 23:40:40 -0000       
1.30
@@ -621,7 +621,12 @@
 ';
 
 
-$result_texts{'menu_entry_name_comment'} = '* a: (f)b* a: (f)b * a: (f)b1c.c,* 
a: (f)b2c.c,     * a: (f)b3c.c,    d';
+$result_texts{'menu_entry_name_comment'} = '* a: (f)b
+* a: (f)b 
+* a: (f)b1c.c,
+* a: (f)b2c.c,     
+* a: (f)b3c.c,    d
+';
 
 $result_errors{'menu_entry_name_comment'} = [
   {

Index: t/results/menu/menu_entry_node_comments.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_entry_node_comments.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/menu/menu_entry_node_comments.pl  1 Nov 2011 12:01:42 -0000       
1.29
+++ t/results/menu/menu_entry_node_comments.pl  3 Nov 2011 23:40:40 -0000       
1.30
@@ -447,7 +447,11 @@
 ';
 
 
-$result_texts{'menu_entry_node_comments'} = '* (f)a1c::* (f)a2c::  * (f)a3c::  
       d* (f) a4 ::   ';
+$result_texts{'menu_entry_node_comments'} = '* (f)a1c::
+* (f)a2c::  
+* (f)a3c::         d
+* (f) a4 ::   
+';
 
 $result_errors{'menu_entry_node_comments'} = [
   {

Index: t/results/menu/menu_no_closed_in_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_description.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/menu/menu_no_closed_in_description.pl     14 Aug 2011 17:31:50 
-0000      1.19
+++ t/results/menu/menu_no_closed_in_description.pl     3 Nov 2011 23:40:40 
-0000       1.20
@@ -107,7 +107,8 @@
 ';
 
 
-$result_texts{'menu_no_closed_in_description'} = '* (manual_in_menu):: desc';
+$result_texts{'menu_no_closed_in_description'} = '* (manual_in_menu):: desc
+';
 
 $result_errors{'menu_no_closed_in_description'} = [
   {

Index: t/results/menu/menu_no_closed_in_entry.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_entry.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/menu/menu_no_closed_in_entry.pl   3 Jul 2011 14:50:59 -0000       
1.15
+++ t/results/menu/menu_no_closed_in_entry.pl   3 Nov 2011 23:40:40 -0000       
1.16
@@ -70,7 +70,8 @@
 ';
 
 
-$result_texts{'menu_no_closed_in_entry'} = '* a1:';
+$result_texts{'menu_no_closed_in_entry'} = '* a1:
+';
 
 $result_errors{'menu_no_closed_in_entry'} = [
   {