branch master updated: * tta/C/convert/converter.c (default_bullet_command) (setup_converter_generic, itemize_item_prepended_element), tta/C/convert/format_html.c (html_convert_itemize_command), tta/C/main/manipulate_tree.c, tta/perl/Texinfo/Common.pm ($default_bullet_command, itemize_item_prepended_element): move itemize_item_prepended_element to converter.c. Setup a default bullet element to be reused by itemize_item_prepended_element. Change itemize_item_prepended_element to return an already existing const [...]

[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 544bdd1f7b * tta/C/convert/converter.c (default_bullet_command) 
(setup_converter_generic, itemize_item_prepended_element), 
tta/C/convert/format_html.c (html_convert_itemize_command), 
tta/C/main/manipulate_tree.c, tta/perl/Texinfo/Common.pm 
($default_bullet_command, itemize_item_prepended_element): move 
itemize_item_prepended_element to converter.c.  Setup a default bullet element 
to be reused by itemize_item_prepended_element.  Change 
itemize_item_prepended_element to return an a [...]
544bdd1f7b is described below

commit 544bdd1f7bf8452dc892d7e902adb05f3c4b0eb8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Mar 29 19:59:31 2025 +0100

    * tta/C/convert/converter.c (default_bullet_command)
    (setup_converter_generic, itemize_item_prepended_element),
    tta/C/convert/format_html.c (html_convert_itemize_command),
    tta/C/main/manipulate_tree.c, tta/perl/Texinfo/Common.pm
    ($default_bullet_command, itemize_item_prepended_element): move
    itemize_item_prepended_element to converter.c.  Setup a default bullet
    element to be reused by itemize_item_prepended_element.  Change
    itemize_item_prepended_element to return an already existing const
    element.  Update caller.
---
 ChangeLog                    | 12 ++++++++++++
 tta/C/convert/converter.c    | 16 ++++++++++++++++
 tta/C/convert/converter.h    |  1 +
 tta/C/convert/format_html.c  |  3 +--
 tta/C/main/manipulate_tree.c | 29 -----------------------------
 tta/C/main/manipulate_tree.h |  4 ----
 tta/perl/Texinfo/Common.pm   |  4 +++-
 7 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 28130e2cdd..dd24a38a5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2025-03-29  Patrice Dumas  <pertusus@free.fr>
+
+       * tta/C/convert/converter.c (default_bullet_command)
+       (setup_converter_generic, itemize_item_prepended_element),
+       tta/C/convert/format_html.c (html_convert_itemize_command),
+       tta/C/main/manipulate_tree.c, tta/perl/Texinfo/Common.pm
+       ($default_bullet_command, itemize_item_prepended_element): move
+       itemize_item_prepended_element to converter.c.  Setup a default bullet
+       element to be reused by itemize_item_prepended_element.  Change
+       itemize_item_prepended_element to return an already existing const
+       element.  Update caller.
+
 2025-03-29  Patrice Dumas  <pertusus@free.fr>
 
        Deprecate @clickstyle
diff --git a/tta/C/convert/converter.c b/tta/C/convert/converter.c
index 37593a9c84..3f88b9c0fd 100644
--- a/tta/C/convert/converter.c
+++ b/tta/C/convert/converter.c
@@ -129,6 +129,7 @@ static size_t converter_space;
 const char *xml_text_entity_no_arg_commands_formatting[BUILTIN_CMD_NUMBER];
 
 static const ELEMENT *default_asis_command;
+static const ELEMENT *default_bullet_command;
 
 void
 setup_converter_generic (void)
@@ -155,6 +156,8 @@ setup_converter_generic (void)
     }
 
   default_asis_command = new_command_element (ET_brace_command, CM_asis);
+  default_bullet_command = new_command_element (ET_brace_noarg_command,
+                                                CM_bullet);
 }
 
 
