texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Li...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/11/22 23:27:49

Modified files:
        tp/Texinfo     : Parser.pm 
        tp/Texinfo/Convert: Line.pm Plaintext.pm 
        tp/t/results/coverage: item_container.pl 
        tp/t/results/invalid_nestings: 
                                       itemx_in_itemize_enumerate_in_table.pl 
        tp/t/results/itemize: headitem_itemx_in_itemize.pl 
                              not_closed_item.pl not_closed_itemize.pl 

Log message:
        Handle @itemize and @enumerate @item's.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Line.pm?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/headitem_itemx_in_itemize.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/not_closed_item.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/not_closed_itemize.pl?cvsroot=texinfo&r1=1.7&r2=1.8

Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- Texinfo/Parser.pm   22 Nov 2010 18:58:37 -0000      1.154
+++ Texinfo/Parser.pm   22 Nov 2010 23:27:49 -0000      1.155
@@ -1773,6 +1773,13 @@
           }
         }
         $current->{'extra'}->{'enumerate_specification'} = $spec;
+      } elsif ($current->{'cmdname'} eq 'itemize' 
+               and !$current->{'extra'}->{'block_command_line_contents'}) {
+        $current->{'extra'}->{'block_command_line_contents'} = [
+          { 'cmdname' => 'bullet', 
+            'type' => 'command_as_argument',
+            'parent' => $current }
+        ];
       }
       push @{$current->{'contents'}}, { 'type' => 'before_item',
          'contents' => [], 'parent', $current };

Index: Texinfo/Convert/Line.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Line.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Texinfo/Convert/Line.pm     21 Nov 2010 18:33:40 -0000      1.7
+++ Texinfo/Convert/Line.pm     22 Nov 2010 23:27:49 -0000      1.8
@@ -57,7 +57,7 @@
   $word = $self->{'word'} if (defined($self->{'word'}));
   my $end_sentence = 'UNDEF';
   $end_sentence = $self->{'end_sentence'} if 
(defined($self->{'end_sentence'}));
-  print STDERR "line ($self->{'line_beginning'}) word: $word, space 
`$self->{'space'}' end_sentence: $self->{'end_sentence'}\n"; 
+  print STDERR "line ($self->{'line_beginning'},$self->{'counter'}) word: 
$word, space `$self->{'space'}' end_sentence: $self->{'end_sentence'}\n"; 
 }
 
 # end a line.

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Texinfo/Convert/Plaintext.pm        22 Nov 2010 18:58:37 -0000      1.16
+++ Texinfo/Convert/Plaintext.pm        22 Nov 2010 23:27:49 -0000      1.17
@@ -762,7 +762,28 @@
         $result .= "\n";
       } elsif ($root->{'cmdname'} eq 'item' and $root->{'parent'}->{'cmdname'}
                and $item_container_commands{$root->{'parent'}->{'cmdname'}}) {
-        # TODO
+        my $line = $self->new_formatter('line', 
+            {'indent_length' => 
+                ($self->{'format_context'}->[-1]->{'indent_level'} -1)
+                  * $indent_length
+                   + 
$item_indent_format_length{$root->{'parent'}->{'cmdname'}}});
+        push @{$self->{'formatters'}}, $line;
+        if ($root->{'parent'}->{'cmdname'} eq 'enumerate') {
+          $result .= 
$line->{'container'}->add_text(Texinfo::Convert::Text::enumerate_item_representation(
+            $root->{'parent'}->{'extra'}->{'enumerate_specification'},
+            $root->{'extra'}->{'item_number'}) . '. ');
+        } else {
+          $result .= $self->convert(
+            {'contents' => 
+               
address@hidden>{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]},
+                { 'text' => ' ' }]
+            });
+        }
+        $line->{'container'}->end();
+        pop @{$self->{'formatters'}};
+        $self->{'format_context'}->[-1]->{'counter'} += 
+           Texinfo::Convert::Unicode::string_width($result);
+        # FIXME open a format_context?
       } elsif ($root->{'cmdname'} eq 'headitem' or $root->{'cmdname'} eq 'item'
                or $root->{'cmdname'} eq 'tab') {
       #} elsif ($root->{'cmdname'} eq 'tab') {

Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/coverage/item_container.pl        22 Nov 2010 18:58:37 -0000      
1.23
+++ t/results/coverage/item_container.pl        22 Nov 2010 23:27:49 -0000      
1.24
@@ -222,9 +222,9 @@
 
 
 $result_converted{'plaintext'}->{'item_container'} = '
-     i-tem +
+   + i-tem +
 
-     b-ullet
+   * b-ullet
 ';
 
 1;

Index: t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl   22 Nov 
2010 18:58:37 -0000      1.12
+++ t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl   22 Nov 
2010 23:27:49 -0000      1.13
@@ -117,6 +117,15 @@
               'type' => 'before_item'
             }
           ],
