branch master updated: * tp/Texinfo/Convert/HTML.pm (%default_commands_args) (_convert_image_command): use monospacestring for the base image file formatted as a string instead of protecting plain text conversion.

[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 056d801de0 * tp/Texinfo/Convert/HTML.pm (%default_commands_args) 
(_convert_image_command): use monospacestring for the base image file formatted 
as a string instead of protecting plain text conversion.
056d801de0 is described below

commit 056d801de08ec14d10bb8daf4d6abd4085697984
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 7 12:42:16 2022 +0200

    * tp/Texinfo/Convert/HTML.pm (%default_commands_args)
    (_convert_image_command): use monospacestring for
    the base image file formatted as a string instead of
    protecting plain text conversion.
---
 ChangeLog                  |  7 +++++++
 tp/Texinfo/Convert/HTML.pm | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e863de637..d623b2157a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,13 @@
        braces to avoid buggy treatment of square brackets in a section
        title.  The problems occur when the titleps package in is use.
 
+2022-08-07  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (%default_commands_args)
+       (_convert_image_command): use monospacestring for
+       the base image file formatted as a string instead of
+       protecting plain text conversion.
+
 2022-08-07  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (%default_commands_args)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 944970c9d6..0e09431e2d 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2145,7 +2145,7 @@ my %default_commands_args = (
   'xref' => [['monospace'],['normal'],['normal'],['monospacetext'],['normal']],
   'pxref' => 
[['monospace'],['normal'],['normal'],['monospacetext'],['normal']],
   'ref' => [['monospace'],['normal'],['normal'],['monospacetext'],['normal']],
-  'image' => [['monospacetext'],['monospacetext'],['monospacetext'],['string', 
'normal'],['monospacetext']],
+  'image' => [['monospacetext', 
'monospacestring'],['monospacetext'],['monospacetext'],['string', 
'normal'],['monospacetext']],
   # FIXME shouldn't it better not to convert if later ignored?
   'inlinefmt' => [['monospacetext'],['normal']],
   'inlinefmtifelse' => [['monospacetext'],['normal'],['normal']],
@@ -2886,8 +2886,11 @@ sub _convert_image_command($$$$)
 
   if (defined($args->[0]->{'monospacetext'})
       and $args->[0]->{'monospacetext'} ne '') {
+    my $basefile_string = '';
+    $basefile_string = $args->[0]->{'monospacestring'}
+        if (defined($args->[0]->{'monospacestring'}));
+    return $basefile_string if ($self->in_string());
     my $basefile = $args->[0]->{'monospacetext'};
-    return $basefile if ($self->in_string());
     my ($image_file, $image_basefile, $image_extension, $image_path)
       = $self->html_image_file_location_name($cmdname, $command, $args);
     if (not defined($image_path)) {
@@ -2903,8 +2906,7 @@ sub _convert_image_command($$$$)
       $alt_string = $args->[3]->{'string'};
     }
     if (!defined($alt_string) or ($alt_string eq '')) {
-      $alt_string
-       = &{$self->formatting_function('format_protect_text')}($self, 
$basefile);
+      $alt_string = $basefile_string;
     }
     return $self->close_html_lone_element(
       $self->html_attribute_class('img', [$cmdname])