texinfo/tp Texinfo/Common.pm t/80include.t t/in...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/10/27 19:17:06

Modified files:
        tp/Texinfo     : Common.pm 
        tp/t           : 80include.t 
Added files:
        tp/t/include   : verbatim_encoded.texi 
                         verbatim_encoded_latin1.texi 
        tp/t/results/include: verbatiminclude_and_encoding.pl 
                              verbatiminclude_and_encoding_latin1.pl 

Log message:
        Use the perl_encoding when opening a verbatiminclude file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/80include.t?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/include/verbatim_encoded.texi?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/include/verbatim_encoded_latin1.texi?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/verbatiminclude_and_encoding.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl?cvsroot=texinfo&rev=1.1

Patches:
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- Texinfo/Common.pm   26 Oct 2011 22:53:08 -0000      1.79
+++ Texinfo/Common.pm   27 Oct 2011 19:17:04 -0000      1.80
@@ -822,13 +822,15 @@
   my $verbatiminclude;
 
   if (defined($file)) {
-    # FIXME encoding?
     if (!open(VERBINCLUDE, $file)) {
       if ($self) {
         $self->line_error (sprintf($self->__("Cannot read %s: %s"), $file, 
$!), 
                             $current->{'line_nr'});
       }
     } else {
+      if ($self and defined($self->{'perl_encoding'})) {
+        binmode(VERBINCLUDE, ":encoding($self->{'perl_encoding'})");
+      }
       $verbatiminclude = { 'cmdname' => 'verbatim',
                            'parent' => $current->{'parent'},
                            'extra' => 

Index: t/80include.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/80include.t,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/80include.t       25 Sep 2011 22:07:13 -0000      1.8
+++ t/80include.t       27 Oct 2011 19:17:05 -0000      1.9
@@ -128,7 +128,17 @@
 '],
 ['include_setfilename_on_setfilename_line',
 '@setfilename file @setfilename other file @include are you joking!
-']
+'],
+['verbatiminclude_and_encoding',
+'@documentencoding utf-8
+
address@hidden verbatim_encoded.texi
+', {'test_formats' => ['plaintext']}],
+['verbatiminclude_and_encoding_latin1',
+'@documentencoding iso-8859-1
+
address@hidden verbatim_encoded_latin1.texi
+', {'test_formats' => ['plaintext']}],
 );
 
 our ($arg_test_case, $arg_generate, $arg_debug);

Index: t/include/verbatim_encoded.texi
===================================================================
RCS file: t/include/verbatim_encoded.texi
diff -N t/include/verbatim_encoded.texi
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/include/verbatim_encoded.texi     27 Oct 2011 19:17:05 -0000      1.1
@@ -0,0 +1 @@
+é

Index: t/include/verbatim_encoded_latin1.texi
===================================================================
RCS file: t/include/verbatim_encoded_latin1.texi
diff -N t/include/verbatim_encoded_latin1.texi
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/include/verbatim_encoded_latin1.texi      27 Oct 2011 19:17:05 -0000      
1.1
@@ -0,0 +1 @@
+é

Index: t/results/include/verbatiminclude_and_encoding.pl
===================================================================
RCS file: t/results/include/verbatiminclude_and_encoding.pl
diff -N t/results/include/verbatiminclude_and_encoding.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/include/verbatiminclude_and_encoding.pl   27 Oct 2011 19:17:05 
-0000      1.1
@@ -0,0 +1,127 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'verbatiminclude_and_encoding'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'utf-8'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'documentencoding',
+      'extra' => {
+        'encoding_name' => 'utf-8',
+        'perl_encoding' => 'utf-8-strict',
+        'text_arg' => 'utf-8'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 1,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'verbatim_encoded.texi'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'verbatiminclude',
+      'extra' => {
+        'text_arg' => 'verbatim_encoded.texi'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 3,
+        'macro' => ''
+      },
+      'parent' => {}
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatiminclude_and_encoding'}{'contents'}[0];
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatiminclude_and_encoding'}{'contents'}[0]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'verbatiminclude_and_encoding'}{'contents'}[0]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'verbatiminclude_and_encoding'}{'contents'}[0]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'verbatiminclude_and_encoding'}{'contents'}[0];
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[0]{'parent'} = 
$result_trees{'verbatiminclude_and_encoding'};
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[1]{'parent'} = 
$result_trees{'verbatiminclude_and_encoding'};
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatiminclude_and_encoding'}{'contents'}[2];
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatiminclude_and_encoding'}{'contents'}[2]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'verbatiminclude_and_encoding'}{'contents'}[2]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'verbatiminclude_and_encoding'}{'contents'}[2]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'verbatiminclude_and_encoding'}{'contents'}[2];
+$result_trees{'verbatiminclude_and_encoding'}{'contents'}[2]{'parent'} = 
$result_trees{'verbatiminclude_and_encoding'};
+
+$result_texis{'verbatiminclude_and_encoding'} = '@documentencoding utf-8
+
address@hidden verbatim_encoded.texi
+';
+
+
+$result_texts{'verbatiminclude_and_encoding'} = '
+';
+
+$result_errors{'verbatiminclude_and_encoding'} = [];
+
+
+
+$result_converted{'plaintext'}->{'verbatiminclude_and_encoding'} = 'é
+';
+
+1;

Index: t/results/include/verbatiminclude_and_encoding_latin1.pl
===================================================================
RCS file: t/results/include/verbatiminclude_and_encoding_latin1.pl
diff -N t/results/include/verbatiminclude_and_encoding_latin1.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/include/verbatiminclude_and_encoding_latin1.pl    27 Oct 2011 
19:17:05 -0000      1.1
@@ -0,0 +1,127 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'verbatiminclude_and_encoding_latin1'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'iso-8859-1'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'documentencoding',
+      'extra' => {
+        'encoding_name' => 'iso-8859-1',
+        'perl_encoding' => 'iso-8859-1',
+        'text_arg' => 'iso-8859-1'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 1,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'verbatim_encoded_latin1.texi'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'verbatiminclude',
+      'extra' => {
+        'text_arg' => 'verbatim_encoded_latin1.texi'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 3,
+        'macro' => ''
+      },
+      'parent' => {}
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0];
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0];
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[0]{'parent'} 
= $result_trees{'verbatiminclude_and_encoding_latin1'};
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[1]{'parent'} 
= $result_trees{'verbatiminclude_and_encoding_latin1'};
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2];
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2]{'args'}[0];
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2];
+$result_trees{'verbatiminclude_and_encoding_latin1'}{'contents'}[2]{'parent'} 
= $result_trees{'verbatiminclude_and_encoding_latin1'};
+
+$result_texis{'verbatiminclude_and_encoding_latin1'} = '@documentencoding 
iso-8859-1
+
address@hidden verbatim_encoded_latin1.texi
+';
+
+
+$result_texts{'verbatiminclude_and_encoding_latin1'} = '
+';
+
+$result_errors{'verbatiminclude_and_encoding_latin1'} = [];
+
+
+
+$result_converted{'plaintext'}->{'verbatiminclude_and_encoding_latin1'} = 'é
+';
+
+1;