texinfo/tp Texinfo/Convert/NodeNameNormalizatio...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/11/06 12:34:59

Modified files:
        tp/Texinfo/Convert: NodeNameNormalization.pm Text.pm Unicode.pm 
        tp/t           : accents.t 

Log message:
        Rename subs, and give to unicode_accent the fallback formatting function
        in argument.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Unicode.pm?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/accents.t?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: Texinfo/Convert/NodeNameNormalization.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Texinfo/Convert/NodeNameNormalization.pm    1 Nov 2010 19:18:05 -0000       
1.3
+++ Texinfo/Convert/NodeNameNormalization.pm    6 Nov 2010 12:34:59 -0000       
1.4
@@ -175,7 +175,8 @@
     # commands with braces
     } elsif ($accent_commands{$root->{'cmdname'}}) {
       return '' if (!$root->{'args'});
-      return 
Texinfo::Convert::Unicode::unicode_accent(_convert($root->{'args'}->[0]), 
$root);
+      return 
Texinfo::Convert::Unicode::unicode_accent(_convert($root->{'args'}->[0]), 
+                         $root, \&Texinfo::Convert::Text::ascii_accent);
     } elsif ($root->{'cmdname'} eq 'image') {
       return _convert($root->{'args'}->[0]);
     } elsif ($root->{'cmdname'} eq 'email') {

Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Texinfo/Convert/Text.pm     6 Nov 2010 12:26:38 -0000       1.14
+++ Texinfo/Convert/Text.pm     6 Nov 2010 12:34:59 -0000       1.15
@@ -630,7 +630,7 @@
   return ($eight_bit, $codepoint);
 }
 
-sub eight_bit_accents($$$)
+sub eight_bit_accent($$$)
 {
   my $current = shift;
   my $encoding = shift;
@@ -653,7 +653,8 @@
 
   while (1) {
     $current_result 
-      = Texinfo::Convert::Unicode::unicode_accent($current_result, $accent);
+      = Texinfo::Convert::Unicode::unicode_accent($current_result, $accent,
+                                                    $convert_accent);
     push @results_stack, [$current_result, $accent];
     last if ($accent eq $current);
     $accent = $accent->{'parent'}->{'parent'};
@@ -729,7 +730,7 @@
   return $result;
 }
 
-sub ascii_accents($$)
+sub ascii_accent($$)
 {
   my $text = shift;
   my $command = shift;
@@ -803,13 +804,13 @@
       return '' if (!$root->{'args'});
       if ($options->{'enable_encoding'} and $options->{'enable_encoding'} eq 
'utf-8') {
         return 
Texinfo::Convert::Unicode::unicode_accent(convert($root->{'args'}->[0], 
$options), 
-                                                         $root->{'cmdname'});
+                                            $root->{'cmdname'}, 
\&ascii_accent);
       } elsif ($options->{'enable_encoding'} 
          and 
$Texinfo::Commands::eight_bit_encoding_aliases{$options->{'enable_encoding'}}) {
-        return eight_bit_accents($root, $options->{'enable_encoding'}, 
-              \&ascii_accents);
+        return eight_bit_accent($root, $options->{'enable_encoding'}, 
+              \&ascii_accent);
       } else {
-        return ascii_accents(convert($root->{'args'}->[0], $options), $root);
+        return ascii_accent(convert($root->{'args'}->[0], $options), $root);
       }
     } elsif ($root->{'cmdname'} eq 'image') {
       return convert($root->{'args'}->[0], $options);

Index: Texinfo/Convert/Unicode.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Unicode.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Texinfo/Convert/Unicode.pm  6 Nov 2010 12:26:38 -0000       1.3
+++ Texinfo/Convert/Unicode.pm  6 Nov 2010 12:34:59 -0000       1.4
@@ -530,10 +530,11 @@
   }
 }
 
-sub unicode_accent($$)
+sub unicode_accent($$$)
 {
   my $text = shift;
   my $command = shift;
+  my $fallback_convert_accent = shift;
 
   my $accent = $command->{'cmdname'};
 
@@ -553,7 +554,7 @@
 
   return Unicode::Normalize::NFC($text . 
chr(hex($unicode_diacritics{$accent})))
     if (defined($unicode_diacritics{$accent}));
-  return Texinfo::Convert::Text::ascii_accents($text, $command);
+  return &$fallback_convert_accent($text, $command);
 }
 
 1;

Index: t/accents.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/accents.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/accents.t 6 Nov 2010 12:26:38 -0000       1.1
+++ t/accents.t 6 Nov 2010 12:34:59 -0000       1.2
@@ -45,8 +45,8 @@
   my $parser = Texinfo::Parser::parser({'context' => 'preformatted'});
   my $tree = $parser->parse_texi_text($texi);
   my $result = 
-       Texinfo::Convert::Text::eight_bit_accents($tree->{'contents'}->[0], 
-    'iso-8859-1', \&Texinfo::Convert::Text::ascii_accents);
+       Texinfo::Convert::Text::eight_bit_accent($tree->{'contents'}->[0], 
+    'iso-8859-1', \&Texinfo::Convert::Text::ascii_accent);
   if (defined($reference)) {
     #ok (Encode::decode('iso-8859-1', $reference) eq $result, $name);
     #ok ($reference eq Encode::encode('iso-8859-1', $result), $name);