[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * doc/texi2any_api.texi (Command Tree Element Con
From: |
Patrice Dumas |
Subject: |
branch master updated: * doc/texi2any_api.texi (Command Tree Element Conversion Functions), tp/Texinfo/Convert/HTML.pm (_convert, _convert_email_command) (_convert_explained_command, _convert_uref_command) (_convert_image_command, _convert_titlefont_command) (_convert_sp_command, _convert_center_command), tp/init/documentation_examples.pm, tp/init/html32.pm, tp/t/init/translate_txiinternalvalue_macro.init: if an argument is empty, set @$args for this argument to be undef instead of ignoring completly the command [...] |
Date: |
Sun, 22 Oct 2023 10:46:10 -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 35aec7d3ed * doc/texi2any_api.texi (Command Tree Element Conversion
Functions), tp/Texinfo/Convert/HTML.pm (_convert, _convert_email_command)
(_convert_explained_command, _convert_uref_command) (_convert_image_command,
_convert_titlefont_command) (_convert_sp_command, _convert_center_command),
tp/init/documentation_examples.pm, tp/init/html32.pm,
tp/t/init/translate_txiinternalvalue_macro.init: if an argument is empty, set
@$args for this argument to be undef instead of ignoring [...]
35aec7d3ed is described below
commit 35aec7d3ed7fe1e264a504fd6d80f1687f19f459
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Oct 22 16:46:09 2023 +0200
* doc/texi2any_api.texi (Command Tree Element Conversion Functions),
tp/Texinfo/Convert/HTML.pm (_convert, _convert_email_command)
(_convert_explained_command, _convert_uref_command)
(_convert_image_command, _convert_titlefont_command)
(_convert_sp_command, _convert_center_command),
tp/init/documentation_examples.pm, tp/init/html32.pm,
tp/t/init/translate_txiinternalvalue_macro.init: if an argument is
empty, set @$args for this argument to be undef instead of ignoring
completly the command for commands with
{'extra'}->{'missing_argument'}. Modify formatting functions for that
change, but also to avoid modifying input @$args.
* tp/Texinfo/Convert/HTML.pm (command_text, output): check existence
of contents instead of relying on {'extra'}->{'missing_argument'}.
Use directly element as tree.
---
ChangeLog | 18 ++++
doc/texi2any_api.texi | 3 +-
tp/Texinfo/Convert/HTML.pm | 108 ++++++++++++---------
tp/init/documentation_examples.pm | 15 ++-
tp/init/html32.pm | 11 ++-
tp/t/init/translate_txiinternalvalue_macro.init | 4 +-
.../converters_tests/definition_commands.pl | 4 +-
.../definition_commands/res_html/chapter.html | 4 +-
tp/t/results/coverage_braces/empty_commands.pl | 2 +-
.../sectioning/two_unnumbered_no_argument.pl | 4 +
10 files changed, 114 insertions(+), 59 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 16253b56e0..cd2939c9a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2023-10-22 Patrice Dumas <pertusus@free.fr>
+
+ * doc/texi2any_api.texi (Command Tree Element Conversion Functions),
+ tp/Texinfo/Convert/HTML.pm (_convert, _convert_email_command)
+ (_convert_explained_command, _convert_uref_command)
+ (_convert_image_command, _convert_titlefont_command)
+ (_convert_sp_command, _convert_center_command),
+ tp/init/documentation_examples.pm, tp/init/html32.pm,
+ tp/t/init/translate_txiinternalvalue_macro.init: if an argument is
+ empty, set @$args for this argument to be undef instead of ignoring
+ completly the command for commands with
+ {'extra'}->{'missing_argument'}. Modify formatting functions for that
+ change, but also to avoid modifying input @$args.
+
+ * tp/Texinfo/Convert/HTML.pm (command_text, output): check existence
+ of contents instead of relying on {'extra'}->{'missing_argument'}.
+ Use directly element as tree.
+
2023-10-22 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (_prepare_units_directions_files):
diff --git a/doc/texi2any_api.texi b/doc/texi2any_api.texi
index a95cfade07..caeed2a0f4 100644
--- a/doc/texi2any_api.texi
+++ b/doc/texi2any_api.texi
@@ -2233,7 +2233,8 @@ element.
@var{\@@args}, if defined, is a reference on the formatted arguments
of the @@-command. Each of the array items correspond to each of
-the @@-command argument. Each array item is a hash references, with keys
+the @@-command argument. Each array item is either @code{undef} if the
+argument is empty, or a hash reference, with keys
corresponding to possible argument formatting contexts:
@table @code
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index fb04475233..37c98b1ced 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1093,17 +1093,15 @@ sub command_text($$;$)
'contents' => $command->{'args'}->[0]->{'contents'}};
} elsif ($command->{'cmdname'} and ($command->{'cmdname'} eq 'float')) {
$tree = $self->float_type_number($command);
- } elsif ($command->{'extra'}
- and $command->{'extra'}->{'missing_argument'}) {
+ } elsif (!$command->{'args'}->[0]
+ or !$command->{'args'}->[0]->{'contents'}
+ or !scalar(@{$command->{'args'}->[0]->{'contents'}})) {
if ($type eq 'tree' or $type eq 'tree_nonumber') {
return {};
} else {
return '';
}
} else {
- my $section_arg_contents = [];
- $section_arg_contents = $command->{'args'}->[0]->{'contents'}
- if $command->{'args'}->[0]->{'contents'};
if ($command->{'extra'}
and defined($command->{'extra'}->{'section_number'})
and ($self->get_conf('NUMBER_SECTIONS')
@@ -1124,11 +1122,11 @@ sub command_text($$;$)
=> $command->{'args'}->[0]});
}
} else {
- $tree = {'contents' => $section_arg_contents};
+ $tree = $command->{'args'}->[0];
}
$target->{'tree_nonumber'}
- = {'contents' => $section_arg_contents};
+ = $command->{'args'}->[0];
}
$target->{'tree'} = $tree;
} else {
@@ -3052,16 +3050,20 @@ sub _convert_email_command($$$$)
my $command = shift;
my $args = shift;
- my $mail_arg = shift @$args;
- my $text_arg = shift @$args;
+ my $args_nr = scalar(@$args);
+
my $mail = '';
- my $mail_string;
- if (defined($mail_arg)) {
+ my $mail_string = '';
+ if ($args_nr > 0 and defined($args->[0])) {
+ my $mail_arg = $args->[0];
$mail = $mail_arg->{'url'};
$mail_string = $mail_arg->{'monospacestring'};
}
+
my $text = '';
- if (defined($text_arg)) {
+ if ($args_nr > 1 and defined($args->[1])
+ and defined($args->[1]->{'normal'})) {
+ my $text_arg = $args->[1];
$text = $text_arg->{'normal'};
}
$text = $mail_string unless ($text ne '');
@@ -3145,7 +3147,10 @@ sub _convert_explained_command($$$$)
$element_explanation_contents->{$command} = [];
}
- my $result = $args->[0]->{'normal'};
+ my $result = '';
+ if (defined($args->[0])) {
+ $result = $args->[0]->{'normal'};
+ }
if (!$self->in_string()) {
my $explanation = '';
$explanation = " title=\"$explanation_string\""
@@ -3276,22 +3281,29 @@ sub _convert_uref_command($$$$)
my $command = shift;
my $args = shift;
- my @args = @$args;
- my $url_arg = shift @args;
- my $text_arg = shift @args;
- my $replacement_arg = shift @args;
+ my $args_nr = scalar(@$args);
- my ($url, $url_string, $text, $replacement);
- if (defined($url_arg)) {
+ my $text = '';
+ my $url = '';
+ my $url_string = '';
+ my $replacement = '';
+ if ($args_nr > 0 and defined($args->[0])) {
+ my $url_arg = $args->[0];
$url = $url_arg->{'url'};
$url_string = $url_arg->{'monospacestring'};
}
- $text = $text_arg->{'normal'} if defined($text_arg);
- $replacement = $replacement_arg->{'normal'} if defined($replacement_arg);
+ if ($args_nr > 1 and defined($args->[1])) {
+ my $text_arg = $args->[1];
+ $text = $text_arg->{'normal'};
+ }
+ if ($args_nr > 2 and defined($args->[2])) {
+ my $replacement_arg = $args->[2];
+ $replacement = $replacement_arg->{'normal'};
+ }
- $text = $replacement if (defined($replacement) and $replacement ne '');
- $text = $url_string if (!defined($text) or $text eq '');
- return $text if (!defined($url) or $url eq '');
+ $text = $replacement if ($replacement ne '');
+ $text = $url_string if ($text eq '');
+ return $text if ($url eq '');
return "$text ($url_string)" if ($self->in_string());
return $self->html_attribute_class('a', [$cmdname])
@@ -3308,7 +3320,8 @@ sub _convert_image_command($$$$)
my $command = shift;
my $args = shift;
- if (defined($args->[0]->{'filenametext'})
+ if (defined($args->[0])
+ and defined($args->[0]->{'filenametext'})
and $args->[0]->{'filenametext'} ne '') {
my $basefile_string = '';
$basefile_string = $args->[0]->{'monospacestring'}
@@ -3537,6 +3550,9 @@ sub _convert_titlefont_command($$$$)
my $command = shift;
my $args = shift;
+ # happens with empty command
+ return '' if (!$args->[0]);
+
my $text = $args->[0]->{'normal'};
if (!defined($text)) {
# happens with bogus @-commands without argument, like @strong something
@@ -4298,6 +4314,9 @@ sub _convert_heading_command($$$$$)
$level_corrected_opening_section_cmdname = $level_corrected_cmdname;
}
+ # could use empty args information also, to avoid calling command_text
+ #my $empty_heading = (!scalar(@$args) or !defined($args->[0]));
+
# $heading not defined may happen if the command is a @node, for example
# if there is an error in the node.
my $heading = $self->command_text($element);
@@ -4694,6 +4713,7 @@ sub _convert_sp_command($$$$)
my $args = shift;
if (defined($command->{'extra'})
+ and defined($command->{'extra'}->{'misc_args'})
and defined($command->{'extra'}->{'misc_args'}->[0])) {
my $sp_nr = $command->{'extra'}->{'misc_args'}->[0];
if ($self->in_preformatted() or $self->in_string()) {
@@ -4738,6 +4758,10 @@ sub _convert_center_command($$$$)
my $command = shift;
my $args = shift;
+ if (!defined($args->[0])) {
+ return '';
+ }
+
if ($self->in_string()) {
return $args->[0]->{'normal'}."\n";
} else {
@@ -5485,6 +5509,7 @@ sub _convert_xref_commands($$$$)
# not exactly sure when it happens. Something like @ref{(file),,,Manual}?
$name = $args->[0]->{'monospace'}
if (!defined($name)
+ and defined($args->[0])
# FIXME could it really be Top?
and $args->[0]->{'monospace'} ne 'Top');
$name = '' if (!defined($name));
@@ -11354,9 +11379,6 @@ sub output($$)
$output_file, $destination_directory, $output_filename,
$document_name);
- #$output_units = Texinfo::Structuring::rebuild_output_units($output_units);
- #$self->{'document_units'} = $output_units;
-
# set information, to have it ready for
# run_stage_handlers. Some information is not available yet.
$self->_reset_info();
@@ -11384,10 +11406,9 @@ sub output($$)
foreach my $fulltitle_command('settitle', 'title', 'shorttitlepage', 'top') {
if ($self->{'global_commands'}->{$fulltitle_command}) {
my $command = $self->{'global_commands'}->{$fulltitle_command};
- next if (!$command->{'args'}
- or (!$command->{'args'}->[0]
- or ($command->{'extra'}
- and $command->{'extra'}->{'missing_argument'})));
+ next if (!$command->{'args'} or !$command->{'args'}->[0]
+ or !$command->{'args'}->[0]->{'contents'}
+ or !scalar(@{$command->{'args'}->[0]->{'contents'}}));
print STDERR "Using $fulltitle_command as title\n"
if ($self->get_conf('DEBUG'));
$fulltitle = $command->{'args'}->[0];
@@ -11407,10 +11428,9 @@ sub output($$)
foreach my $simpletitle_command ('settitle', 'shorttitlepage') {
if ($self->{'global_commands'}->{$simpletitle_command}) {
my $command = $self->{'global_commands'}->{$simpletitle_command};
- next if (!$command->{'args'}
- or !$command->{'args'}->[0]
- or ($command->{'extra'}
- and $command->{'extra'}->{'missing_argument'}));
+ next if (!$command->{'args'} or !$command->{'args'}->[0]
+ or !$command->{'args'}->[0]->{'contents'}
+ or !scalar(@{$command->{'args'}->[0]->{'contents'}}));
$self->{'simpletitle_tree'} = $command->{'args'}->[0];
$self->{'simpletitle_command_name'} = $simpletitle_command;
last;
@@ -11986,12 +12006,6 @@ sub _convert($$;$)
return $result;
}
- if ($element->{'extra'} and $element->{'extra'}->{'missing_argument'}
- and (!$element->{'contents'} or !@{$element->{'contents'}})) {
- print STDERR "MISSING_ARGUMENT\n" if $debug;
- return '';
- }
-
# commands like @deffnx have both a cmdname and a def_line type. It is
# better to consider them as a def_line type, as the whole point of the
# def_line type is to handle the same the def*x and def* line formatting.
@@ -12089,9 +12103,16 @@ sub _convert($$;$)
my @args_specification;
@args_specification = @{$default_commands_args{$command_name}}
if (defined($default_commands_args{$command_name}));
- my $arg_idx = 0;
+ my $arg_idx = -1;
foreach my $arg (@{$element->{'args'}}) {
+ $arg_idx++;
my $arg_spec = shift @args_specification;
+ if ((!$arg->{'contents'} or !scalar(@{$arg->{'contents'}}))
+ # special case for @value argument
+ and !defined($arg->{'text'})) {
+ push @$args_formatted, undef;
+ next;
+ }
$arg_spec = ['normal'] if (!defined($arg_spec));
my $arg_formatted = {'tree' => $arg};
foreach my $arg_type (@$arg_spec) {
@@ -12146,7 +12167,6 @@ sub _convert($$;$)
}
}
push @$args_formatted, $arg_formatted;
- $arg_idx++;
}
}
}
diff --git a/tp/init/documentation_examples.pm
b/tp/init/documentation_examples.pm
index 01efe68c76..1a02fa7850 100644
--- a/tp/init/documentation_examples.pm
+++ b/tp/init/documentation_examples.pm
@@ -82,18 +82,23 @@ sub my_email_formatting_function {
my $command = shift;
my $args = shift;
- my $mail_arg = shift @$args;
- my $text_arg = shift @$args;
+ my $args_nr = scalar(@$args);
+
my $mail = '';
- my $mail_string;
- if (defined($mail_arg)) {
+ my $mail_string = '';
+ if ($args_nr > 0 and defined($args->[0])) {
+ my $mail_arg = $args->[0];
$mail = $mail_arg->{'url'};
$mail_string = $mail_arg->{'monospacestring'};
}
+
my $text = '';
- if (defined($text_arg)) {
+ if ($args_nr > 1 and defined($args->[1])
+ and defined($args->[1]->{'normal'})) {
+ my $text_arg = $args->[1];
$text = $text_arg->{'normal'};
}
+ $text = $mail_string unless ($text ne '');
if ($converter->in_string()) {
return "$mail_string ($text) $shown_styles, $footnotestyle";
diff --git a/tp/init/html32.pm b/tp/init/html32.pm
index f26f0045e9..86bcf5a43a 100644
--- a/tp/init/html32.pm
+++ b/tp/init/html32.pm
@@ -181,10 +181,10 @@ sub html32_convert_explained_command($$$$)
my $with_explanation;
- return '' if (!$args->[0] or !defined($args->[0]->{'normal'})
+ return '' if (!defined($args->[0]) or !defined($args->[0]->{'normal'})
or $args->[0]->{'normal'} !~ /\S/);
- if ($args->[1] and defined($args->[1]->{'string'})
+ if (defined($args->[1]) and defined($args->[1]->{'string'})
and $args->[1]->{'string'} =~ /\S/) {
$with_explanation = 1;
}
@@ -332,6 +332,10 @@ sub html32_convert_center_command($$$$)
my $command = shift;
my $args = shift;
+ if (!defined($args->[0])) {
+ return '';
+ }
+
if ($self->in_string()) {
# FIXME use an API?
return $self->{'types_conversion'}->{'preformatted'}($self, $cmdname,
$command,
@@ -395,7 +399,8 @@ sub html32_convert_subtitle_command($$$$)
my $command = shift;
my $args = shift;
- return '' if (!$args->[0]);
+ return '' if (! defined($args->[0]));
+
if (!$self->in_string()) {
return "<h3 align=\"right\">$args->[0]->{'normal'}</h3>\n";
} else {
diff --git a/tp/t/init/translate_txiinternalvalue_macro.init
b/tp/t/init/translate_txiinternalvalue_macro.init
index 57179331fc..8269fd1a7f 100644
--- a/tp/t/init/translate_txiinternalvalue_macro.init
+++ b/tp/t/init/translate_txiinternalvalue_macro.init
@@ -9,7 +9,9 @@ sub my_sp_formatting($$$$$)
my $args = shift;
my $content = shift;
- if (defined($command->{'extra'}->{'misc_args'}->[0])) {
+ if (defined($command->{'extra'})
+ and defined($command->{'extra'}->{'misc_args'})
+ and defined($command->{'extra'}->{'misc_args'}->[0])) {
my $sp_nr = $command->{'extra'}->{'misc_args'}->[0];
my $translated_tree = $self->gdt('@macro txiinternalvalue
user internalvalue
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index f17c49d98d..a81b62c4c3 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -18738,8 +18738,8 @@ $result_converted{'html_text'}->{'definition_commands'}
= '<div class="top-level
<dl class="first-deffn">
<dt class="deffn" id="index-_002eft"><span class="category-def">Request:
</span><span><strong class="def-name"><code class="t">.ft</code></strong> <var
class="def-var-arguments">[<span class="r"><i
class="slanted">font</i></span>]</var><a class="copiable-link"
href="#index-_002eft"> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-_005cff"><span
class="category-def">Escape sequence: </span><span><strong
class="def-name"><code class="t">\\f</code><span class="r"><i
class="slanted">f</i></span><code class="t"></code></strong><a
class="copiable-link" href="#index-_005cff"> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-_005cf_0028fn"><span
class="category-def">Escape sequence: </span><span><strong
class="def-name"><code class="t">\\f(</code><span class="r"><i
class="slanted">fn</i></span><code class="t"></code></strong><a
class="copiable-link" href="#index-_005cf_0028fn"> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-_005cff"><span
class="category-def">Escape sequence: </span><span><strong
class="def-name"><code class="t">\\f</code><span class="r"><i
class="slanted">f</i></span></strong><a class="copiable-link"
href="#index-_005cff"> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-_005cf_0028fn"><span
class="category-def">Escape sequence: </span><span><strong
class="def-name"><code class="t">\\f(</code><span class="r"><i
class="slanted">fn</i></span></strong><a class="copiable-link"
href="#index-_005cf_0028fn"> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-_005cf_005bfont_005d"><span
class="category-def">Escape sequence: </span><span><strong
class="def-name"><code class="t">\\f[</code><span class="r"><i
class="slanted">font</i></span><code class="t">]</code></strong> <var
class="def-var-arguments"><code class="t">\\f[</code><span class="r"><i
class="slanted">font</i></span><code class="t">]</code></var><a
class="copiable-link" href="#index-_005cf_005bfont_005d"> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-_005cn_005b_002esty_005d"><span
class="category-def">Register: </span><span><strong class="def-name"><code
class="t">\\n[.sty]</code></strong><a class="copiable-link"
href="#index-_005cn_005b_002esty_005d"> ¶</a></span></dt>
<dd><p>The <code class="code">ft</code> request and the <code
class="code">\\f</code> escape change the current font
diff --git
a/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
b/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
index 60b8b0734b..32f25b8904 100644
--- a/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
+++ b/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
@@ -90,8 +90,8 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top
section</a>, Up: <a
<dl class="first-deffn">
<dt class="deffn" id="index-_002eft"><span class="category-def">Request:
</span><span><strong class="def-name"><code class="t">.ft</code></strong> <var
class="def-var-arguments">[<span class="r"><i
class="slanted">font</i></span>]</var><a class="copiable-link"
href="#index-_002eft"> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-_005cff"><span
class="category-def">Escape sequence: </span><span><strong
class="def-name"><code class="t">\f</code><span class="r"><i
class="slanted">f</i></span><code class="t"></code></strong><a
class="copiable-link" href="#index-_005cff"> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-_005cf_0028fn"><span
class="category-def">Escape sequence: </span><span><strong
class="def-name"><code class="t">\f(</code><span class="r"><i
class="slanted">fn</i></span><code class="t"></code></strong><a
class="copiable-link" href="#index-_005cf_0028fn"> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-_005cff"><span
class="category-def">Escape sequence: </span><span><strong
class="def-name"><code class="t">\f</code><span class="r"><i
class="slanted">f</i></span></strong><a class="copiable-link"
href="#index-_005cff"> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-_005cf_0028fn"><span
class="category-def">Escape sequence: </span><span><strong
class="def-name"><code class="t">\f(</code><span class="r"><i
class="slanted">fn</i></span></strong><a class="copiable-link"
href="#index-_005cf_0028fn"> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-_005cf_005bfont_005d"><span
class="category-def">Escape sequence: </span><span><strong
class="def-name"><code class="t">\f[</code><span class="r"><i
class="slanted">font</i></span><code class="t">]</code></strong> <var
class="def-var-arguments"><code class="t">\f[</code><span class="r"><i
class="slanted">font</i></span><code class="t">]</code></var><a
class="copiable-link" href="#index-_005cf_005bfont_005d"> ¶</a></span></dt>
<dt class="deffnx def-cmd-deffn" id="index-_005cn_005b_002esty_005d"><span
class="category-def">Register: </span><span><strong class="def-name"><code
class="t">\n[.sty]</code></strong><a class="copiable-link"
href="#index-_005cn_005b_002esty_005d"> ¶</a></span></dt>
<dd><p>The <code class="code">ft</code> request and the <code
class="code">\f</code> escape change the current font
diff --git a/tp/t/results/coverage_braces/empty_commands.pl
b/tp/t/results/coverage_braces/empty_commands.pl
index a1979e40b4..78f5a38ded 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -211,7 +211,7 @@ $result_converted{'plaintext'}->{'empty_commands'} = '
$result_converted{'html_text'}->{'empty_commands'} = '
-<p> <abbr class="abbr"></abbr> <code class="code"></code><a class="footnote"
id="DOCF1" href="#FOOT1"><sup>1</sup></a> ̃ <code class="verb"></code>
+<p> <abbr class="abbr"></abbr> <a class="footnote" id="DOCF1"
href="#FOOT1"><sup>1</sup></a> ̃
</p><div class="footnotes-segment">
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
diff --git a/tp/t/results/sectioning/two_unnumbered_no_argument.pl
b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
index 6b233f312a..25481221cd 100644
--- a/tp/t/results/sectioning/two_unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
@@ -151,6 +151,10 @@ $result_converted{'html'}->{'two_unnumbered_no_argument'}
= '<!DOCTYPE html>
</head>
<body lang="en">
+<div class="unnumbered-level-extent">
+</div>
+<div class="unnumbered-level-extent">
+</div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * doc/texi2any_api.texi (Command Tree Element Conversion Functions), tp/Texinfo/Convert/HTML.pm (_convert, _convert_email_command) (_convert_explained_command, _convert_uref_command) (_convert_image_command, _convert_titlefont_command) (_convert_sp_command, _convert_center_command), tp/init/documentation_examples.pm, tp/init/html32.pm, tp/t/init/translate_txiinternalvalue_macro.init: if an argument is empty, set @$args for this argument to be undef instead of ignoring completly the command [...],
Patrice Dumas <=