branch master updated: * tp/Texinfo/Convert/HTML.pm (_accent_entities_html_accent): do not call xml_accent if accents are not formatted in the end as the only case where it should happen is @dotless with an unknown argument, and xml_accent will not handle it better, simply return the formatted accent argument. Same as in C.

[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 ca880b145d * tp/Texinfo/Convert/HTML.pm 
(_accent_entities_html_accent): do not call xml_accent if accents are not 
formatted in the end as the only case where it should happen is @dotless with 
an unknown argument, and xml_accent will not handle it better, simply return 
the formatted accent argument.  Same as in C.
ca880b145d is described below

commit ca880b145da0e32bc7a9bc3b51610f314393779f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Dec 30 12:48:41 2023 +0100

    * tp/Texinfo/Convert/HTML.pm (_accent_entities_html_accent): do not
    call xml_accent if accents are not formatted in the end as the only
    case where it should happen is @dotless with an unknown argument, and
    xml_accent will not handle it better, simply return the formatted
    accent argument.  Same as in C.
---
 ChangeLog                  |  8 ++++++++
 tp/Texinfo/Convert/HTML.pm | 12 ++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c939717e8e..bd7814342c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-12-30  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_accent_entities_html_accent): do not
+       call xml_accent if accents are not formatted in the end as the only
+       case where it should happen is @dotless with an unknown argument, and
+       xml_accent will not handle it better, simply return the formatted
+       accent argument.  Same as in C.
+
 2023-12-30  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/convert_html.c (html_command_filename): set
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index e7cd3ad2f1..ab91aba8ea 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -3802,7 +3802,7 @@ sub _accent_entities_html_accent($$$;$$$)
   my $accent = $command->{'cmdname'};
 
   if ($in_upper_case and $text =~ /^\w$/) {
-    $text = uc ($text);
+    $text = uc($text);
   }
 
   # do not return a dotless i or j as such if it is further composed
@@ -3844,8 +3844,12 @@ sub _accent_entities_html_accent($$$;$$$)
       return $formatted_accent;
     }
   }
-  return $self->xml_accent($text, $command, $in_upper_case,
-                           $use_numeric_entities);
+
+  # should only be the case of @dotless, as other commands have a diacritic
+  # associated, and only if the argument is not i nor j.
+  return $text;
+  #return $self->xml_accent($text, $command, $in_upper_case,
+  #                         $use_numeric_entities);
 }
 
 sub _accent_entities_numeric_entities_accent($$$;$)
@@ -3890,7 +3894,7 @@ sub _css_string_accent($$$;$)
   my $accent = $command->{'cmdname'};
 
   if ($in_upper_case and $text =~ /^\p{Word}$/) {
-    $text = uc ($text);
+    $text = uc($text);
   }
   if (exists($Texinfo::Convert::Unicode::unicode_accented_letters{$accent})
       and exists($Texinfo::Convert::Unicode::unicode_accented_letters{