texinfo/tp Texinfo/Convert/Paragraph.pm Texinfo...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/03/06 10:58:54

Modified files:
        tp/Texinfo/Convert: Paragraph.pm Plaintext.pm 
        tp/t           : 19def.t 
        tp/t/results/def: end_of_lines_protected_in_footnote.pl 
Added files:
        tp/t/results/def: end_of_line_end_file.pl 

Log message:
        Reset line width counter after a def line.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Paragraph.pm?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/19def.t?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_lines_protected_in_footnote.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_line_end_file.pl?cvsroot=texinfo&rev=1.1

Patches:
Index: Texinfo/Convert/Paragraph.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Paragraph.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- Texinfo/Convert/Paragraph.pm        17 Feb 2011 20:07:34 -0000      1.19
+++ Texinfo/Convert/Paragraph.pm        6 Mar 2011 10:58:54 -0000       1.20
@@ -244,7 +244,7 @@
     and $paragraph->{'end_sentence'} and $paragraph->{'counter'} != 0 
     and $paragraph->{'space'} and !defined($paragraph->{'word'})) {
     $paragraph->{'space'} = '  ';
-    print STDERR "SWITCH.L frenchspacing end sentence space\n" 
+    print STDERR "SWITCH frenchspacing end sentence space\n" 
        if ($paragraph->{'DEBUG'});
     delete $paragraph->{'end_sentence'};
   }
@@ -272,7 +272,7 @@
     if ($paragraph->{'DEBUG'}) {
       my $word = 'UNDEF';
       $word = $paragraph->{'word'} if (defined($paragraph->{'word'}));
-      print STDERR "($paragraph->{'counter'}+$paragraph->{'word_counter'}) s 
`$paragraph->{'space'}', w `$word'\n";
+      print STDERR "p ($paragraph->{'counter'}+$paragraph->{'word_counter'}) s 
`$paragraph->{'space'}', w `$word'\n";
     }
     if ($text =~ s/^(\s+)//) {
       my $spaces = $1;

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- Texinfo/Convert/Plaintext.pm        4 Mar 2011 19:26:41 -0000       1.110
+++ Texinfo/Convert/Plaintext.pm        6 Mar 2011 10:58:54 -0000       1.111
@@ -2172,6 +2172,7 @@
                                       $def_paragraph->{'container'}->end());
 
         pop @{$self->{'formatters'}};
+        delete $self->{'text_element_context'}->[-1]->{'counter'};
         $self->{'empty_lines_count'} = 0;
         print STDERR "     --> $result" if ($self->{'DEBUG'});
       }

Index: t/19def.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/19def.t,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/19def.t   17 Feb 2011 07:24:17 -0000      1.13
+++ t/19def.t   6 Mar 2011 10:58:54 -0000       1.14
@@ -355,6 +355,9 @@
 ['end_of_line_protect_at_end',
 '
 @deffn category2 deffn_name2 arguments2 @'],
+['end_of_line_end_file',
+'@deffn category deffn_name arguments @
+'],
 # the command with type is compared with the corresponding command without type
 ['empty_deftype',
 '@deftypefun {} f (const type& x)

Index: t/results/def/end_of_lines_protected_in_footnote.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/end_of_lines_protected_in_footnote.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/def/end_of_lines_protected_in_footnote.pl 5 Mar 2011 23:59:53 
-0000       1.21
+++ t/results/def/end_of_lines_protected_in_footnote.pl 6 Mar 2011 10:58:54 
-0000       1.22
@@ -397,7 +397,7 @@
 
    (1)  -- category: deffn_name arguments arg2 more args with end of
           line within with 3 @ @ one last arg
-deffn
+     deffn
 
 ';
 

Index: t/results/def/end_of_line_end_file.pl
===================================================================
RCS file: t/results/def/end_of_line_end_file.pl
diff -N t/results/def/end_of_line_end_file.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/def/end_of_line_end_file.pl       6 Mar 2011 10:58:54 -0000       
1.1
@@ -0,0 +1,71 @@
+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);
+
+$result_trees{'end_of_line_end_file'} = {
+  'contents' => [
+    {
+      'cmdname' => 'deffn',
+      'contents' => [
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'category deffn_name arguments '
+                }
+              ],
+              'parent' => {},
+              'type' => 'block_line_arg'
+            }
+          ],
+          'extra' => {
+            'def_command' => 'deffn',
+            'original_def_cmdname' => 'deffn'
+          },
+          'parent' => {},
+          'type' => 'def_line'
+        }
+      ],
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 1,
+        'macro' => ''
+      },
+      'parent' => {}
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0];
+$result_trees{'end_of_line_end_file'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'end_of_line_end_file'}{'contents'}[0];
+$result_trees{'end_of_line_end_file'}{'contents'}[0]{'parent'} = 
$result_trees{'end_of_line_end_file'};
+
+$result_texis{'end_of_line_end_file'} = '@deffn category deffn_name arguments 
@end deffn
+';
+
+
+$result_texts{'end_of_line_end_file'} = 'category deffn_name arguments ';
+
+$result_errors{'end_of_line_end_file'} = [
+  {
+    'error_line' => ':1: No matching address@hidden deffn\'
+',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
+    'text' => 'No matching address@hidden deffn\'',
+    'type' => 'error'
+  }
+];
+
+
+1;