+          'extra' => {
+            'block_command_line_contents' => [
+              {
+                'cmdname' => 'bullet',
+                'parent' => {},
+                'type' => 'command_as_argument'
+              }
+            ]
+          },
           'parent' => {}
         },
         {
@@ -219,6 +228,7 @@
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[4];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[4]{'extra'}{'block_command_line_contents'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0];

Index: t/results/itemize/headitem_itemx_in_itemize.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/itemize/headitem_itemx_in_itemize.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/itemize/headitem_itemx_in_itemize.pl      21 Nov 2010 22:41:27 
-0000      1.8
+++ t/results/itemize/headitem_itemx_in_itemize.pl      22 Nov 2010 23:27:49 
-0000      1.9
@@ -76,6 +76,15 @@
           'parent' => {}
         }
       ],
+      'extra' => {
+        'block_command_line_contents' => [
+          {
+            'cmdname' => 'bullet',
+            'parent' => {},
+            'type' => 'command_as_argument'
+          }
+        ]
+      },
       'parent' => {}
     },
     {
@@ -99,6 +108,7 @@
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0]{'parent'}
 = $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
 $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'parent'} = 
$result_trees{'headitem_itemx_in_itemize'};
 $result_trees{'headitem_itemx_in_itemize'}{'contents'}[1]{'parent'} = 
$result_trees{'headitem_itemx_in_itemize'};
 

Index: t/results/itemize/not_closed_item.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/not_closed_item.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/itemize/not_closed_item.pl        21 Nov 2010 22:41:27 -0000      
1.8
+++ t/results/itemize/not_closed_item.pl        22 Nov 2010 23:27:49 -0000      
1.9
@@ -44,6 +44,15 @@
           'parent' => {}
         }
       ],
+      'extra' => {
+        'block_command_line_contents' => [
+          {
+            'cmdname' => 'bullet',
+            'parent' => {},
+            'type' => 'command_as_argument'
+          }
+        ]
+      },
       'parent' => {}
     }
   ],
@@ -55,6 +64,7 @@
 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[2];
 $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'not_closed_item'}{'contents'}[0];
+$result_trees{'not_closed_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0]{'parent'}
 = $result_trees{'not_closed_item'}{'contents'}[0];
 $result_trees{'not_closed_item'}{'contents'}[0]{'parent'} = 
$result_trees{'not_closed_item'};
 
 $result_texis{'not_closed_item'} = '@itemize

Index: t/results/itemize/not_closed_itemize.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/not_closed_itemize.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/itemize/not_closed_itemize.pl     20 Nov 2010 16:58:07 -0000      
1.7
+++ t/results/itemize/not_closed_itemize.pl     22 Nov 2010 23:27:49 -0000      
1.8
@@ -19,6 +19,15 @@
           'type' => 'before_item'
         }
       ],
+      'extra' => {
+        'block_command_line_contents' => [
+          {
+            'cmdname' => 'bullet',
+            'parent' => {},
+            'type' => 'command_as_argument'
+          }
+        ]
+      },
       'parent' => {}
     }
   ],
@@ -26,6 +35,7 @@
 };
 $result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'not_closed_itemize'}{'contents'}[0];
 $result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'not_closed_itemize'}{'contents'}[0];
+$result_trees{'not_closed_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0]{'parent'}
 = $result_trees{'not_closed_itemize'}{'contents'}[0];
 $result_trees{'not_closed_itemize'}{'contents'}[0]{'parent'} = 
$result_trees{'not_closed_itemize'};
 
 $result_texis{'not_closed_itemize'} = '@itemize