texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Sat, 30 Mar 2024 11:57:45 -0400 (EDT)

branch: master
commit e482a67bbf505c058501739bb0b8b303037e5671
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Mar 30 16:57:36 2024 +0100

    * tp/Texinfo/Convert/HTML.pm (_prepare_converted_output_info): avoid
    having _string the type of a container containing directly the content
    of another tree element.
    
    * tp/Texinfo/XS/convert/convert_html.c (convert_value_command): fix
    explanation argument.
---
 ChangeLog                            | 9 +++++++++
 tp/Texinfo/Convert/HTML.pm           | 5 +++--
 tp/Texinfo/XS/convert/convert_html.c | 4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79437b3289..62d9d6875e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-03-30  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_prepare_converted_output_info): avoid
+       having _string the type of a container containing directly the content
+       of another tree element.
+
+       * tp/Texinfo/XS/convert/convert_html.c (convert_value_command): fix
+       explanation argument.
+
 2024-03-30  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (_default_format_special_body_about):
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index f30d95747d..4bb0ad5eb1 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -12480,10 +12480,11 @@ sub _prepare_converted_output_info($)
     $self->{'documentdescription_string'}
       = $self->get_conf('documentdescription');
   } elsif ($global_commands and $global_commands->{'documentdescription'}) {
+    my $tmp = {'contents'
+               => $global_commands->{'documentdescription'}->{'contents'}};
     $self->{'documentdescription_string'}
       = $self->convert_tree_new_formatting_context({'type' => '_string',
-                                                    'contents' =>
-                     $global_commands->{'documentdescription'}->{'contents'}},
+                                                    'contents' => [$tmp],},
                                                    'documentdescription');
     chomp($self->{'documentdescription_string'});
   }
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 0345d8fcbb..a52a6b880e 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -8604,10 +8604,10 @@ convert_value_command (CONVERTER *self, const enum 
command_id cmd,
                                             "value", value_text);
 
   tree = html_cdt_tree ("@{No value for `{value}'@}",
-                        self, substrings, "Tr missing value");
+                        self, substrings, 0);
 
   add_tree_to_build (self, tree);
-  convert_to_html_internal (self, tree, result, 0);
+  convert_to_html_internal (self, tree, result, "Tr missing value");
   remove_tree_to_build (self, tree);
 
   destroy_element_and_children (tree);



reply via email to

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