[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_def_line_t
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): call convert_tree and not _convert. |
Date: |
Sun, 24 Dec 2023 17:54:39 -0500 |
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 44c7549aa4 * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): call
convert_tree and not _convert.
44c7549aa4 is described below
commit 44c7549aa458b1040d006ec544b4a733df8fb5b1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Dec 24 23:54:36 2023 +0100
* tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): call
convert_tree and not _convert.
---
ChangeLog | 5 +++++
tp/Texinfo/Convert/HTML.pm | 16 ++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b01e1dda20..41d8de7c02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-24 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): call
+ convert_tree and not _convert.
+
2023-12-24 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/build_html_perl_state.c: remove
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index bc67c87376..4a37e8ed3d 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -7300,8 +7300,8 @@ sub _convert_def_line_type($$$$)
my $def_call = '';
if ($type_element) {
- my $type_text = $self->_convert({'type' => '_code',
- 'contents' => [$type_element]});
+ my $type_text = $self->convert_tree({'type' => '_code',
+ 'contents' => [$type_element]});
if ($type_text ne '') {
$def_call .= $self->html_attribute_class('code', ['def-type']).'>'.
$type_text .'</code>';
@@ -7317,7 +7317,7 @@ sub _convert_def_line_type($$$$)
if ($name_element) {
$def_call .= $self->html_attribute_class('strong', ['def-name']).'>'.
- $self->_convert({'type' => '_code', 'contents' => [$name_element]})
+ $self->convert_tree({'type' => '_code', 'contents' => [$name_element]})
.'</strong>';
}
@@ -7325,8 +7325,8 @@ sub _convert_def_line_type($$$$)
# arguments not only metasyntactic variables
# (deftypefn, deftypevr, deftypeop, deftypecv)
if ($Texinfo::Common::def_no_var_arg_commands{$base_command_name}) {
- my $arguments_formatted = $self->_convert({'type' => '_code',
- 'contents' => [$arguments]});
+ my $arguments_formatted = $self->convert_tree({'type' => '_code',
+ 'contents' => [$arguments]});
if ($arguments_formatted =~ /\S/) {
$def_call .= ' ' unless($element->{'extra'}->{'omit_def_name_space'});
$def_call .= $self->html_attribute_class('code',
@@ -7337,7 +7337,7 @@ sub _convert_def_line_type($$$$)
# only metasyntactic variable arguments (deffn, defvr, deftp, defop,
defcv)
# FIXME not part of the API
_set_code_context($self, 0);
- my $arguments_formatted = $self->_convert($arguments);
+ my $arguments_formatted = $self->convert_tree($arguments);
_pop_code_context($self);
if ($arguments_formatted =~ /\S/) {
$def_call .= ' ' unless($element->{'extra'}->{'omit_def_name_space'});
@@ -11531,8 +11531,8 @@ sub convert($$)
$self->_reset_info();
# main conversion here
- my $result = $self->_html_convert_convert ($root, $output_units,
- $special_units);
+ my $result = $self->_html_convert_convert($root, $output_units,
+ $special_units);
$self->_finalize_output_state();
return $result;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): call convert_tree and not _convert.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/XS/convert/build_html_perl_state.c: remove build_html_formatting_context_ctx, build_html_formatting_context, build_html_formatting_context_stack, build_html_composition_context_stack, build_html_preformatted_classes_stack and build_html_block_commands_stack, which are not used since the states are accessed through overrides and not passed to perl.
- Next by Date:
branch master updated: * tp/Texinfo/Convert/HTML.pm (%default_commands_args) (_convert_explained_command), tp/Texinfo/XS/convert/convert_html.c (default_commands_args, convert_explained_command): set 'normal' command arg for the second argument of explained commands and use it instead of calling convert_tree in convert_explained_command.
- Previous by thread:
branch master updated: * tp/Texinfo/XS/convert/build_html_perl_state.c: remove build_html_formatting_context_ctx, build_html_formatting_context, build_html_formatting_context_stack, build_html_composition_context_stack, build_html_preformatted_classes_stack and build_html_block_commands_stack, which are not used since the states are accessed through overrides and not passed to perl.
- Next by thread:
branch master updated: * tp/Texinfo/Convert/HTML.pm (%default_commands_args) (_convert_explained_command), tp/Texinfo/XS/convert/convert_html.c (default_commands_args, convert_explained_command): set 'normal' command arg for the second argument of explained commands and use it instead of calling convert_tree in convert_explained_command.
- Index(es):