texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp TODO texi2any.pl Texinfo/Common.pm T...


From: Patrice Dumas
Subject: texinfo/tp TODO texi2any.pl Texinfo/Common.pm T...
Date: Thu, 03 Mar 2011 09:46:08 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/03/03 09:46:08

Modified files:
        tp             : TODO texi2any.pl 
        tp/Texinfo     : Common.pm Parser.pm Structuring.pm 
        tp/Texinfo/Convert: Info.pm Plaintext.pm 
        tp/t/results/include: macro_in_early_commands.pl 
        tp/t/results/info_tests: encoding_us_ascii.pl known_encoding.pl 
                                 only_documentencoding.pl 
        tp/t/results/misc_commands: invalid_documentencoding.pl 
                                    many_lines.pl 
        tp/t/results/sectioning: no_element.pl 
        tp/t/results/value: value_in_misc_commands.pl 

Log message:
        Systematically use 'perl_encodong' for the perl encoding name and 
        'encoding_name' for the canonical encoding name, instead of 'encoding'
        (or 'documentencoding') and also rename 'encoding_alias' as 
'encoding_name'.
        Add perl_encoding name in @documentencoding information.
        Pass the perl encoding and encoding canonical name in parser->{'info'}.
        Use this information instead of what documentencoding gives in the tree
        when outputting, since binmode() can only be called right after opening 
        the output file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.213&r2=1.214
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/macro_in_early_commands.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/known_encoding.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/only_documentencoding.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/invalid_documentencoding.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/many_lines.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/no_element.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_misc_commands.pl?cvsroot=texinfo&r1=1.40&r2=1.41

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- TODO        2 Mar 2011 01:04:14 -0000       1.104
+++ TODO        3 Mar 2011 09:46:06 -0000       1.105
@@ -1,3 +1,7 @@
+Fix encodings/at_commands_in_refs_utf8_use_nodes
address@hidden doesn't seems to work anymore, now that 
+Texinfo::Convert::Unicode::unicode_text is really used in _process_text.
+
 Handle
 @xrefautomaticsectiontitle on|off
 (does nothing in info, in HTML automatically set the section name as 3rd

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- texi2any.pl 27 Feb 2011 15:57:18 -0000      1.21
+++ texi2any.pl 3 Mar 2011 09:46:06 -0000       1.22
@@ -628,7 +628,7 @@
     #print STDERR "$texinfo_text\n";
     my $macro_expand_file = get_conf('MACRO_EXPAND');
     my $macro_expand_fh = Texinfo::Common::open_out({}, $macro_expand_file,
-                                               $parser->{'encoding'});
+                                               $parser->{'perl_encoding'});
     if (defined ($macro_expand_fh)) {
       print $macro_expand_fh $texinfo_text;
       close ($macro_expand_fh);

Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- Texinfo/Common.pm   26 Feb 2011 16:09:51 -0000      1.15
+++ Texinfo/Common.pm   3 Mar 2011 09:46:06 -0000       1.16
@@ -518,7 +518,7 @@
   if (defined($encoding)) {
     if ($encoding eq 'utf8' or $encoding eq 'utf-8-strict') {
       binmode($filehandle, ':utf8');
-    } else {
+    } else { # FIXME also right for shiftijs or similar encodings?
       binmode($filehandle, ':bytes');
     }
     binmode($filehandle, ":encoding($encoding)");
@@ -552,4 +552,25 @@
   return @messages;
 }
 
+our %canonical_texinfo_encodings;
+# These are the encodings from the texinfo manual
+foreach my $canonical_encoding('us-ascii', 'utf-8', 'iso-8859-1',
+  'iso-8859-15','iso-8859-2','koi8-r', 'koi8-u') {
+  $canonical_texinfo_encodings{$canonical_encoding} = 1;
+}
+
+sub encoding_alias ($)
+{
+  my $encoding = shift;
+  my $canonical_texinfo_encoding;
+  $canonical_texinfo_encoding 
+    = $encoding if ($canonical_texinfo_encodings{lc($encoding)});
+  my $perl_encoding = Encode::resolve_alias($encoding);
+  my $canonical_output_encoding;
+  if ($perl_encoding) {
+    $canonical_output_encoding = $encoding_aliases{$perl_encoding};
+  }
+  return ($canonical_texinfo_encoding, $perl_encoding, 
$canonical_output_encoding);
+}
+
 1;

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -b -r1.213 -r1.214
--- Texinfo/Parser.pm   2 Mar 2011 22:26:32 -0000       1.213
+++ Texinfo/Parser.pm   3 Mar 2011 09:46:06 -0000       1.214
@@ -95,15 +95,13 @@
 my $messages_textdomain = 'texinfo';
 
 # libintl converts between encodings but doesn't decode them into the
-# perl internal format.
+# perl internal format.  This is only caled if the encoding is a proper
+# perl encoding.
 sub encode_i18n_string($$)
 {
   my $string = shift;
   my $encoding = shift;
-  if (Encode::resolve_alias($encoding)) {
     return Encode::decode($encoding, $string);
-  }
-  return $string;
 }
 
 # handle translations of in-document strings.
@@ -114,7 +112,7 @@
   my $context = shift;
   my $conf = shift;
 
-  my $encoding = $self->{'encoding'};
+  my $encoding = $self->{'encoding_name'};
 
   my $re = join '|', map { quotemeta $_ } keys %$context
       if (defined($context) and ref($context));
@@ -123,8 +121,10 @@
   Locale::Messages::textdomain($strings_textdomain);
   Locale::Messages::bind_textdomain_codeset($strings_textdomain, $encoding)
     if ($encoding and $encoding ne 'us-ascii');
+  if (!($encoding and $encoding eq 'us-ascii') and $self->{'perl_encoding'}) {
   Locale::Messages::bind_textdomain_filter($strings_textdomain,
-    \&encode_i18n_string, $encoding) if ($encoding and $encoding ne 
'us-ascii');
+      \&encode_i18n_string, $self->{'perl_encoding'});
+  }
 
   # FIXME do that in the converters when @documentlanguage is found.
   my $lang = $self->{'documentlanguage'};
