texinfo/tp Texinfo/Convert/Plaintext.pm t/18ite...

[Patrice Dumas]

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

Modified files:
        tp/Texinfo/Convert: Plaintext.pm 
        tp/t           : 18itemize.t 
        tp/t/results/itemize: accent_argument.pl enumerate_argument.pl 
                              enumerate_letters.pl w_argument.pl 

Log message:
        Fix enumerate @item handling.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/18itemize.t?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/accent_argument.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/enumerate_argument.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/enumerate_letters.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/w_argument.pl?cvsroot=texinfo&r1=1.18&r2=1.19

Patches:
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- Texinfo/Convert/Plaintext.pm        22 Nov 2010 23:27:49 -0000      1.17
+++ Texinfo/Convert/Plaintext.pm        22 Nov 2010 23:52:42 -0000      1.18
@@ -434,7 +434,7 @@
   }
   if ($self->{'debug'}) {
     print STDERR "ROOT (@{$self->{'context'}}|@{$self->{'format_context'}})";
-    print STDERR " format_context: 
$self->{'format_context'}->[-1]->{'cmdname'}, 
$self->{'format_context'}->[-1]->{'paragraph_count'}, 
$self->{'format_context'}->[-1]->{'indent_level'}, 
$self->{'format_context'}->[-1]->{'max'}\n";
+    print STDERR " format_context: 
$self->{'format_context'}->[-1]->{'cmdname'}, 
$self->{'format_context'}->[-1]->{'paragraph_count'}, 
$self->{'format_context'}->[-1]->{'indent_level'}, 
$self->{'format_context'}->[-1]->{'counter'}, 
$self->{'format_context'}->[-1]->{'max'}\n";
     print STDERR " cmd: $root->{'cmdname'}," if ($root->{'cmdname'});
     print STDERR " type: $root->{'type'}" if ($root->{'type'});
     print STDERR "\n";
@@ -762,6 +762,7 @@
         $result .= "\n";
       } elsif ($root->{'cmdname'} eq 'item' and $root->{'parent'}->{'cmdname'}
                and $item_container_commands{$root->{'parent'}->{'cmdname'}}) {
+        $self->{'format_context'}->[-1]->{'paragraph_count'} = 0;
         my $line = $self->new_formatter('line', 
             {'indent_length' => 
                 ($self->{'format_context'}->[-1]->{'indent_level'} -1)
@@ -769,7 +770,7 @@
                    + 
$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(
+          $result .= 
$line->{'container'}->add_next(Texinfo::Convert::Text::enumerate_item_representation(
             $root->{'parent'}->{'extra'}->{'enumerate_specification'},
             $root->{'extra'}->{'item_number'}) . '. ');
         } else {
@@ -779,7 +780,9 @@
                 { 'text' => ' ' }]
             });
         }
-        $line->{'container'}->end();
+        $result .= $line->{'container'}->end();
+        print STDERR "  
$root->{'parent'}->{'cmdname'}($root->{'extra'}->{'item_number'}) -> 
|$result|\n" 
+           if ($self->{'debug'});
         pop @{$self->{'formatters'}};
         $self->{'format_context'}->[-1]->{'counter'} += 
            Texinfo::Convert::Unicode::string_width($result);
@@ -966,6 +969,7 @@
   if ($paragraph) {
     $result .= $paragraph->{'container'}->end();
     pop @{$self->{'formatters'}};
+    delete $self->{'format_context'}->[-1]->{'counter'};
   }
   if ($preformatted) {
     $result .= $preformatted->{'container'}->end();

Index: t/18itemize.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/18itemize.t,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/18itemize.t       22 Nov 2010 01:05:38 -0000      1.7
+++ t/18itemize.t       22 Nov 2010 23:52:42 -0000      1.8
@@ -285,7 +285,7 @@
 );
 
 foreach my $test (@test_cases) {
-#  $test->[2]->{'test_formats'} = ['plaintext'];
+  $test->[2]->{'test_formats'} = ['plaintext'];
 }
 
 our ($arg_test_case, $arg_generate, $arg_debug);

Index: t/results/itemize/accent_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/itemize/accent_argument.pl        22 Nov 2010 18:58:38 -0000      
1.19
+++ t/results/itemize/accent_argument.pl        22 Nov 2010 23:52:42 -0000      
1.20
@@ -212,4 +212,10 @@
 $result_errors{'accent_argument'} = [];
 
 
+
+$result_converted{'plaintext'}->{'accent_argument'} = '     item
+
+     item
+';
+
 1;

Index: t/results/itemize/enumerate_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/enumerate_argument.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/itemize/enumerate_argument.pl     21 Nov 2010 23:36:09 -0000      
1.1
+++ t/results/itemize/enumerate_argument.pl     22 Nov 2010 23:52:42 -0000      
1.2
@@ -228,4 +228,8 @@
 $result_errors{'enumerate_argument'} = [];
 
 
+
+$result_converted{'plaintext'}->{'enumerate_argument'} = '
+';
+
 1;

Index: t/results/itemize/enumerate_letters.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/enumerate_letters.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/itemize/enumerate_letters.pl      22 Nov 2010 01:05:38 -0000      
1.1
+++ t/results/itemize/enumerate_letters.pl      22 Nov 2010 23:52:42 -0000      
1.2
@@ -6460,4 +6460,213 @@
 $result_errors{'enumerate_letters'} = [];
 
 
