texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Replace extra input_perl_encoding by input_encodi


From: Patrice Dumas
Subject: branch master updated: Replace extra input_perl_encoding by input_encoding_name in elements
Date: Sat, 15 Jul 2023 15:36:45 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 11f383be25 Replace extra input_perl_encoding by input_encoding_name in 
elements
11f383be25 is described below

commit 11f383be253d6dde54f1bc1640d322159d942bf8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jul 15 21:36:34 2023 +0200

    Replace extra input_perl_encoding by input_encoding_name in elements
    
    * tp/Texinfo/Common.pm (element_extra_encoding_for_perl),
    tp/Texinfo/Convert/Converter.pm (txt_image_text),
    tp/Texinfo/Convert/Text.pm (converter), tp/Texinfo/Convert/Utils.pm
    (expand_verbatiminclude), tp/Texinfo/ParserNonXS.pm
    (_end_line_misc_line, _handle_close_brace),
    tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line),
    tp/Texinfo/XS/parsetexi/separator.c (handle_close_brace): use
    input_encoding_name instead of input_perl_encoding in tree extra
    elements.  Add element_extra_encoding_for_perl to Texinfo::Common
    to find perl encoding based on element extra input_encoding_name.
---
 ChangeLog                                          |  15 +++++++
 tp/Texinfo/Common.pm                               |  21 +++++++++
 tp/Texinfo/Convert/Converter.pm                    |   9 ++--
 tp/Texinfo/Convert/Text.pm                         |   4 +-
 tp/Texinfo/Convert/Utils.pm                        |   7 +--
 tp/Texinfo/ParserNonXS.pm                          |  22 ++++-----
 tp/Texinfo/XS/parsetexi/end_line.c                 |   6 +--
 tp/Texinfo/XS/parsetexi/separator.c                |   6 +--
 tp/t/results/converters_tests/commands_in_sc.pl    |   2 +-
 tp/t/results/converters_tests/commands_in_var.pl   |   2 +-
 tp/t/results/converters_tests/image_extension.pl   |   2 +-
 tp/t/results/converters_tests/image_formatting.pl  |  46 +++++++++----------
 tp/t/results/converters_tests/image_with_spaces.pl | Bin 4338 -> 4338 bytes
 tp/t/results/coverage/verbatiminclude.pl           |   2 +-
 tp/t/results/coverage_braces/empty_images.pl       |   8 ++--
 .../coverage_braces/space_command_in_image.pl      |   4 +-
 tp/t/results/coverage_braces/space_in_image.pl     |   4 +-
 tp/t/results/coverage_braces/test_image.pl         |  20 ++++-----
 .../formats_encodings/at_commands_in_refs.pl       |  16 +++----
 .../at_commands_in_refs_latin1.pl                  |  16 +++----
 .../formats_encodings/at_commands_in_refs_utf8.pl  |  16 +++----
 tp/t/results/html_tests/commands_in_alt.pl         |   4 +-
 tp/t/results/html_tests/image_link_prefix.pl       |   2 +-
 .../verbatim_in_multitable_in_example.pl           |   2 +-
 tp/t/results/html_tests/xml_protected_in_verb.pl   |   2 +-
 .../macro_and_commands_in_early_commands.pl        |   2 +-
 tp/t/results/include/value_expansion_in_include.pl |   6 +--
 .../include/verbatiminclude_and_encoding.pl        |   2 +-
 .../include/verbatiminclude_and_encoding_latin1.pl |   2 +-
 tp/t/results/indices/image_lines_count.pl          | Bin 5966 -> 5966 bytes
 tp/t/results/indices/image_text_lines_count.pl     | Bin 6411 -> 6411 bytes
 tp/t/results/info_tests/file_only_png.pl           | Bin 3677 -> 3677 bytes
 tp/t/results/info_tests/image_and_punctuation.pl   | Bin 7544 -> 7544 bytes
 .../info_tests/image_and_spaces_formatting.pl      |  50 ++++++++++-----------
 tp/t/results/info_tests/image_extension.pl         | Bin 4777 -> 4777 bytes
 tp/t/results/info_tests/image_in_paragraph.pl      | Bin 3110 -> 3110 bytes
 tp/t/results/info_tests/image_not_found.pl         |   2 +-
 tp/t/results/info_tests/image_quotes.pl            | Bin 2694 -> 2694 bytes
 tp/t/results/info_tests/image_text_encoded.pl      |   2 +-
 .../info_tests/image_text_file_only_and_alt.pl     | Bin 2818 -> 2818 bytes
 .../info_tests/multiline_image_and_align.pl        |  32 ++++++-------
 tp/t/results/paragraph/image_in_paragraph.pl       |   2 +-
 tp/t/results/paragraph/no_paragraph_commands.pl    |   2 +-
 tp/t/results/paragraph/sole_image.pl               |   2 +-
 .../plaintext_tests/multiline_image_and_align.pl   |  16 +++----
 tp/t/results/raw/verbatim_and_verbatiminclude.pl   |   6 +--
 .../brace_commands_spaces_end_of_lines.pl          |  12 ++---
 tp/t/results/xml_tests/commands_and_spaces.pl      |   4 +-
 tp/t/results/xml_tests/image_inline_or_not.pl      |  48 ++++++++++----------
 49 files changed, 230 insertions(+), 198 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce8966c7c2..f09943a05f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2023-07-15  Patrice Dumas  <pertusus@free.fr>
