texinfo/tp TODO Texinfo/Parser.pm t/results/cov...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/01/29 11:24:22

Modified files:
        tp             : TODO 
        tp/Texinfo     : Parser.pm 
        tp/t/results/coverage: hyphenation.pl 

Log message:
        @hyphenation does not start a paragraph, and is a global multiple 
        command.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.180&r2=1.181
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/hyphenation.pl?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- TODO        28 Jan 2011 23:54:29 -0000      1.68
+++ TODO        29 Jan 2011 11:24:22 -0000      1.69
@@ -21,9 +21,6 @@
   -> replace acronym_like with the already formatted text and 
      explanation with convert(explanation).
 
-t/results/coverage/hyphenation.pl
-$result_converted{'plaintext'}->{'hyphenation'} should only be one line, not 2.
-
 Test end_line_count in Texinfo/Convert/ containers.
 
 Following should be an error:

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- Texinfo/Parser.pm   28 Jan 2011 23:54:30 -0000      1.180
+++ Texinfo/Parser.pm   29 Jan 2011 11:24:22 -0000      1.181
@@ -383,7 +383,7 @@
 foreach my $global_multiple_command ('author', 'documentlanguage', 
   'subtitle', 'contents', 'shortcontents', 'summarycontents',
   'kbdinputstyle', 'paragraphindent', 'firstparagraphindent',
-  'frenchspacing', 'footnotestyle') {
+  'frenchspacing', 'footnotestyle', 'hyphenation') {
   $global_multiple_commands{$global_multiple_command} = 1;
 }
 
@@ -434,7 +434,7 @@
 }
 
 foreach my $no_paragraph_command ('titlefont', 'caption', 'shortcaption', 
-          'image', '*') {
+          'image', '*', 'hyphenation') {
   $default_no_paragraph_commands{$no_paragraph_command} = 1;
 }
 
@@ -3474,6 +3474,8 @@
                   $parsed_anchor, $line_nr);
               }
             }
+            $self->_register_global_command($current->{'parent'}->{'cmdname'},
+                                            $current->{'parent'}, $line_nr);
             if 
($command_ignore_space_after{$current->{'parent'}->{'cmdname'}}) {
               push @{$current->{'parent'}->{'parent'}->{'contents'}}, 
                  {'type' => 'empty_spaces_after_close_brace',

Index: t/results/coverage/hyphenation.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/hyphenation.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/coverage/hyphenation.pl   28 Jan 2011 23:54:30 -0000      1.1
+++ t/results/coverage/hyphenation.pl   29 Jan 2011 11:24:22 -0000      1.2
@@ -11,8 +11,6 @@
       'type' => 'empty_line'
     },
     {
-      'contents' => [
-        {
           'args' => [
             {
               'contents' => [
@@ -33,10 +31,6 @@
           'text' => '
 ',
           'type' => 'empty_spaces_after_close_brace'
-        }
-      ],
-      'parent' => {},
-      'type' => 'paragraph'
     },
     {
       'parent' => {},
@@ -48,11 +42,10 @@
   'type' => 'text_root'
 };
 $result_trees{'hyphenation'}{'contents'}[0]{'parent'} = 
$result_trees{'hyphenation'};
-$result_trees{'hyphenation'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'hyphenation'}{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'hyphenation'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'hyphenation'}{'contents'}[1]{'contents'}[0];
-$result_trees{'hyphenation'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'hyphenation'}{'contents'}[1];
+$result_trees{'hyphenation'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'hyphenation'}{'contents'}[1]{'args'}[0];
+$result_trees{'hyphenation'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'hyphenation'}{'contents'}[1];
 $result_trees{'hyphenation'}{'contents'}[1]{'parent'} = 
$result_trees{'hyphenation'};
-$result_trees{'hyphenation'}{'contents'}[2]{'parent'} = 
$result_trees{'hyphenation'};
+$result_trees{'hyphenation'}{'contents'}[3]{'parent'} = 
$result_trees{'hyphenation'};
 
 $result_texis{'hyphenation'} = '
 @hyphenation{some-where }
@@ -69,7 +62,6 @@
 
 
 $result_converted{'plaintext'}->{'hyphenation'} = '
-
 ';
 
 1;