[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/XS/convert/convert_html.c (html_conv
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/XS/convert/convert_html.c (html_convert_tree_append): rename convert_tree_append as html_convert_tree_append. Update callers. |
|
Date: |
Fri, 04 Oct 2024 19:19:49 -0400 |
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 911cedd534 * tp/Texinfo/XS/convert/convert_html.c
(html_convert_tree_append): rename convert_tree_append as
html_convert_tree_append. Update callers.
911cedd534 is described below
commit 911cedd53487dafece420df8e244954c7780371e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Aug 15 12:27:35 2024 +0200
* tp/Texinfo/XS/convert/convert_html.c (html_convert_tree_append):
rename convert_tree_append as html_convert_tree_append. Update
callers.
---
ChangeLog | 6 ++++++
tp/Texinfo/XS/convert/convert_html.c | 29 ++++++++++++--------------
tp/Texinfo/XS/convert/convert_html.h | 4 ++--
tp/Texinfo/XS/convert/format_html.c | 40 ++++++++++++++++++------------------
4 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 636e58da53..313762683b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,12 @@
(html_default_format_node_redirection_page)
(html_default_format_special_body_about): fix function names.
+2024-08-15 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/convert/convert_html.c (html_convert_tree_append):
+ rename convert_tree_append as html_convert_tree_append. Update
+ callers.
+
2024-08-15 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/html_converter_types.h: declare
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index 4343cf8706..dfaf459a2d 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -221,9 +221,6 @@ remove_tree_to_build (CONVERTER *self, ELEMENT *e)
remove_element_from_list (&self->tree_to_build, e);
}
-void convert_tree_append (CONVERTER *self, const ELEMENT *e,
- TEXT *result, const char *explanation);
-
void
html_translate_convert_tree_append (const char *string,
CONVERTER *self,
@@ -235,7 +232,7 @@ html_translate_convert_tree_append (const char *string,
replaced_substrings, translation_context);
add_tree_to_build (self, translation_tree);
- convert_tree_append (self, translation_tree, result, explanation);
+ html_convert_tree_append (self, translation_tree, result, explanation);
remove_tree_to_build (self, translation_tree);
destroy_element_and_children (translation_tree);
@@ -249,7 +246,7 @@ html_convert_tree (CONVERTER *self, const ELEMENT *tree,
TEXT result;
text_init (&result);
- convert_tree_append (self, tree, &result, explanation);
+ html_convert_tree_append (self, tree, &result, explanation);
return result.text;
}
@@ -1150,7 +1147,7 @@ debug_print_html_contexts (const CONVERTER *self)
/* EXPLANATION is used for debugging */
void
-convert_tree_append (CONVERTER *self, const ELEMENT *element,
+html_convert_tree_append (CONVERTER *self, const ELEMENT *element,
TEXT *result, const char *explanation)
{
/* for debugging, for explanations */
@@ -1337,7 +1334,7 @@ convert_tree_append (CONVERTER *self, const ELEMENT
*element,
char *explanation;
xasprintf (&explanation, "%s c[%zu]", command_type.text,
content_idx);
- convert_tree_append (self, content,
+ html_convert_tree_append (self, content,
&content_formatted,
explanation);
free (explanation);
@@ -1412,7 +1409,7 @@ convert_tree_append (CONVERTER *self, const ELEMENT
*element,
{
xasprintf (&explanation, "%s A[%zu]normal",
command_type.text, arg_idx);
- convert_tree_append (self, arg,
+ html_convert_tree_append (self, arg,
&formatted_arg,
explanation);
free (explanation);
@@ -1430,7 +1427,7 @@ convert_tree_append (CONVERTER *self, const ELEMENT
*element,
push_integer_stack_integer (
&top_document_ctx->monospace, 1);
- convert_tree_append (self, arg, &formatted_arg,
+ html_convert_tree_append (self, arg, &formatted_arg,
explanation);
pop_integer_stack
(&top_document_ctx->monospace);
@@ -1450,7 +1447,7 @@ convert_tree_append (CONVERTER *self, const ELEMENT
*element,
xasprintf (&explanation, "%s A[%zu]string",
command_type.text, arg_idx);
- convert_tree_append (self, arg, &formatted_arg,
+ html_convert_tree_append (self, arg, &formatted_arg,
explanation);
free (explanation);
@@ -1472,7 +1469,7 @@ convert_tree_append (CONVERTER *self, const ELEMENT
*element,
&string_document_ctx->monospace, 1);
xasprintf (&explanation, "%s A[%zu]monospacestring",
command_type.text, arg_idx);
- convert_tree_append (self, arg, &formatted_arg,
+ html_convert_tree_append (self, arg, &formatted_arg,
explanation);
free (explanation);
@@ -1533,7 +1530,7 @@ convert_tree_append (CONVERTER *self, const ELEMENT
*element,
top_document_ctx->raw_ctx++;
xasprintf (&explanation, "%s A[%zu]raw",
command_type.text, arg_idx);
- convert_tree_append (self, arg, &formatted_arg,
+ html_convert_tree_append (self, arg, &formatted_arg,
explanation);
free (explanation);
@@ -1610,7 +1607,7 @@ convert_tree_append (CONVERTER *self, const ELEMENT
*element,
{
if (element->e.c->args.number > 0)
{
- convert_tree_append (self, element->e.c->args.list[0],
+ html_convert_tree_append (self, element->e.c->args.list[0],
&content_formatted,
"DEFINFOENCLOSE_ARG");
}
@@ -1627,7 +1624,7 @@ convert_tree_append (CONVERTER *self, const ELEMENT
*element,
char *explanation;
xasprintf (&explanation, "%s c[%zu]", command_type.text,
content_idx);
- convert_tree_append (self, content, &content_formatted,
+ html_convert_tree_append (self, content, &content_formatted,
explanation);
free (explanation);
}
@@ -1672,7 +1669,7 @@ convert_tree_append (CONVERTER *self, const ELEMENT
*element,
const ELEMENT *content = element->e.c->contents.list[content_idx];
char *explanation;
xasprintf (&explanation, " C[%zu]", content_idx);
- convert_tree_append (self, content, &content_formatted,
+ html_convert_tree_append (self, content, &content_formatted,
explanation);
free (explanation);
}
@@ -1748,7 +1745,7 @@ convert_output_unit (CONVERTER *self, const OUTPUT_UNIT
*output_unit,
char *content_explanation;
xasprintf (&content_explanation, "%s c[%zu]",
output_unit_type_names[unit_type], content_idx);
- convert_tree_append (self, content, &content_formatted,
+ html_convert_tree_append (self, content, &content_formatted,
content_explanation);
free (content_explanation);
}
diff --git a/tp/Texinfo/XS/convert/convert_html.h
b/tp/Texinfo/XS/convert/convert_html.h
index c931041228..9457769dad 100644
--- a/tp/Texinfo/XS/convert/convert_html.h
+++ b/tp/Texinfo/XS/convert/convert_html.h
@@ -39,8 +39,8 @@ void remove_tree_to_build (CONVERTER *self, ELEMENT *e);
char *html_convert_tree (CONVERTER *self, const ELEMENT *tree,
const char *explanation);
-void convert_tree_append (CONVERTER *self, const ELEMENT *e,
- TEXT *result, const char *explanation);
+void html_convert_tree_append (CONVERTER *self, const ELEMENT *e,
+ TEXT *result, const char *explanation);
void html_translate_convert_tree_append (const char *string,
CONVERTER *self,
NAMED_STRING_ELEMENT_LIST *replaced_substrings,
diff --git a/tp/Texinfo/XS/convert/format_html.c
b/tp/Texinfo/XS/convert/format_html.c
index 76a41bce61..096c0865da 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -3378,7 +3378,7 @@ html_default_format_program_string (CONVERTER *self, TEXT
*result)
explanation = "Tr program string date";
}
add_tree_to_build (self, tree);
- convert_tree_append (self, tree, result, explanation);
+ html_convert_tree_append (self, tree, result, explanation);
remove_tree_to_build (self, tree);
destroy_element_and_children (tree);
}
@@ -3480,7 +3480,7 @@ html_default_format_end_file (CONVERTER *self, const char
*filename,
tree = html_cdt_tree ("JavaScript license information",
self, 0, 0);
add_tree_to_build (self, tree);
- convert_tree_append (self, tree, &result,
+ html_convert_tree_append (self, tree, &result,
"Tr JS license header");
remove_tree_to_build (self, tree);
@@ -5458,7 +5458,7 @@ html_convert_today_command (CONVERTER *self, const enum
command_id cmd,
add_tree_to_build (self, today_element);
- convert_tree_append (self, today_element, result, "convert today");
+ html_convert_tree_append (self, today_element, result, "convert today");
remove_tree_to_build (self, today_element);
destroy_element_and_children (today_element);
@@ -5586,7 +5586,7 @@ html_convert_value_command (CONVERTER *self, const enum
command_id cmd,
self, substrings, 0);
add_tree_to_build (self, tree);
- convert_tree_append (self, tree, result, "Tr missing value");
+ html_convert_tree_append (self, tree, result, "Tr missing value");
remove_tree_to_build (self, tree);
destroy_element_and_children (tree);
@@ -5773,7 +5773,7 @@ html_convert_explained_command (CONVERTER *self, const
enum command_id cmd,
xasprintf (&context_str, "convert explained %s",
builtin_command_name (cmd));
add_tree_to_build (self, tree);
- convert_tree_append (self, tree, result, context_str);
+ html_convert_tree_append (self, tree, result, context_str);
remove_tree_to_build (self, tree);
free (context_str);
/* should destroy explained_*_element */
@@ -6962,7 +6962,7 @@ html_convert_heading_command (CONVERTER *self, const enum
command_id cmd,
if (menu_node)
{
add_tree_to_build (self, menu_node);
- convert_tree_append (self, menu_node,
+ html_convert_tree_append (self, menu_node,
&toc_or_mini_toc_or_auto_menu,
"master menu");
remove_tree_to_build (self, menu_node);
@@ -7815,7 +7815,7 @@ html_convert_xref_command (CONVERTER *self, const enum
command_id cmd,
char *context_str;
xasprintf (&context_str, "convert xref %s", builtin_command_name (cmd));
add_tree_to_build (self, tree);
- convert_tree_append (self, tree, result, context_str);
+ html_convert_tree_append (self, tree, result, context_str);
remove_tree_to_build (self, tree);
free (context_str);
/* should destroy reference_element and book_element */
@@ -8743,7 +8743,7 @@ html_convert_verbatiminclude_command (CONVERTER *self,
if (verbatim_include_verbatim)
{
add_tree_to_build (self, verbatim_include_verbatim);
- convert_tree_append (self, verbatim_include_verbatim,
+ html_convert_tree_append (self, verbatim_include_verbatim,
result, "convert verbatiminclude");
remove_tree_to_build (self, verbatim_include_verbatim);
destroy_element_and_children (verbatim_include_verbatim);
@@ -9095,7 +9095,7 @@ html_convert_item_command (CONVERTER *self, const enum
command_id cmd,
else
converted_e = element->e.c->args.list[0];
- convert_tree_append (self, converted_e, result,
+ html_convert_tree_append (self, converted_e, result,
"convert table_item_tree");
if (pre_class_close)
@@ -9221,7 +9221,7 @@ html_convert_insertcopying_command (CONVERTER *self,
const enum command_id cmd,
{
ELEMENT *tmp = new_element (ET_NONE);
tmp->e.c->contents =
self->document->global_commands.copying->e.c->contents;
- convert_tree_append (self, tmp, result, "convert insertcopying");
+ html_convert_tree_append (self, tmp, result, "convert insertcopying");
tmp->e.c->contents.list = 0;
destroy_element (tmp);
}
@@ -11181,7 +11181,7 @@ html_convert_untranslated_def_line_arg_type
add_tree_to_build (self, translated);
- convert_tree_append (self, translated, result,
+ html_convert_tree_append (self, translated, result,
"translated TEXT");
remove_tree_to_build (self, translated);
@@ -11431,9 +11431,9 @@ html_convert_menu_entry_type (CONVERTER *self, const
enum element_type type,
if (name_entry)
{
- convert_tree_append (self, name_entry, result,
+ html_convert_tree_append (self, name_entry, result,
"menu_arg menu_entry_name preformatted");
- convert_tree_append (self,
+ html_convert_tree_append (self,
menu_entry_separators[entry_separators_idx],
result, "menu_arg name separator preformatted");
entry_separators_idx++;
@@ -11452,7 +11452,7 @@ html_convert_menu_entry_type (CONVERTER *self, const
enum element_type type,
add_tree_to_build (self, root_code);
- convert_tree_append (self, root_code, result,
+ html_convert_tree_append (self, root_code, result,
"menu_arg menu_entry_node preformatted");
remove_tree_to_build (self, root_code);
@@ -11465,7 +11465,7 @@ html_convert_menu_entry_type (CONVERTER *self, const
enum element_type type,
if (entry_separators_idx < entry_separators_nr)
{
- convert_tree_append (self,
+ html_convert_tree_append (self,
menu_entry_separators[entry_separators_idx],
result, "menu_arg node separator preformatted");
entry_separators_idx++;
@@ -11518,7 +11518,7 @@ html_convert_menu_entry_type (CONVERTER *self, const
enum element_type type,
}
else if (menu_description)
{
- convert_tree_append (self, menu_description, result,
+ html_convert_tree_append (self, menu_description, result,
"menu_arg description preformatted");
}
}
@@ -11936,7 +11936,7 @@ html_convert_def_line_type (CONVERTER *self, const enum
element_type type,
free (attribute_class);
text_append_n (&def_call, ">", 1);
- convert_tree_append (self, root_code, &def_call, explanation);
+ html_convert_tree_append (self, root_code, &def_call, explanation);
remove_tree_to_build (self, root_code);
destroy_element (root_code);
@@ -12036,7 +12036,7 @@ html_convert_def_line_type (CONVERTER *self, const enum
element_type type,
if (category_tree)
{
add_tree_to_build (self, category_tree);
- convert_tree_append (self, category_tree, result, 0);
+ html_convert_tree_append (self, category_tree, result, 0);
remove_tree_to_build (self, category_tree);
destroy_element_and_children (category_tree);
}
@@ -12127,7 +12127,7 @@ html_convert_def_line_type (CONVERTER *self, const enum
element_type type,
}
free (attribute_open);
add_tree_to_build (self, category_tree);
- convert_tree_append (self, category_tree, result, explanation);
+ html_convert_tree_append (self, category_tree, result, explanation);
remove_tree_to_build (self, category_tree);
destroy_element_and_children (category_tree);
if (open_len)
@@ -12483,7 +12483,7 @@ html_default_format_titlepage (CONVERTER *self)
{
ELEMENT *tmp = new_element (ET_NONE);
tmp->e.c->contents =
self->document->global_commands.titlepage->e.c->contents;
- convert_tree_append (self, tmp, &result, "convert titlepage");
+ html_convert_tree_append (self, tmp, &result, "convert titlepage");
tmp->e.c->contents.list = 0;
destroy_element (tmp);
titlepage_text = 1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/XS/convert/convert_html.c (html_convert_tree_append): rename convert_tree_append as html_convert_tree_append. Update callers.,
Patrice Dumas <=