@@ -1449,6 +1452,19 @@ new_text_element_added (TREE_ADDED_ELEMENTS 
*added_elements,
 
 
 
+const ELEMENT *
+itemize_item_prepended_element (const ELEMENT *block_line_arg)
+{
+  const ELEMENT *arg = block_line_argument_command (block_line_arg);
+
+  if (arg)
+    return arg;
+  else if (block_line_arg->e.c->contents.number == 0)
+    return default_bullet_command;
+  else
+    return block_line_arg;
+}
+
 const ELEMENT *
 item_line_block_line_argument_command (const ELEMENT *block_line_arg)
 {
diff --git a/tta/C/convert/converter.h b/tta/C/convert/converter.h
index c14fbe32e3..7d8c0edea9 100644
--- a/tta/C/convert/converter.h
+++ b/tta/C/convert/converter.h
@@ -206,6 +206,7 @@ void free_tree_added_elements (CONVERTER *self,
 void destroy_tree_added_elements (CONVERTER *self,
                                   TREE_ADDED_ELEMENTS *tree_elements);
 
+const ELEMENT *itemize_item_prepended_element (const ELEMENT *block_line_arg);
 TREE_ADDED_ELEMENTS *table_item_content_tree (CONVERTER *self,
                                               const ELEMENT *element);
 
diff --git a/tta/C/convert/format_html.c b/tta/C/convert/format_html.c
index 1a58378201..690fca91cd 100644
--- a/tta/C/convert/format_html.c
+++ b/tta/C/convert/format_html.c
@@ -8891,7 +8891,7 @@ html_convert_itemize_command (CONVERTER *self, const enum 
command_id cmd,
   const CSS_SELECTOR_STYLE *selector_style = 0;
   const ELEMENT *arguments_line;
   const ELEMENT *block_line_arg;
-  ELEMENT *prepended_element;
+  const ELEMENT *prepended_element;
 
   if (html_in_string (self))
     {
@@ -8916,7 +8916,6 @@ html_convert_itemize_command (CONVERTER *self, const enum 
command_id cmd,
           else
             mark_class_name = element_command_name (prepended_element);
         }
-      destroy_element_and_children (prepended_element);
     }
 
   classes = new_string_list ();
diff --git a/tta/C/main/manipulate_tree.c b/tta/C/main/manipulate_tree.c
index 1a38cf2c7d..705e4009d7 100644
--- a/tta/C/main/manipulate_tree.c
+++ b/tta/C/main/manipulate_tree.c
@@ -902,35 +902,6 @@ parse_node_manual (ELEMENT *node, int modify_node)
 
 
 
-/* here and not in utils because it depends on copy_tree */
-/* returned element should be destroyed by the caller */
-ELEMENT *
-itemize_item_prepended_element (const ELEMENT *block_line_arg)
-{
-  const ELEMENT *arg = block_line_argument_command (block_line_arg);
-  ELEMENT *e;
-
-  if (arg)
-    {
-      /* cast to remove const, as the tree is modified temporarily
-         during copy */
-      e = copy_tree ((ELEMENT *)arg, 0);
-    }
-  else if (block_line_arg->e.c->contents.number == 0)
-    {
-      e = new_command_element (ET_brace_noarg_command, CM_bullet);
-    }
-  else
-    {
-      /* cast to remove const, as the tree is modified temporarily
-         during copy */
-      e = copy_tree ((ELEMENT *)block_line_arg, 0);
-    }
-  return e;
-}
-
-
-
 uintptr_t
 set_element_tree_numbers (ELEMENT *element, uintptr_t current_nr)
 {
diff --git a/tta/C/main/manipulate_tree.h b/tta/C/main/manipulate_tree.h
index 4fc9fac77f..f71f131bf8 100644
--- a/tta/C/main/manipulate_tree.h
+++ b/tta/C/main/manipulate_tree.h
@@ -44,10 +44,6 @@ NODE_SPEC_EXTRA *parse_node_manual (ELEMENT *node, int 
modify_node);
 
 
 
-ELEMENT *itemize_item_prepended_element (const ELEMENT *block_line_arg);
-
-
-
 char *print_tree_details (ELEMENT *tree, const char *fname_encoding,
                           int use_filename);
 char *element_number_or_error (const ELEMENT *element);
diff --git a/tta/perl/Texinfo/Common.pm b/tta/perl/Texinfo/Common.pm
index 66063d0cd6..30f01f6562 100644
--- a/tta/perl/Texinfo/Common.pm
+++ b/tta/perl/Texinfo/Common.pm
@@ -876,6 +876,8 @@ sub block_line_argument_command($)
   return undef;
 }
 
+my $default_bullet_command = {'cmdname' => 'bullet'};
+
 sub itemize_item_prepended_element($)
 {
   my $block_line_arg = shift;
@@ -884,7 +886,7 @@ sub itemize_item_prepended_element($)
   if ($arg) {
     return $arg;
   } elsif (!$block_line_arg->{'contents'}) {
-    return {'cmdname' => 'bullet'};
+    return $default_bullet_command;
   } else {
     return $block_line_arg;
   }