+
+       Replace extra input_perl_encoding by input_encoding_name in elements
+
+       * tp/Texinfo/Common.pm (element_extra_encoding_for_perl),
+       tp/Texinfo/Convert/Converter.pm (txt_image_text),
+       tp/Texinfo/Convert/Text.pm (converter), tp/Texinfo/Convert/Utils.pm
+       (expand_verbatiminclude), tp/Texinfo/ParserNonXS.pm
+       (_end_line_misc_line, _handle_close_brace),
+       tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line),
+       tp/Texinfo/XS/parsetexi/separator.c (handle_close_brace): use
+       input_encoding_name instead of input_perl_encoding in tree extra
+       elements.  Add element_extra_encoding_for_perl to Texinfo::Common
+       to find perl encoding based on element extra input_encoding_name.
+
 2023-07-15  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line),
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 2e473a70da..90a4ca44c8 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1222,6 +1222,27 @@ sub parse_node_manual($;$)
 
 # misc functions used in diverse contexts and useful in converters
 
+# FIXME document
+sub element_extra_encoding_for_perl($)
+{
+  my $element = shift;
+
+  my $perl_encoding;
+
+  my $encoding = $element->{'extra'}->{'input_encoding_name'}
+    if ($element->{'extra'});
+
+  if ($encoding) {
+    my $Encode_encoding_object = Encode::find_encoding($encoding);
+    if (defined($Encode_encoding_object)) {
+      $perl_encoding = $Encode_encoding_object->name();
+      $perl_encoding = undef if (!$perl_encoding);
+    }
+  }
+
+  return $perl_encoding;
+}
+
 # Reverse the decoding of the file name from the input encoding.  When
 # dealing with file names, we want Perl strings representing sequences of
 # bytes, not Unicode codepoints.
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index f87dc541e1..09467afcfe 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1215,11 +1215,10 @@ sub txt_image_text($$$)
   } else {
     my $filehandle = do { local *FH };
     if (open ($filehandle, $txt_file)) {
-      my $enc;
-      $enc = $element->{'extra'}->{'input_perl_encoding'}
-         if ($element->{'extra'});
-      binmode($filehandle, ":encoding($enc)")
-        if ($enc);
+      my $perl_encoding = 
Texinfo::Common::element_extra_encoding_for_perl($element);
+      if ($perl_encoding) {
+        binmode($filehandle, ":encoding($perl_encoding)");
+      }
       my $result = '';
       my $max_width = 0;
       while (<$filehandle>) {
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 3745530932..6784a2b265 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -729,11 +729,11 @@ sub converter($)
         my $element = $converter->{'global_commands'}->{$global_command}->[0];
         if ($global_command eq 'documentencoding'
             and defined($element->{'extra'})
-            and defined($element->{'extra'}->{'input_perl_encoding'})) {
+            and defined($element->{'extra'}->{'input_encoding_name'})) {
           $converter->{'OUTPUT_ENCODING_NAME'}
              = $element->{'extra'}->{'input_encoding_name'};
           $converter->{'OUTPUT_PERL_ENCODING'}
-             = $element->{'extra'}->{'input_perl_encoding'};
+             = Texinfo::Common::element_extra_encoding_for_perl($element);
         }
       }
     }
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index 2de4d5a4cb..689d071a9e 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -233,14 +233,11 @@ sub expand_verbatiminclude($$$)
   my $customization_information = shift;
   my $current = shift;
 
-  my $input_encoding;
-
   return unless ($current->{'extra'}
                  and defined($current->{'extra'}->{'text_arg'}));
   my $file_name_text = $current->{'extra'}->{'text_arg'};
-  $input_encoding = $current->{'extra'}->{'input_perl_encoding'}
-        if ($current->{'extra'}
-            and defined($current->{'extra'}->{'input_perl_encoding'}));
+
+  my $input_encoding = 
Texinfo::Common::element_extra_encoding_for_perl($current);
 
   my $encoding;
   my $input_file_name_encoding
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 9e1474d6d6..7f8679f4a5 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3424,9 +3424,9 @@ sub _end_line_misc_line($$$)
                            $command, $text);
         }
       } elsif ($command eq 'verbatiminclude') {
-        $current->{'extra'}->{'input_perl_encoding'}
-                        = $self->{'info'}->{'input_perl_encoding'}
-          if defined $self->{'info'}->{'input_perl_encoding'};
+        $current->{'extra'}->{'input_encoding_name'}
+                        = $self->{'info'}->{'input_encoding_name'}
+          if defined $self->{'info'}->{'input_encoding_name'};
       } elsif ($command eq 'documentencoding') {
         my ($texinfo_encoding, $perl_encoding, $input_encoding)
            = _encoding_alias($text);
@@ -3437,16 +3437,16 @@ sub _end_line_misc_line($$$)
         if ($input_encoding) {
           $current->{'extra'}->{'input_encoding_name'} = $input_encoding;
         }
+
+        if ($input_encoding) {
+          $self->{'info'}->{'input_encoding_name'} = $input_encoding;
+        }
+
         if (!$perl_encoding) {
           $self->_command_warn($current, $source_info,
                __("unrecognized encoding name `%s'"), $text);
         } else {
           $current->{'extra'}->{'input_perl_encoding'} = $perl_encoding;
-
-          if ($input_encoding) {
-            $self->{'info'}->{'input_encoding_name'} = $input_encoding;
-          }
-
           $self->{'info'}->{'input_perl_encoding'} = $perl_encoding;
           foreach my $input (@{$self->{'input'}}) {
             binmode($input->{'fh'}, ":encoding($perl_encoding)")
@@ -6058,10 +6058,10 @@ sub _handle_close_brace($$$)
         $self->_line_error(
            __("\@image missing filename argument"), $source_info);
       }
-      if (defined $self->{'info'}->{'input_perl_encoding'}) {
+      if (defined $self->{'info'}->{'input_encoding_name'}) {
         $image->{'extra'} = {} if (!$image->{'extra'});
-        $image->{'extra'}->{'input_perl_encoding'}
-           = $self->{'info'}->{'input_perl_encoding'};
+        $image->{'extra'}->{'input_encoding_name'}
+           = $self->{'info'}->{'input_encoding_name'};
       }
     } elsif($current->{'parent'}->{'cmdname'} eq 'dotless') {
       my $dotless = $current->{'parent'};
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index b8556badbd..e16b1313a7 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1451,9 +1451,9 @@ end_line_misc_line (ELEMENT *current)
             }
           else if (current->cmd == CM_verbatiminclude)
             {
-              if (global_info.input_perl_encoding)
-                add_extra_string_dup (current, "input_perl_encoding",
-                                      global_info.input_perl_encoding);
+              if (global_info.input_encoding_name)
+                add_extra_string_dup (current, "input_encoding_name",
+                                      global_info.input_encoding_name);
             }
           else if (current->cmd == CM_documentencoding)
             {
diff --git a/tp/Texinfo/XS/parsetexi/separator.c 
b/tp/Texinfo/XS/parsetexi/separator.c
index 6009e99219..9e22b2dd15 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -420,9 +420,9 @@ handle_close_brace (ELEMENT *current, char **line_inout)
             {
               line_error ("@image missing filename argument");
             }
-          if (global_info.input_perl_encoding)
-            add_extra_string_dup (image, "input_perl_encoding",
-                                  global_info.input_perl_encoding);
+          if (global_info.input_encoding_name)
+            add_extra_string_dup (image, "input_encoding_name",
+                                  global_info.input_encoding_name);
         }
       else if (closed_command == CM_dotless)
         {
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl 
b/tp/t/results/converters_tests/commands_in_sc.pl
index 7abc90e826..77ad6571fc 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -210,7 +210,7 @@ $result_trees{'commands_in_sc'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
diff --git a/tp/t/results/converters_tests/commands_in_var.pl 
b/tp/t/results/converters_tests/commands_in_var.pl
index b6a7ec8308..ba66483fb0 100644
--- a/tp/t/results/converters_tests/commands_in_var.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -210,7 +210,7 @@ $result_trees{'commands_in_var'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
diff --git a/tp/t/results/converters_tests/image_extension.pl 
b/tp/t/results/converters_tests/image_extension.pl
index f8249fe379..722d263ec6 100644
--- a/tp/t/results/converters_tests/image_extension.pl
+++ b/tp/t/results/converters_tests/image_extension.pl
@@ -39,7 +39,7 @@ $result_trees{'image_extension'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 58c0131fb8..80c065ab82 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -183,7 +183,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -249,7 +249,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -318,7 +318,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -390,7 +390,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -465,7 +465,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -555,7 +555,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -637,7 +637,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -714,7 +714,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -891,7 +891,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -916,7 +916,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -940,7 +940,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -1022,7 +1022,7 @@ $result_trees{'image_formatting'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1088,7 +1088,7 @@ $result_trees{'image_formatting'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1157,7 +1157,7 @@ $result_trees{'image_formatting'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1229,7 +1229,7 @@ $result_trees{'image_formatting'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1304,7 +1304,7 @@ $result_trees{'image_formatting'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1394,7 +1394,7 @@ $result_trees{'image_formatting'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1471,7 +1471,7 @@ $result_trees{'image_formatting'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1648,7 +1648,7 @@ $result_trees{'image_formatting'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1673,7 +1673,7 @@ $result_trees{'image_formatting'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1697,7 +1697,7 @@ $result_trees{'image_formatting'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1783,7 +1783,7 @@ $result_trees{'image_formatting'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -1833,7 +1833,7 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
diff --git a/tp/t/results/converters_tests/image_with_spaces.pl 
b/tp/t/results/converters_tests/image_with_spaces.pl
index 691c331394..3daf30a682 100644
Binary files a/tp/t/results/converters_tests/image_with_spaces.pl and 
b/tp/t/results/converters_tests/image_with_spaces.pl differ
diff --git a/tp/t/results/coverage/verbatiminclude.pl 
b/tp/t/results/coverage/verbatiminclude.pl
index 9ce513be95..1312c44aa1 100644
--- a/tp/t/results/coverage/verbatiminclude.pl
+++ b/tp/t/results/coverage/verbatiminclude.pl
@@ -33,7 +33,7 @@ $result_trees{'verbatiminclude'} = {
           ],
           'cmdname' => 'verbatiminclude',
           'extra' => {
-            'input_perl_encoding' => 'utf-8',
+            'input_encoding_name' => 'utf-8',
             'text_arg' => 'incl-incl.txi'
           },
           'info' => {
diff --git a/tp/t/results/coverage_braces/empty_images.pl 
b/tp/t/results/coverage_braces/empty_images.pl
index b3866c1ad7..63b8e3396c 100644
--- a/tp/t/results/coverage_braces/empty_images.pl
+++ b/tp/t/results/coverage_braces/empty_images.pl
@@ -17,7 +17,7 @@ $result_trees{'empty_images'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -84,7 +84,7 @@ $result_trees{'empty_images'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -123,7 +123,7 @@ $result_trees{'empty_images'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -157,7 +157,7 @@ $result_trees{'empty_images'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
diff --git a/tp/t/results/coverage_braces/space_command_in_image.pl 
b/tp/t/results/coverage_braces/space_command_in_image.pl
index 354bc30303..1de7eb42fd 100644
--- a/tp/t/results/coverage_braces/space_command_in_image.pl
+++ b/tp/t/results/coverage_braces/space_command_in_image.pl
@@ -36,7 +36,7 @@ $result_trees{'space_command_in_image'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -74,7 +74,7 @@ $result_trees{'space_command_in_image'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
diff --git a/tp/t/results/coverage_braces/space_in_image.pl 
b/tp/t/results/coverage_braces/space_in_image.pl
index 3bb11ea2e9..923a46f7d8 100644
--- a/tp/t/results/coverage_braces/space_in_image.pl
+++ b/tp/t/results/coverage_braces/space_in_image.pl
@@ -77,7 +77,7 @@ $result_trees{'space_in_image'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -111,7 +111,7 @@ $result_trees{'space_in_image'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index b6e59fe21a..ad1dbdd0ee 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -253,7 +253,7 @@ $result_trees{'test_image'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -533,7 +533,7 @@ $result_trees{'test_image'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -811,7 +811,7 @@ $result_trees{'test_image'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -1088,7 +1088,7 @@ $result_trees{'test_image'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -1315,7 +1315,7 @@ $result_trees{'test_image'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1590,7 +1590,7 @@ $result_trees{'test_image'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1841,7 +1841,7 @@ $result_trees{'test_image'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -2118,7 +2118,7 @@ $result_trees{'test_image'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -2304,7 +2304,7 @@ $result_trees{'test_image'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -2581,7 +2581,7 @@ $result_trees{'test_image'} = {
                           ],
                           'cmdname' => 'image',
                           'extra' => {
-                            'input_perl_encoding' => 'utf-8'
+                            'input_encoding_name' => 'utf-8'
                           },
                           'source_info' => {
                             'file_name' => '',
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index fda0081152..763c2c8976 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -2720,7 +2720,7 @@ $result_trees{'at_commands_in_refs'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -2776,7 +2776,7 @@ $result_trees{'at_commands_in_refs'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -8442,7 +8442,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -8498,7 +8498,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -8579,7 +8579,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -8635,7 +8635,7 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -13087,7 +13087,7 @@ $result_trees{'at_commands_in_refs'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -13143,7 +13143,7 @@ $result_trees{'at_commands_in_refs'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
index 5cf584eb56..ca71721819 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
@@ -2792,7 +2792,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'iso-8859-15'
+                        'input_encoding_name' => 'iso-8859-15'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -2848,7 +2848,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'iso-8859-15'
+                        'input_encoding_name' => 'iso-8859-15'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -8514,7 +8514,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'iso-8859-15'
+                'input_encoding_name' => 'iso-8859-15'
               },
               'source_info' => {
                 'file_name' => '',
@@ -8570,7 +8570,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'iso-8859-15'
+                'input_encoding_name' => 'iso-8859-15'
               },
               'source_info' => {
                 'file_name' => '',
@@ -8651,7 +8651,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'iso-8859-15'
+                'input_encoding_name' => 'iso-8859-15'
               },
               'source_info' => {
                 'file_name' => '',
@@ -8707,7 +8707,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'iso-8859-15'
+                'input_encoding_name' => 'iso-8859-15'
               },
               'source_info' => {
                 'file_name' => '',
@@ -13159,7 +13159,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'iso-8859-15'
+                        'input_encoding_name' => 'iso-8859-15'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -13215,7 +13215,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'iso-8859-15'
+                        'input_encoding_name' => 'iso-8859-15'
                       },
                       'source_info' => {
                         'file_name' => '',
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
index 04db89bdd2..5a02e8c0f7 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
@@ -2792,7 +2792,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8-strict'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -2848,7 +2848,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8-strict'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -8514,7 +8514,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8-strict'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -8570,7 +8570,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8-strict'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -8651,7 +8651,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8-strict'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -8707,7 +8707,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8-strict'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -13159,7 +13159,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8-strict'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -13215,7 +13215,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8-strict'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
diff --git a/tp/t/results/html_tests/commands_in_alt.pl 
b/tp/t/results/html_tests/commands_in_alt.pl
index 4ee3d1155b..3e6bb7e93e 100644
--- a/tp/t/results/html_tests/commands_in_alt.pl
+++ b/tp/t/results/html_tests/commands_in_alt.pl
@@ -54,7 +54,7 @@ $result_trees{'commands_in_alt'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -132,7 +132,7 @@ $result_trees{'commands_in_alt'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
diff --git a/tp/t/results/html_tests/image_link_prefix.pl 
b/tp/t/results/html_tests/image_link_prefix.pl
index 392a3c5c48..feb1ce8243 100644
--- a/tp/t/results/html_tests/image_link_prefix.pl
+++ b/tp/t/results/html_tests/image_link_prefix.pl
@@ -22,7 +22,7 @@ $result_trees{'image_link_prefix'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
diff --git a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl 
b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
index 6c6c03b263..973d7a6dbc 100644
--- a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
+++ b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
@@ -245,7 +245,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                               ],
                               'cmdname' => 'verbatiminclude',
                               'extra' => {
-                                'input_perl_encoding' => 'utf-8',
+                                'input_encoding_name' => 'utf-8',
                                 'text_arg' => 'inc_file.texi'
                               },
                               'info' => {
diff --git a/tp/t/results/html_tests/xml_protected_in_verb.pl 
b/tp/t/results/html_tests/xml_protected_in_verb.pl
index 4d2b358275..044470dab4 100644
--- a/tp/t/results/html_tests/xml_protected_in_verb.pl
+++ b/tp/t/results/html_tests/xml_protected_in_verb.pl
@@ -127,7 +127,7 @@ $result_trees{'xml_protected_in_verb'} = {
           ],
           'cmdname' => 'verbatiminclude',
           'extra' => {
-            'input_perl_encoding' => 'utf-8',
+            'input_encoding_name' => 'utf-8',
             'text_arg' => 'file_with_xml_chars.texi'
           },
           'info' => {
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl 
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 6e99f9ba93..f5d628c74f 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -688,7 +688,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           ],
           'cmdname' => 'verbatiminclude',
           'extra' => {
-            'input_perl_encoding' => 'utf-8',
+            'input_encoding_name' => 'utf-8',
             'text_arg' => 'inc_@f--ile.texi'
           },
           'info' => {
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index c441c3f4f5..92a39245e9 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -302,7 +302,7 @@ $result_trees{'value_expansion_in_include'} = {
           ],
           'cmdname' => 'verbatiminclude',
           'extra' => {
-            'input_perl_encoding' => 'utf-8',
+            'input_encoding_name' => 'utf-8',
             'text_arg' => 'incl-incl.txi'
           },
           'info' => {
@@ -486,7 +486,7 @@ $result_trees{'value_expansion_in_include'} = {
           ],
           'cmdname' => 'verbatiminclude',
           'extra' => {
-            'input_perl_encoding' => 'utf-8',
+            'input_encoding_name' => 'utf-8',
             'text_arg' => 'incl-incl.txi'
           },
           'info' => {
@@ -683,7 +683,7 @@ $result_trees{'value_expansion_in_include'} = {
           ],
           'cmdname' => 'verbatiminclude',
           'extra' => {
-            'input_perl_encoding' => 'utf-8',
+            'input_encoding_name' => 'utf-8',
             'text_arg' => 'incl-incl.txi'
           },
           'info' => {
diff --git a/tp/t/results/include/verbatiminclude_and_encoding.pl 
b/tp/t/results/include/verbatiminclude_and_encoding.pl
index 03ed4f6fe8..f0356b05d2 100644
--- a/tp/t/results/include/verbatiminclude_and_encoding.pl
+++ b/tp/t/results/include/verbatiminclude_and_encoding.pl
@@ -67,7 +67,7 @@ $result_trees{'verbatiminclude_and_encoding'} = {
           ],
           'cmdname' => 'verbatiminclude',
           'extra' => {
-            'input_perl_encoding' => 'utf-8-strict',
+            'input_encoding_name' => 'utf-8',
             'text_arg' => 'verbatim_encoded.texi'
           },
           'info' => {
diff --git a/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl 
b/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl
index 59f8662039..0e04740e63 100644
--- a/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl
+++ b/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl
@@ -67,7 +67,7 @@ $result_trees{'verbatiminclude_and_encoding_latin1'} = {
           ],
           'cmdname' => 'verbatiminclude',
           'extra' => {
-            'input_perl_encoding' => 'iso-8859-1',
+            'input_encoding_name' => 'iso-8859-1',
             'text_arg' => 'verbatim_encoded_latin1.texi'
           },
           'info' => {
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index 54881d445f..68a827177a 100644
Binary files a/tp/t/results/indices/image_lines_count.pl and 
b/tp/t/results/indices/image_lines_count.pl differ
diff --git a/tp/t/results/indices/image_text_lines_count.pl 
b/tp/t/results/indices/image_text_lines_count.pl
index 2ae6ac442f..f4556d233b 100644
Binary files a/tp/t/results/indices/image_text_lines_count.pl and 
b/tp/t/results/indices/image_text_lines_count.pl differ
diff --git a/tp/t/results/info_tests/file_only_png.pl 
b/tp/t/results/info_tests/file_only_png.pl
index 41da62a322..15a2b2634e 100644
Binary files a/tp/t/results/info_tests/file_only_png.pl and 
b/tp/t/results/info_tests/file_only_png.pl differ
diff --git a/tp/t/results/info_tests/image_and_punctuation.pl 
b/tp/t/results/info_tests/image_and_punctuation.pl
index a4d0952bc7..da2f316efd 100644
Binary files a/tp/t/results/info_tests/image_and_punctuation.pl and 
b/tp/t/results/info_tests/image_and_punctuation.pl differ
diff --git a/tp/t/results/info_tests/image_and_spaces_formatting.pl 
b/tp/t/results/info_tests/image_and_spaces_formatting.pl
index 26b4013f60..e2f976e325 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -47,7 +47,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -71,7 +71,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -95,7 +95,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -119,7 +119,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -143,7 +143,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -167,7 +167,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -191,7 +191,7 @@ $result_trees{'image_and_spaces_formatting'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -226,7 +226,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -250,7 +250,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -274,7 +274,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -298,7 +298,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -322,7 +322,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -346,7 +346,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -370,7 +370,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -408,7 +408,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -432,7 +432,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -456,7 +456,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -480,7 +480,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -504,7 +504,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -528,7 +528,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -552,7 +552,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -590,7 +590,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -628,7 +628,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -666,7 +666,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -690,7 +690,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
diff --git a/tp/t/results/info_tests/image_extension.pl 
b/tp/t/results/info_tests/image_extension.pl
index cc8b0e239c..0f33e03b18 100644
Binary files a/tp/t/results/info_tests/image_extension.pl and 
b/tp/t/results/info_tests/image_extension.pl differ
diff --git a/tp/t/results/info_tests/image_in_paragraph.pl 
b/tp/t/results/info_tests/image_in_paragraph.pl
index aba42ece0c..06fcc02c4a 100644
Binary files a/tp/t/results/info_tests/image_in_paragraph.pl and 
b/tp/t/results/info_tests/image_in_paragraph.pl differ
diff --git a/tp/t/results/info_tests/image_not_found.pl 
b/tp/t/results/info_tests/image_not_found.pl
index cf69696426..945b58d08b 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -42,7 +42,7 @@ $result_trees{'image_not_found'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
diff --git a/tp/t/results/info_tests/image_quotes.pl 
b/tp/t/results/info_tests/image_quotes.pl
index 81337d220d..af398e2dbf 100644
Binary files a/tp/t/results/info_tests/image_quotes.pl and 
b/tp/t/results/info_tests/image_quotes.pl differ
diff --git a/tp/t/results/info_tests/image_text_encoded.pl 
b/tp/t/results/info_tests/image_text_encoded.pl
index 446d815485..3dd7a31fbe 100644
--- a/tp/t/results/info_tests/image_text_encoded.pl
+++ b/tp/t/results/info_tests/image_text_encoded.pl
@@ -61,7 +61,7 @@ $result_trees{'image_text_encoded'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8-strict'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
diff --git a/tp/t/results/info_tests/image_text_file_only_and_alt.pl 
b/tp/t/results/info_tests/image_text_file_only_and_alt.pl
index 1d23ed0719..be58e0c185 100644
Binary files a/tp/t/results/info_tests/image_text_file_only_and_alt.pl and 
b/tp/t/results/info_tests/image_text_file_only_and_alt.pl differ
diff --git a/tp/t/results/info_tests/multiline_image_and_align.pl 
b/tp/t/results/info_tests/multiline_image_and_align.pl
index 0d263b4ad9..64404ad3f4 100644
--- a/tp/t/results/info_tests/multiline_image_and_align.pl
+++ b/tp/t/results/info_tests/multiline_image_and_align.pl
@@ -26,7 +26,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -81,7 +81,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -136,7 +136,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -191,7 +191,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -262,7 +262,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -300,7 +300,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -324,7 +324,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -363,7 +363,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -471,7 +471,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -558,7 +558,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -645,7 +645,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -732,7 +732,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -835,7 +835,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -905,7 +905,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -961,7 +961,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -1032,7 +1032,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
diff --git a/tp/t/results/paragraph/image_in_paragraph.pl 
b/tp/t/results/paragraph/image_in_paragraph.pl
index e37a6f304f..9bbdf5dffe 100644
--- a/tp/t/results/paragraph/image_in_paragraph.pl
+++ b/tp/t/results/paragraph/image_in_paragraph.pl
@@ -59,7 +59,7 @@ $result_trees{'image_in_paragraph'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
diff --git a/tp/t/results/paragraph/no_paragraph_commands.pl 
b/tp/t/results/paragraph/no_paragraph_commands.pl
index 92892691db..831b05a660 100644
--- a/tp/t/results/paragraph/no_paragraph_commands.pl
+++ b/tp/t/results/paragraph/no_paragraph_commands.pl
@@ -83,7 +83,7 @@ $result_trees{'no_paragraph_commands'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
diff --git a/tp/t/results/paragraph/sole_image.pl 
b/tp/t/results/paragraph/sole_image.pl
index ece132a11b..6af93714a4 100644
--- a/tp/t/results/paragraph/sole_image.pl
+++ b/tp/t/results/paragraph/sole_image.pl
@@ -22,7 +22,7 @@ $result_trees{'sole_image'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
diff --git a/tp/t/results/plaintext_tests/multiline_image_and_align.pl 
b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
index cfe0a951da..571d247422 100644
--- a/tp/t/results/plaintext_tests/multiline_image_and_align.pl
+++ b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
@@ -26,7 +26,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -81,7 +81,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -136,7 +136,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -191,7 +191,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -262,7 +262,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -300,7 +300,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -324,7 +324,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -363,7 +363,7 @@ $result_trees{'multiline_image_and_align'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
diff --git a/tp/t/results/raw/verbatim_and_verbatiminclude.pl 
b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
index 2b3dccb8bc..b72013f9df 100644
--- a/tp/t/results/raw/verbatim_and_verbatiminclude.pl
+++ b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
@@ -383,7 +383,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
           ],
           'cmdname' => 'verbatiminclude',
           'extra' => {
-            'input_perl_encoding' => 'utf-8',
+            'input_encoding_name' => 'utf-8',
             'text_arg' => 'verb.txt'
           },
           'info' => {
@@ -444,7 +444,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'verbatiminclude',
               'extra' => {
-                'input_perl_encoding' => 'utf-8',
+                'input_encoding_name' => 'utf-8',
                 'text_arg' => 'verb.txt'
               },
               'info' => {
@@ -530,7 +530,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
           ],
           'cmdname' => 'verbatiminclude',
           'extra' => {
-            'input_perl_encoding' => 'utf-8',
+            'input_encoding_name' => 'utf-8',
             'text_arg' => 'verb.txt'
           },
           'info' => {
diff --git a/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl 
b/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
index 805ea603b4..77b73187fa 100644
--- a/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
+++ b/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
@@ -28,7 +28,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -64,7 +64,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -108,7 +108,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -152,7 +152,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -196,7 +196,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -240,7 +240,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 1bf8cb94be..72240f94e4 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -397,7 +397,7 @@ $result_trees{'commands_and_spaces'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -488,7 +488,7 @@ $result_trees{'commands_and_spaces'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
diff --git a/tp/t/results/xml_tests/image_inline_or_not.pl 
b/tp/t/results/xml_tests/image_inline_or_not.pl
index e7010570e0..ed4993d550 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -22,7 +22,7 @@ $result_trees{'image_inline_or_not'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -57,7 +57,7 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -149,7 +149,7 @@ $result_trees{'image_inline_or_not'} = {
           ],
           'cmdname' => 'image',
           'extra' => {
-            'input_perl_encoding' => 'utf-8'
+            'input_encoding_name' => 'utf-8'
           },
           'source_info' => {
             'file_name' => '',
@@ -184,7 +184,7 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -238,7 +238,7 @@ $result_trees{'image_inline_or_not'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -272,7 +272,7 @@ $result_trees{'image_inline_or_not'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -348,7 +348,7 @@ $result_trees{'image_inline_or_not'} = {
                   ],
                   'cmdname' => 'image',
                   'extra' => {
-                    'input_perl_encoding' => 'utf-8'
+                    'input_encoding_name' => 'utf-8'
                   },
                   'source_info' => {
                     'file_name' => '',
@@ -381,7 +381,7 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -488,7 +488,7 @@ $result_trees{'image_inline_or_not'} = {
                               ],
                               'cmdname' => 'image',
                               'extra' => {
-                                'input_perl_encoding' => 'utf-8'
+                                'input_encoding_name' => 'utf-8'
                               },
                               'source_info' => {
                                 'file_name' => '',
@@ -541,7 +541,7 @@ $result_trees{'image_inline_or_not'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -576,7 +576,7 @@ $result_trees{'image_inline_or_not'} = {
                           ],
                           'cmdname' => 'image',
                           'extra' => {
-                            'input_perl_encoding' => 'utf-8'
+                            'input_encoding_name' => 'utf-8'
                           },
                           'source_info' => {
                             'file_name' => '',
@@ -609,7 +609,7 @@ $result_trees{'image_inline_or_not'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -714,7 +714,7 @@ $result_trees{'image_inline_or_not'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -752,7 +752,7 @@ $result_trees{'image_inline_or_not'} = {
                           ],
                           'cmdname' => 'image',
                           'extra' => {
-                            'input_perl_encoding' => 'utf-8'
+                            'input_encoding_name' => 'utf-8'
                           },
                           'source_info' => {
                             'file_name' => '',
@@ -799,7 +799,7 @@ $result_trees{'image_inline_or_not'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -838,7 +838,7 @@ $result_trees{'image_inline_or_not'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -906,7 +906,7 @@ $result_trees{'image_inline_or_not'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -998,7 +998,7 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -1048,7 +1048,7 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -1100,7 +1100,7 @@ $result_trees{'image_inline_or_not'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -1169,7 +1169,7 @@ $result_trees{'image_inline_or_not'} = {
                           ],
                           'cmdname' => 'image',
                           'extra' => {
-                            'input_perl_encoding' => 'utf-8'
+                            'input_encoding_name' => 'utf-8'
                           },
                           'source_info' => {
                             'file_name' => '',
@@ -1263,7 +1263,7 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'image',
               'extra' => {
-                'input_perl_encoding' => 'utf-8'
+                'input_encoding_name' => 'utf-8'
               },
               'source_info' => {
                 'file_name' => '',
@@ -1297,7 +1297,7 @@ $result_trees{'image_inline_or_not'} = {
                       ],
                       'cmdname' => 'image',
                       'extra' => {
-                        'input_perl_encoding' => 'utf-8'
+                        'input_encoding_name' => 'utf-8'
                       },
                       'source_info' => {
                         'file_name' => '',
@@ -1323,7 +1323,7 @@ $result_trees{'image_inline_or_not'} = {
                           ],
                           'cmdname' => 'image',
                           'extra' => {
-                            'input_perl_encoding' => 'utf-8'
+                            'input_encoding_name' => 'utf-8'
                           },
                           'source_info' => {
                             'file_name' => '',



reply via email to

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