texinfo/tp MANIFEST texi2any.pl Texinfo/Common....

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        13/01/28 21:53:24

Modified files:
        tp             : MANIFEST texi2any.pl 
        tp/Texinfo     : Common.pm 
        tp/Texinfo/Convert: Plaintext.pm 
Added files:
        tp/t           : indent_menu_descriptions.t 
Removed files:
        tp/t           : indent_menus_descriptions.t 

Log message:
        rename indent_menus_descriptions as indent_menu_descriptions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/MANIFEST?cvsroot=texinfo&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.167&r2=1.168
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.176&r2=1.177
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.234&r2=1.235
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/indent_menu_descriptions.t?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/indent_menus_descriptions.t?cvsroot=texinfo&r1=1.1&r2=0

Patches:
Index: MANIFEST
===================================================================
RCS file: /sources/texinfo/texinfo/tp/MANIFEST,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- MANIFEST    28 Jan 2013 18:36:51 -0000      1.55
+++ MANIFEST    28 Jan 2013 21:53:23 -0000      1.56
@@ -201,7 +201,7 @@
 t/include_reference/incl-incl.txi
 t/include_reference/macro_included.texi
 t/include_reference/section_file.texi
-t/indent_menus_descriptions.t
+t/indent_menu_descriptions.t
 t/index_before_item.t
 t/info_tests.t
 t/init/cvs.init

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -b -r1.167 -r1.168
--- texi2any.pl 27 Jan 2013 17:12:41 -0000      1.167
+++ texi2any.pl 28 Jan 2013 21:53:23 -0000      1.168
@@ -1217,8 +1217,8 @@
   if ($tree_transformations{'complete_tree_nodes_menus'}) {
     Texinfo::Structuring::complete_tree_nodes_menus($parser, $tree);
   }
-  if ($tree_transformations{'indent_menus_descriptions'}) {
-    Texinfo::Convert::Plaintext::indent_menus_descriptions(undef, $parser);
+  if ($tree_transformations{'indent_menu_descriptions'}) {
+    Texinfo::Convert::Plaintext::indent_menu_descriptions(undef, $parser);
   }
 
   if ($tree_transformations{'regenerate_master_menu'}) {

Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- Texinfo/Common.pm   26 Jan 2013 23:14:03 -0000      1.176
+++ Texinfo/Common.pm   28 Jan 2013 21:53:23 -0000      1.177
@@ -335,7 +335,7 @@
     'fill_gaps_in_sectioning', 'move_index_entries_after_items',
     'insert_nodes_for_sectioning_commands',
     'complete_tree_nodes_menus', 'regenerate_master_menu',
-    'indent_menus_descriptions') {
+    'indent_menu_descriptions') {
   $valid_tree_transformations{$valid_transformation} = 1;
 }
 

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -b -r1.234 -r1.235
--- Texinfo/Convert/Plaintext.pm        24 Jan 2013 01:41:00 -0000      1.234
+++ Texinfo/Convert/Plaintext.pm        28 Jan 2013 21:53:23 -0000      1.235
@@ -1198,7 +1198,7 @@
   my $root = shift;
   my $basefile = shift;
 
-  my $txt_file = $self->Texinfo::Common::locate_include_file 
($basefile.'.txt');
+  my $txt_file = $self->Texinfo::Common::locate_include_file($basefile.'.txt');
   if (!defined($txt_file)) {
     return undef;
   } else {
@@ -2933,7 +2933,7 @@
   }
 }
 
-sub indent_menus_descriptions($;$)
+sub indent_menu_descriptions($;$)
 {
   my $self = shift;
   my $parser = shift;

Index: t/indent_menu_descriptions.t
===================================================================
RCS file: t/indent_menu_descriptions.t
diff -N t/indent_menu_descriptions.t
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/indent_menu_descriptions.t        28 Jan 2013 21:53:23 -0000      1.1
@@ -0,0 +1,48 @@
+use strict;
+
+use Test::More;
+BEGIN { plan tests => 2 };
+
+use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
+use lib 'maintain/lib/libintl-perl/lib/';
+use lib 'maintain/lib/Text-Unidecode/lib/';
+use Texinfo::Parser qw(parse_texi_text);
+use Texinfo::Convert::Plaintext;
+use Texinfo::Convert::Texinfo;
+
+ok(1);
+
+my $in = '
address@hidden
+Comment
+
+* a: (!unknown_m)b.   d
+* (!unknown_m)c  ::     d1
+* (!unknown_m)f ::
+* (!unknown_m)g ::    
+* label:   (!unknown_m)h  .
+* (!unknown_m)iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii::    d
address@hidden menu
+';
+
+my $reference = '
address@hidden
+Comment
+
+* a: (!unknown_m)b.             d
+* (!unknown_m)c  ::             d1
+* (!unknown_m)f ::              
+* (!unknown_m)g ::              
+* label:   (!unknown_m)h  .     
+* (!unknown_m)iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii:: d
address@hidden menu
+';
+
+my $parser = Texinfo::Parser::parser();
+my $tree = $parser->parse_texi_text($in);
+Texinfo::Convert::Plaintext::indent_menu_descriptions(undef, $parser);
+my $out = Texinfo::Convert::Texinfo::convert($tree);
+
+is ($out, $reference, 'indent menu descriptions test');
+
+#print STDERR "$out\n";

Index: t/indent_menus_descriptions.t
===================================================================
RCS file: t/indent_menus_descriptions.t
diff -N t/indent_menus_descriptions.t
--- t/indent_menus_descriptions.t       24 Jan 2013 01:41:00 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-use strict;
-
-use Test::More;
-BEGIN { plan tests => 2 };
-
-use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
-use lib 'maintain/lib/libintl-perl/lib/';
-use lib 'maintain/lib/Text-Unidecode/lib/';
-use Texinfo::Parser qw(parse_texi_text);
-use Texinfo::Convert::Plaintext;
-use Texinfo::Convert::Texinfo;
-
-ok(1);
-
-my $in = '
address@hidden
-Comment
-
-* a: (!unknown_m)b.   d
-* (!unknown_m)c  ::     d1
-* (!unknown_m)f ::
-* (!unknown_m)g ::    
-* label:   (!unknown_m)h  .
-* (!unknown_m)iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii::    d
address@hidden menu
-';
-
-my $reference = '
address@hidden
-Comment
-
-* a: (!unknown_m)b.             d
-* (!unknown_m)c  ::             d1
-* (!unknown_m)f ::              
-* (!unknown_m)g ::              
-* label:   (!unknown_m)h  .     
-* (!unknown_m)iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii:: d
address@hidden menu
-';
-
-my $parser = Texinfo::Parser::parser();
-my $tree = $parser->parse_texi_text($in);
-Texinfo::Convert::Plaintext::indent_menus_descriptions(undef, $parser);
-my $out = Texinfo::Convert::Texinfo::convert($tree);
-
-is ($out, $reference, 'indent menu descriptions test');
-
-#print STDERR "$out\n";