+
+$result_converted{'plaintext'}->{'enumerate_letters'} = '  d. aaa
+  e. aaa
+  f. aaa
+  g. aaa
+  h. aaa
+  i. aaa
+  j. aaa
+  k. aaa
+  l. aaa
+  m. aaa
+  n. aaa
+  o. aaa
+  p. aaa
+  q. aaa
+  r. aaa
+  s. aaa
+  t. aaa
+  u. aaa
+  v. aaa
+  w. aaa
+  x. aaa
+  y. aaa
+  z. aaa
+  ba. aaa
+  bb. aaa
+  bc. aaa
+  bd. aaa
+  be. aaa
+  bf. aaa
+  bg. aaa
+  bh. aaa
+  bi. aaa
+  bj. aaa
+  bk. aaa
+  bl. aaa
+  bm. aaa
+  bn. aaa
+  bo. aaa
+  bp. aaa
+  bq. aaa
+  br. aaa
+  bs. aaa
+  bt. aaa
+  bu. aaa
+  bv. aaa
+  bw. aaa
+  bx. aaa
+  by. aaa
+  bz. aaa
+  ca. aaa
+  cb. aaa
+  cc. aaa
+  cd. aaa
+  ce. aaa
+  cf. aaa
+  cg. aaa
+  ch. aaa
+  ci. aaa
+  cj. aaa
+  ck. aaa
+  cl. aaa
+  cm. aaa
+  cn. aaa
+  co. aaa
+  cp. aaa
+  cq. aaa
+  cr. aaa
+  cs. aaa
+  ct. aaa
+  cu. aaa
+  cv. aaa
+  cw. aaa
+  cx. aaa
+  cy. aaa
+  cz. aaa
+  da. aaa
+  db. aaa
+  dc. aaa
+  dd. aaa
+  de. aaa
+  df. aaa
+  dg. aaa
+  dh. aaa
+  di. aaa
+  dj. aaa
+  dk. aaa
+  dl. aaa
+  dm. aaa
+  dn. aaa
+  do. aaa
+  dp. aaa
+  dq. aaa
+  dr. aaa
+  ds. aaa
+  dt. aaa
+  du. aaa
+  dv. aaa
+  dw. aaa
+  dx. aaa
+  dy. aaa
+  dz. aaa
+  ea. aaa
+  eb. aaa
+  ec. aaa
+  ed. aaa
+  ee. aaa
+  ef. aaa
+  eg. aaa
+  eh. aaa
+  ei. aaa
+  ej. aaa
+  ek. aaa
+  el. aaa
+  em. aaa
+  en. aaa
+  eo. aaa
+  ep. aaa
+  eq. aaa
+  er. aaa
+  es. aaa
+  et. aaa
+  eu. aaa
+  ev. aaa
+  ew. aaa
+  ex. aaa
+  ey. aaa
+  ez. aaa
+  fa. aaa
+  fb. aaa
+  fc. aaa
+  fd. aaa
+  fe. aaa
+  ff. aaa
+  fg. aaa
+  fh. aaa
+  fi. aaa
+  fj. aaa
+  fk. aaa
+  fl. aaa
+  fm. aaa
+  fn. aaa
+  fo. aaa
+  fp. aaa
+  fq. aaa
+  fr. aaa
+  fs. aaa
+  ft. aaa
+  fu. aaa
+  fv. aaa
+  fw. aaa
+  fx. aaa
+  fy. aaa
+  fz. aaa
+  ga. aaa
+  gb. aaa
+  gc. aaa
+  gd. aaa
+  ge. aaa
+  gf. aaa
+  gg. aaa
+  gh. aaa
+  gi. aaa
+  gj. aaa
+  gk. aaa
+  gl. aaa
+  gm. aaa
+  gn. aaa
+  go. aaa
+  gp. aaa
+  gq. aaa
+  gr. aaa
+  gs. aaa
+  gt. aaa
+  gu. aaa
+  gv. aaa
+  gw. aaa
+  gx. aaa
+  gy. aaa
+  gz. aaa
+  ha. aaa
+  hb. aaa
+  hc. aaa
+  hd. aaa
+  he. aaa
+  hf. aaa
+  hg. aaa
+  hh. aaa
+  hi. aaa
+  hj. aaa
+  hk. aaa
+  hl. aaa
+  hm. aaa
+  hn. aaa
+  ho. aaa
+  hp. aaa
+  hq. aaa
+  hr. aaa
+  hs. aaa
+  ht. aaa
+  hu. aaa
+  hv. aaa
+  hw. aaa
+  hx. aaa
+  hy. aaa
+  hz. aaa
+  ia. aaa
+';
+
 1;

Index: t/results/itemize/w_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/w_argument.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/itemize/w_argument.pl     21 Nov 2010 22:41:27 -0000      1.18
+++ t/results/itemize/w_argument.pl     22 Nov 2010 23:52:42 -0000      1.19
@@ -184,4 +184,9 @@
 $result_errors{'w_argument'} = [];
 
 
+
+$result_converted{'plaintext'}->{'w_argument'} = '     `--build=\' platform on 
which the program is compiled,
+     `--target=\' target platform on which the program is processed.
+';
+
 1;