texinfo/tp Texinfo/Common.pm t/results/itemize/...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/10/27 21:53:20

Modified files:
        tp/Texinfo     : Common.pm 
        tp/t/results/itemize: enumerate_argument_item.pl 
                              enumerate_letters.pl 

Log message:
        In enumerate item expansion, go to aa after z and not to ba.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/enumerate_argument_item.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/enumerate_letters.pl?cvsroot=texinfo&r1=1.10&r2=1.11

Patches:
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- Texinfo/Common.pm   27 Oct 2011 19:17:04 -0000      1.80
+++ Texinfo/Common.pm   27 Oct 2011 21:53:19 -0000      1.81
@@ -1046,24 +1046,17 @@
   return ($caption, $prepended);
 }
 
-# decompose a decimal number on a given base. The algorithm looks like
-# the division with growing powers (division suivant les puissances
-# croissantes) ?
+# decompose a decimal number on a given base.
 sub _decompose_integer($$)
 {
   my $number = shift;
   my $base = shift;
   my @result = ();
 
-  return (0) if ($number == 0);
-  my $power = 1;
-  my $remaining = $number;
-
-  while ($remaining) {
-    my $factor = $remaining % ($base ** $power);
-    $remaining -= $factor;
-    push (@result, $factor / ($base ** ($power - 1)));
-    $power++;
+  while ($number >= 0) {
+    my $factor = $number % $base;
+    push (@result, $factor);
+    $number = int(($number - $factor) / $base) - 1;
   }
   return @result;
 }
@@ -1082,8 +1075,6 @@
   $base_letter = ord('A') if (ucfirst($specification) eq $specification);
   my @letter_ords = _decompose_integer(ord($specification) - $base_letter + 
$number - 1, 26);
   foreach my $ord (@letter_ords) {
-    # FIXME we go directly to 'ba' after 'z', and not 'aa'
-    #because 'ba' is 1,0 and 'aa' is 0,0.
     $result = chr($base_letter + $ord) . $result;
   }
   return $result;

Index: t/results/itemize/enumerate_argument_item.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/itemize/enumerate_argument_item.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/itemize/enumerate_argument_item.pl        20 Aug 2011 22:26:59 
-0000      1.4
+++ t/results/itemize/enumerate_argument_item.pl        27 Oct 2011 21:53:20 
-0000      1.5
@@ -600,7 +600,7 @@
 B. upper case second
 
 z. lower case first
-ba. lower case second
+aa. lower case second
 ';
 
 $result_errors{'enumerate_argument_item'} = [];
@@ -614,7 +614,7 @@
   B. upper case second
 
   z. lower case first
-  ba. lower case second
+  aa. lower case second
 ';
 
 1;

Index: t/results/itemize/enumerate_letters.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/enumerate_letters.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/itemize/enumerate_letters.pl      20 Aug 2011 22:26:59 -0000      
1.10
+++ t/results/itemize/enumerate_letters.pl      27 Oct 2011 21:53:20 -0000      
1.11
@@ -8175,6 +8175,32 @@
 x. aaa
 y. aaa
 z. aaa
+aa. aaa
+ab. aaa
+ac. aaa
+ad. aaa
+ae. aaa
+af. aaa
+ag. aaa
+ah. aaa
+ai. aaa
+aj. aaa
+ak. aaa
+al. aaa
+am. aaa
+an. aaa
+ao. aaa
+ap. aaa
+aq. aaa
+ar. aaa
+as. aaa
+at. aaa
+au. aaa
+av. aaa
+aw. aaa
+ax. aaa
+ay. aaa
+az. aaa
 ba. aaa
 bb. aaa
 bc. aaa
@@ -8331,32 +8357,6 @@
 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
 ';
 
 $result_errors{'enumerate_letters'} = [];
@@ -8387,6 +8387,32 @@
   x. aaa
   y. aaa
   z. aaa
+  aa. aaa
+  ab. aaa
+  ac. aaa
+  ad. aaa
+  ae. aaa
+  af. aaa
+  ag. aaa
+  ah. aaa
+  ai. aaa
+  aj. aaa
+  ak. aaa
+  al. aaa
+  am. aaa
+  an. aaa
+  ao. aaa
+  ap. aaa
+  aq. aaa
+  ar. aaa
+  as. aaa
+  at. aaa
+  au. aaa
+  av. aaa
+  aw. aaa
+  ax. aaa
+  ay. aaa
+  az. aaa
   ba. aaa
   bb. aaa
   bc. aaa
@@ -8543,32 +8569,6 @@
   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
 ';
 
 1;