@@ -241,7 +241,8 @@
                               # in the `HTML Xref' node.  Value should be
                               # a node/anchor or float in the tree.
   'novalidate' => 0,          # same as setting @novalidate.
-  'encoding' => undef,        # Current encoding set by @documentencoding
+  'perl_encoding' => undef,   # perl encoding name, set from @documentencoding
+  'encoding_name' => undef,   # Current encoding set by @documentencoding
                               # and normalized
   'documentlanguage' => undef, 
                               # Current documentlanguage set by 
@@ -254,7 +255,7 @@
 # The commands in initialization_overrides are not set in the document if
 # set at the parser initialization.
 my %initialization_overrides = (
-  'encoding' => 1,
+  'encoding_name' => 1,
   'documentlanguage' => 1,
 );
 
@@ -568,13 +569,6 @@
   $no_paragraph_contexts{$no_paragraph_context} = 1;
 };
 
-my %canonical_texinfo_encodings;
-# These are the encodings from the texinfo manual
-foreach my $canonical_encoding('us-ascii', 'utf-8', 'iso-8859-1',
-  'iso-8859-15','iso-8859-2','koi8-r', 'koi8-u') {
-  $canonical_texinfo_encodings{$canonical_encoding} = 1;
-}
-
 
 
 # simple deep copy of a structure
