branch master updated: * tp/Texinfo/Convert/Unicode.pm (%unicode_character_brace_no_arg_commands): revert use of charnames::vianame as an attempt to fix tests of @sc{@aa{}} in perl 5.10.1 (on solaris).

[Patrice Dumas]

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 84785f4992 * tp/Texinfo/Convert/Unicode.pm 
(%unicode_character_brace_no_arg_commands): revert use of charnames::vianame as 
an attempt to fix tests of @sc{@aa{}} in perl 5.10.1 (on solaris).
84785f4992 is described below

commit 84785f4992a7ec1dc399aafdbb8a049d9636dc91
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Jul 28 13:43:44 2023 +0200

    * tp/Texinfo/Convert/Unicode.pm
    (%unicode_character_brace_no_arg_commands): revert use of
    charnames::vianame as an attempt to fix tests of @sc{@aa{}} in
    perl 5.10.1 (on solaris).
---
 ChangeLog                     |  7 +++++++
 tp/Texinfo/Convert/Unicode.pm | 13 +++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f65aae98d9..0bdf3db308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-07-28  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Unicode.pm
+       (%unicode_character_brace_no_arg_commands): revert use of
+       charnames::vianame as an attempt to fix tests of @sc{@aa{}} in
+       perl 5.10.1 (on solaris).
+
 2023-07-28  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/parsetexi/Parsetexi.xs (init): use macro corresponding
diff --git a/tp/Texinfo/Convert/Unicode.pm b/tp/Texinfo/Convert/Unicode.pm
index 03d15f5433..f1e80bda7e 100644
--- a/tp/Texinfo/Convert/Unicode.pm
+++ b/tp/Texinfo/Convert/Unicode.pm
@@ -569,8 +569,17 @@ our %extra_unicode_map = (
 our %unicode_character_brace_no_arg_commands;
 foreach my $command (keys(%unicode_map)) {
   if ($unicode_map{$command} ne '') {
-    $unicode_character_brace_no_arg_commands{$command}
-      = charnames::vianame("U+$unicode_map{$command}");
+    my $char_nr = hex($unicode_map{$command});
+    if ($char_nr > 126 and $char_nr < 255) {
+      # this is very strange, indeed.  The reason lies certainly in the
+      # magic backward compatibility support in Perl for 8bit encodings.
+      $unicode_character_brace_no_arg_commands{$command} =
+         Encode::decode("iso-8859-1", chr($char_nr));
+    } else {
+      $unicode_character_brace_no_arg_commands{$command} = chr($char_nr);
+    }
+#    $unicode_character_brace_no_arg_commands{$command}
+#      = charnames::vianame("U+$unicode_map{$command}");
   }
 }