branch master updated: * tp/Texinfo/XS/convert/convert_html.c (html_converter_initialize): fix setting HF_composition_context for HTML_align_cmd.

[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 b395fa9f8e * tp/Texinfo/XS/convert/convert_html.c 
(html_converter_initialize): fix setting HF_composition_context for 
HTML_align_cmd.
b395fa9f8e is described below

commit b395fa9f8ef355aedb168d9f7753a91d1a8882ff
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 28 17:23:01 2023 +0200

    * tp/Texinfo/XS/convert/convert_html.c (html_converter_initialize):
    fix setting HF_composition_context for HTML_align_cmd.
    
    * tp/Texinfo/XS/main/build_perl_info.c (build_html_document_context):
    fix name of monospace context key in perl.
    
    * tp/Texinfo/Convert/HTML.pm (_convert): minor change for
    monospacestring argument formatting to be more consistent with other
    codes and with XS code.
---
 ChangeLog                            | 12 ++++++++++++
 tp/Texinfo/Convert/HTML.pm           |  4 +++-
 tp/Texinfo/XS/convert/convert_html.c |  5 ++++-
 tp/Texinfo/XS/main/build_perl_info.c |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47d7b5d5ad..deea2bf18d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-10-28  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/convert_html.c (html_converter_initialize):
+       fix setting HF_composition_context for HTML_align_cmd.
+
+       * tp/Texinfo/XS/main/build_perl_info.c (build_html_document_context):
+       fix name of monospace context key in perl.
+
+       * tp/Texinfo/Convert/HTML.pm (_convert): minor change for
+       monospacestring argument formatting to be more consistent with other
+       codes and with XS code.
+
 2023-10-28  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/convert_html.c (convert_to_html_internal),
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 47ea8158a6..1a01f8b9e1 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -7056,6 +7056,7 @@ sub _convert_def_line_type($$$$)
           if ($arguments_formatted =~ /\S/);
     } else {
       # only metasyntactic variable arguments (deffn, defvr, deftp, defop, 
defcv)
+      # FIXME should not access directly 'document_context'
       push @{$self->{'document_context'}->[-1]->{'monospace'}}, 0;
       my $arguments_formatted = $self->_convert({'contents' => [$arguments]});
       pop @{$self->{'document_context'}->[-1]->{'monospace'}};
@@ -12233,9 +12234,10 @@ sub _convert($$;$)
                 $self->_pop_document_context();
               } elsif ($arg_type eq 'monospacestring') {
                 $self->_new_document_context($command_type);
-                $self->{'document_context'}->[-1]->{'monospace'}->[-1] = 1;
+                push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1;
                 $self->{'document_context'}->[-1]->{'string'}++;
                 $arg_formatted->{$arg_type} = $self->_convert($arg, 
$explanation);
+                pop @{$self->{'document_context'}->[-1]->{'monospace'}};
                 $self->_pop_document_context();
               } elsif ($arg_type eq 'monospacetext') {
                 $arg_formatted->{$arg_type}
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index f0320aa08b..653d67185d 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -2251,7 +2251,10 @@ html_converter_initialize (CONVERTER *self)
     register_format_context_command (additional_format_context_cmd[i]);
 
   for (i = 0; HTML_align_cmd[i]; i++)
-    html_commands_data[i].flags |= HF_HTML_align | HF_composition_context;
+    {
+      enum command_id cmd = HTML_align_cmd[i];
+      html_commands_data[cmd].flags |= HF_HTML_align | HF_composition_context;
+    }
 
   html_commands_data[CM_float].flags |= HF_composition_context;
 
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index 6acee63570..4140f2a64e 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -1830,7 +1830,7 @@ build_html_document_context (HTML_DOCUMENT_CONTEXT 
*document_context)
       av_push (monospace_context_av, newSViv (context));
     }
 
-  STORE ("monospace_context", newRV_noinc ((SV *) monospace_context_av));
+  STORE ("monospace", newRV_noinc ((SV *) monospace_context_av));
 
   for (i = 0; i < document_context->composition_context.top; i++)
     {