@@ -2286,8 +2280,8 @@
             my $filehandle = do { local *FH };
             if (open ($filehandle, $file)) {
               $included_file = 1;
-              binmode($filehandle, ":encoding($self->{'encoding'})")
-                if (defined($self->{'encoding'}));
+              binmode($filehandle, ":encoding($self->{'perl_encoding'})")
+                if (defined($self->{'perl_encoding'}));
               print STDERR "Included $file($filehandle)\n" if 
($self->{'DEBUG'});
               $included_file = 1;
               unshift @{$self->{'input'}}, { 
@@ -2304,23 +2298,27 @@
                $command, $text), $line_nr);
           }
         } elsif ($command eq 'documentencoding') {
+          my ($texinfo_encoding, $perl_encoding, $output_encoding)
+            = Texinfo::Common::encoding_alias($text);
           $self->line_warn (sprintf($self->__("Encoding `%s' is not a 
canonical texinfo encoding"), 
                                    $text), $line_nr)
-            if (!$canonical_texinfo_encodings{lc($text)});
-          my $encoding = Encode::resolve_alias($text);
-          if (!$encoding) {
+            if (!$texinfo_encoding);
+          if (!$perl_encoding) {
             $self->line_warn (sprintf($self->__("unrecognized encoding name 
`%s'"), 
                        $text), $line_nr);
           } else {
-            $encoding = $Texinfo::Common::encoding_aliases{$encoding} 
-              if ($Texinfo::Common::encoding_aliases{$encoding});
-            $current->{'extra'}->{'encoding_alias'} =  $encoding;
-
-            if (!$self->{'set'}->{'encoding'}) {
-              $self->{'encoding'} = $encoding;
-              print STDERR "Using encoding $encoding\n" if ($self->{'DEBUG'});
+            if ($output_encoding) {
+              $current->{'extra'}->{'encoding_name'} = $output_encoding;
+            }
+            $current->{'extra'}->{'perl_encoding'} = $perl_encoding;
+
+            if (!$self->{'set'}->{'perl_encoding'}) {
+              $self->{'perl_encoding'} = $perl_encoding;
+              $self->{'info'}->{'perl_encoding'} = $perl_encoding;
+              $self->{'info'}->{'encoding_name'} = $output_encoding;
+              print STDERR "Using encoding $perl_encoding\n" if 
($self->{'DEBUG'});
               foreach my $input (@{$self->{'input'}}) {
-                binmode($input->{'fh'}, ":encoding($encoding)") if 
($input->{'fh'});
+                binmode($input->{'fh'}, ":encoding($perl_encoding)") if 
($input->{'fh'});
               }
             }
           }

Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- Texinfo/Structuring.pm      28 Feb 2011 22:00:15 -0000      1.39
+++ Texinfo/Structuring.pm      3 Mar 2011 09:46:06 -0000       1.40
@@ -662,8 +662,8 @@
   my $self = shift;
   my $index_entries = shift;
   my $options = {'sort_string' => 1};
-  if ($self->{'ENABLE_ENCODING'} and $self->{'encoding'}) {
-    $options->{'enabled_encoding'} = $self->{'encoding'};
+  if ($self->{'ENABLE_ENCODING'} and $self->{'encoding_name'}) {
+    $options->{'enabled_encoding'} = $self->{'encoding_name'};
   }
   foreach my $index_name (keys(%$index_entries)) {
     foreach my $entry (@{$index_entries->{$index_name}}) {

Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- Texinfo/Convert/Info.pm     2 Mar 2011 22:26:33 -0000       1.44
+++ Texinfo/Convert/Info.pm     3 Mar 2011 09:46:07 -0000       1.45
@@ -128,13 +128,13 @@
   my $fh;
   if (! $self->{'OUTFILE'} eq '') {
     $fh = $self->Texinfo::Common::open_out ($self->{'OUTFILE'}, 
-                                            $self->{'encoding'});
+                                            $self->{'perl_encoding'});
     if (!$fh) {
       $self->document_error(sprintf($self->__("Could not open %s for writing: 
$!"),
                                     $self->{'OUTFILE'}));
       return undef;
     }
-    $self->{'fh'} = $fh;
+    #$self->{'fh'} = $fh;
   }
   print STDERR "DOCUMENT\n" if ($self->{'DEBUG'});
   my $out_file_nr = 0;
@@ -190,14 +190,14 @@
         $out_file_nr++;
         $fh = $self->Texinfo::Common::open_out (
                                $self->{'OUTFILE'}.'-'.$out_file_nr, 
-                               $self->{'encoding'});
+                               $self->{'perl_encoding'});
         if (!$fh) {
            $self->document_error(sprintf(
                   $self->__("Could not open %s for writing: $!"),
                   $self->{'OUTFILE'}.'-'.$out_file_nr));
            return undef;
         }
-        $self->{'fh'} = $fh;
+        #$self->{'fh'} = $fh;
         print $fh $header;
         $self->{'count_context'}->[-1]->{'bytes'} += $header_bytes;
         push @indirect_files, [$self->{'output_filename'}.'-'.$out_file_nr,
@@ -210,7 +210,7 @@
   if ($out_file_nr > 1) {
     close ($fh);
     $fh = $self->Texinfo::Common::open_out($self->{'OUTFILE'}, 
-                                           $self->{'encoding'});
+                                           $self->{'perl_encoding'});
     if (!$fh) {
       $self->document_error(sprintf(
             $self->__("Could not open %s for writing: $!"),
@@ -256,9 +256,8 @@
     $tag_text .=  "$prefix: $label_text\x{7F}$label->{'bytes'}\n";
   }
   $tag_text .=  "\x{1F}\nEnd Tag Table\n";
-  my $coding = $self->{'encoding'};
-  #if ($coding and $coding ne 'us-ascii') {
-  if ($coding) {# and $coding ne 'us-ascii') {
+  my $coding = $self->{'encoding_name'};
+  if ($coding) {
     $tag_text .= "\n\x{1F}\nLocal Variables:\ncoding: $coding\nEnd:\n";
   }
   if ($fh) {

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- Texinfo/Convert/Plaintext.pm        2 Mar 2011 22:52:22 -0000       1.107
+++ Texinfo/Convert/Plaintext.pm        3 Mar 2011 09:46:07 -0000       1.108
@@ -238,12 +238,10 @@
   'ENABLE_ENCODING'      => 1,
   'footnotestyle'        => 'end',
   'fillcolumn'           => 72,
-#  'documentencoding'     => 'us-ascii',
-#  'encoding'             => 'us-ascii',
-#  'output_encoding'      => 'us-ascii',
-  'documentencoding'     => undef,
-  'encoding'             => undef,
-#  'output_encoding'      => undef,
+#  'perl_encoding'        => 'ascii',
+#  'encoding_name'      => 'us-ascii',
+  'encoding_name'        => undef,
+  'perl_encoding'        => undef,
   'OUTFILE'              => undef,
   'SUBDIR'               => undef,
   'documentlanguage'     => undef,
@@ -284,16 +282,24 @@
 
   if (exists($root->{'extra'}->{'text_arg'})) {
     $self->{$root->{'cmdname'}} = $root->{'extra'}->{'text_arg'};
-    if ($root->{'cmdname'} eq 'documentencoding') {
-      if (defined($root->{'extra'})
-           and defined($root->{'extra'}->{'encoding_alias'})) {
-        $self->{'encoding'} = $root->{'extra'}->{'encoding_alias'};
-        if (defined($self->{'fh'})) {
-          binmode($self->{'fh'}, ":encoding($self->{'encoding'})");
-        }
-      } else {
-        $self->{'encoding'} = undef;
-      }
+    if ($root->{'cmdname'} eq 'documentencoding'
+        and defined($root->{'extra'})
+        and defined($root->{'extra'}->{'perl_encoding'})
+        and !$self->{'perl_encoding'}) {
+      $self->{'encoding_name'} = $root->{'extra'}->{'encoding_name'};
+      $self->{'perl_encoding'} = $root->{'extra'}->{'perl_encoding'};
+      # the following does not work with shifijs.  The encoding
+      # has to be set only once by open_out. 
+      #if (defined($self->{'fh'})) {
+      #  my $encoding = $self->{'perl_encoding'};
+      #  my $filehandle = $self->{'fh'};
+      #  if ($encoding eq 'utf8' or $encoding eq 'utf-8-strict') {
+      #    binmode($filehandle, ':utf8');
+      #  } else { # FIXME also right for shiftijs or similar encodings?
+      #    binmode($filehandle, ':bytes');
+      #  }
+      #  binmode($filehandle, ":encoding($encoding)");
+      #}
     }
   } elsif ($misc_commands{$root->{'cmdname'}} eq 'skipline') {
     $self->{$root->{'cmdname'}} = 1;
@@ -369,6 +375,10 @@
       $converter->{'extra'} 
          = $converter->{'parser'}->global_commands_information();
       $converter->{'info'} = $converter->{'parser'}->global_informations();
+      if ($converter->{'info'} and $converter->{'info'}->{'perl_encoding'}) {
+        $converter->{'perl_encoding'} = 
$converter->{'info'}->{'perl_encoding'};
+        $converter->{'encoding_name'} = 
$converter->{'info'}->{'encoding_name'};
+      }
       my $floats = $converter->{'parser'}->floats_information();
       my $labels = $converter->{'parser'}->labels_information();
       $converter->{'structuring'} = $converter->{'parser'}->{'structuring'};
@@ -510,13 +520,13 @@
   }
   
   my $fh = $self->Texinfo::Common::open_out ($outfile,
-                                             $self->{'encoding'});
+                                             $self->{'perl_encoding'});
   if (!$fh) {
     $self->document_error(sprintf($self->__("Could not open %s for writing: 
$!"),
                                   $outfile));
     return undef;
   }
-  $self->{'fh'} = $fh;
+  #$self->{'fh'} = $fh;
   my $result = $self->convert($root);
   if (defined($result)) {
     print $fh $result;
@@ -544,8 +554,8 @@
   my $text = $command->{'text'};
 
   $text = uc($text) if ($self->{'formatters'}->[-1]->{'upper_case'});
-  if ($self->{'ENABLE_ENCODING'} and $self->{'documentencoding'} 
-      and $self->{'documentencoding'} eq 'utf-8') {
+  if ($self->{'ENABLE_ENCODING'} and $self->{'encoding_name'} 
+      and $self->{'encoding_name'} eq 'utf-8') {
     return Texinfo::Convert::Unicode::unicode_text($self, $command, $context);
   } elsif (!$context->{'code'} and !$context->{'preformatted'}) {
     $text =~ s/---/\x{1F}/g;
@@ -684,8 +694,8 @@
   my $self = shift;
   my $string = shift;
 
-  if ($self->{'encoding'} and $self->{'encoding'} ne 'us-ascii') {
-    return length(Encode::encode($self->{'encoding'}, $string));
+  if ($self->{'perl_encoding'} and $self->{'perl_encoding'} ne 'ascii') {
+    return length(Encode::encode($self->{'perl_encoding'}, $string));
   } else {
     return length($string);
   }
@@ -1298,7 +1308,7 @@
       return $result;
     } elsif (defined($text_brace_no_arg_commands{$root->{'cmdname'}})) {
       my $text = Texinfo::Convert::Text::brace_no_arg_command($root, 
-                                                    $self->{'encoding'});
+                                              $self->{'encoding_name'});
       if ($punctuation_no_arg_commands{$command}) {
         $result .= $self->_count_added($formatter->{'container'},
                     $formatter->{'container'}->add_next($text, undef, 1));
@@ -1324,7 +1334,7 @@
     # commands with braces
     } elsif ($accent_commands{$root->{'cmdname'}}) {
       my $accented_text 
-         = Texinfo::Convert::Text::text_accents($root, $self->{'encoding'});
+         = Texinfo::Convert::Text::text_accents($root, 
$self->{'encoding_name'});
       $result .= $self->_count_added($formatter->{'container'},
          $formatter->{'container'}->add_text($accented_text));
       # in case the text added ends with punctuation.  

Index: t/results/include/macro_in_early_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/include/macro_in_early_commands.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/include/macro_in_early_commands.pl        1 Jan 2011 14:28:01 
-0000       1.27
+++ t/results/include/macro_in_early_commands.pl        3 Mar 2011 09:46:07 
-0000       1.28
@@ -243,7 +243,8 @@
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'encoding_alias' => 'iso-8859-1',
+            'encoding_name' => 'iso-8859-1',
+            'perl_encoding' => 'iso-8859-1',
             'text_arg' => 'ISO-8859-1'
           },
           'line_nr' => {

Index: t/results/info_tests/encoding_us_ascii.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/info_tests/encoding_us_ascii.pl   2 Mar 2011 22:26:34 -0000       
1.2
+++ t/results/info_tests/encoding_us_ascii.pl   3 Mar 2011 09:46:07 -0000       
1.3
@@ -38,7 +38,8 @@
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'encoding_alias' => 'us-ascii',
+            'encoding_name' => 'us-ascii',
+            'perl_encoding' => 'ascii',
             'text_arg' => 'US-ASCII'
           },
           'line_nr' => {

Index: t/results/info_tests/known_encoding.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/known_encoding.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/info_tests/known_encoding.pl      19 Feb 2011 12:21:49 -0000      
1.1
+++ t/results/info_tests/known_encoding.pl      3 Mar 2011 09:46:07 -0000       
1.2
@@ -38,7 +38,8 @@
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'encoding_alias' => 'iso-8859-1',
+            'encoding_name' => 'iso-8859-1',
+            'perl_encoding' => 'iso-8859-1',
             'text_arg' => 'latin1'
           },
           'line_nr' => {

Index: t/results/info_tests/only_documentencoding.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/info_tests/only_documentencoding.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/info_tests/only_documentencoding.pl       27 Feb 2011 21:51:30 
-0000      1.1
+++ t/results/info_tests/only_documentencoding.pl       3 Mar 2011 09:46:07 
-0000       1.2
@@ -24,7 +24,8 @@
       ],
       'cmdname' => 'documentencoding',
       'extra' => {
-        'encoding_alias' => 'iso-8859-1',
+        'encoding_name' => 'iso-8859-1',
+        'perl_encoding' => 'iso-8859-1',
         'text_arg' => 'ISO-8859-1'
       },
       'line_nr' => {

Index: t/results/misc_commands/invalid_documentencoding.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/invalid_documentencoding.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/misc_commands/invalid_documentencoding.pl 19 Feb 2011 12:21:50 
-0000      1.5
+++ t/results/misc_commands/invalid_documentencoding.pl 3 Mar 2011 09:46:07 
-0000       1.6
@@ -59,7 +59,8 @@
       ],
       'cmdname' => 'documentencoding',
       'extra' => {
-        'encoding_alias' => 'us-ascii',
+        'encoding_name' => 'us-ascii',
+        'perl_encoding' => 'ascii',
         'text_arg' => 'us-ascii'
       },
       'line_nr' => {},

Index: t/results/misc_commands/many_lines.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/many_lines.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/misc_commands/many_lines.pl       19 Feb 2011 12:21:50 -0000      
1.27
+++ t/results/misc_commands/many_lines.pl       3 Mar 2011 09:46:07 -0000       
1.28
@@ -828,7 +828,8 @@
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'encoding_alias' => 'iso-8859-1',
+            'encoding_name' => 'iso-8859-1',
+            'perl_encoding' => 'iso-8859-1',
             'text_arg' => 'ISO-8859-1'
           },
           'line_nr' => {

Index: t/results/sectioning/no_element.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/no_element.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/sectioning/no_element.pl  27 Feb 2011 21:51:30 -0000      1.2
+++ t/results/sectioning/no_element.pl  3 Mar 2011 09:46:07 -0000       1.3
@@ -67,7 +67,8 @@
       ],
       'cmdname' => 'documentencoding',
       'extra' => {
-        'encoding_alias' => 'iso-8859-1',
+        'encoding_name' => 'iso-8859-1',
+        'perl_encoding' => 'iso-8859-1',
         'text_arg' => 'ISO-8859-1'
       },
       'line_nr' => {

Index: t/results/value/value_in_misc_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- t/results/value/value_in_misc_commands.pl   19 Feb 2011 02:26:42 -0000      
1.40
+++ t/results/value/value_in_misc_commands.pl   3 Mar 2011 09:46:07 -0000       
1.41
@@ -1554,7 +1554,8 @@
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'encoding_alias' => 'iso-8859-1',
+            'encoding_name' => 'iso-8859-1',
+            'perl_encoding' => 'iso-8859-1',
             'text_arg' => 'ISO-8859-1'
           },
           'line_nr' => {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]