[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_float_comm
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_float_command): convert prepended float number type information in the same way with a caption or without. |
|
Date: |
Mon, 10 Jan 2022 15:56:13 -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 2faedd57eb * tp/Texinfo/Convert/HTML.pm (_convert_float_command):
convert prepended float number type information in the same way with a caption
or without.
2faedd57eb is described below
commit 2faedd57eb1e289394288e39f6d5dd4f08e4a147
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jan 10 21:56:01 2022 +0100
* tp/Texinfo/Convert/HTML.pm (_convert_float_command): convert
prepended float number type information in the same way with
a caption or without.
---
ChangeLog | 6 +
tp/Texinfo/Convert/HTML.pm | 30 +-
tp/t/27float.t | 17 +
.../results/float/comment_space_comand_in_float.pl | 2 +-
tp/t/results/float/empty_caption.pl | 610 +++++++++++++++++++++
.../float/empty_listoffloats_with_floats.pl | 2 +-
.../float/numbering_captions_listoffloats.pl | 4 +-
tp/t/results/float/ref_to_float.pl | 4 +-
.../misc_commands/comment_space_command_on_line.pl | 2 +-
.../res_html/equivalent_nodes.html | 2 +-
.../res_html/equivalent_nodes.html | 2 +-
.../res_html/placed_things_before_element.html | 2 +-
.../results/sectioning/double_node_anchor_float.pl | 6 +-
tp/t/results/sectioning/equivalent_labels.pl | 2 +-
tp/t/results/sectioning/no_element.pl | 2 +-
.../sectioning/placed_things_before_element.pl | 2 +-
.../sectioning/placed_things_before_node.pl | 2 +-
17 files changed, 663 insertions(+), 34 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index db7dec7657..68310c6cbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-01-10 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_float_command): convert
+ prepended float number type information in the same way with
+ a caption or without.
+
2022-01-10 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (_convert_float_command): use
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index d676346bb3..886399b6f3 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -3914,34 +3914,30 @@ sub _convert_float_command($$$$$)
my $prepended_text;
my $caption_text = '';
if ($prepended) {
+ $prepended_text = $self->convert_tree_new_formatting_context(
+ {'cmdname' => 'strong',
+ 'args' => [{'type' => 'brace_command_arg',
+ 'contents' => [$prepended]}]},
+ 'float number type');
if ($caption) {
- # format and register the prepended tree to be prepended to
+ # register the converted prepended tree to be prepended to
# the first paragraph in caption formatting
$self->register_pending_formatted_inline_content($caption_command_name,
- $self->convert_tree({'cmdname' => 'strong',
- 'args' => [{'type' => 'brace_command_arg',
- 'contents' => [$prepended]}]}),
- 'float number type');
+ $prepended_text);
$caption_text = $self->convert_tree_new_formatting_context(
$caption->{'args'}->[0], 'float caption');
- $prepended_text = '';
- $self->cancel_pending_formatted_inline_content($caption_command_name);
+ my $cancelled_prepended
+ =
$self->cancel_pending_formatted_inline_content($caption_command_name);
+ $prepended_text = '' if (not defined($cancelled_prepended));
}
- if ($caption_text eq '') {
- $prepended_text = $self->convert_tree_new_formatting_context(
- $prepended, 'float prepended');
- if ($prepended_text ne '') {
- $prepended_text = '<p><strong>'.$prepended_text.'</strong></p>';
- }
+ if ($prepended_text ne '') {
+ $prepended_text = '<p>'.$prepended_text.'</p>';
}
} else {
- $prepended_text = '';
- }
-
- if ($caption and $caption_text eq '') {
$caption_text = $self->convert_tree_new_formatting_context(
$caption->{'args'}->[0], 'float caption');
}
+
if ($prepended_text.$caption_text ne '') {
$prepended_text = $self->html_attribute_class('div','float-caption'). '>'
. $prepended_text;
diff --git a/tp/t/27float.t b/tp/t/27float.t
index e022436ed6..3757933d9c 100644
--- a/tp/t/27float.t
+++ b/tp/t/27float.t
@@ -86,6 +86,23 @@ In float.
@printindex cp
+'],
+['empty_caption',
+'@float a, b
+In float A, B
+@caption{}
+@end float
+
+@float , c
+In float , C
+@shortcaption{}
+@end float
+
+@float
+In float
+@shortcaption{}
+@caption{}
+@end float
'],
['complex_float',
'@node Top
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl
b/tp/t/results/float/comment_space_comand_in_float.pl
index e3c513ad14..4a71f08902 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -412,7 +412,7 @@
$result_converted{'html'}->{'comment_space_comand_in_float'} = '<!DOCTYPE html>
<div class="float" id="label--">
<p>Float
-</p><div class="float-caption"><p><strong>Text 1
+</p><div class="float-caption"><p><strong class="strong">Text 1
</strong></p></div></div>
<dl class="listoffloats">
<dt><a href="#label--">Text 1</a></dt><dd></dd>
diff --git a/tp/t/results/float/empty_caption.pl
b/tp/t/results/float/empty_caption.pl
new file mode 100644
index 0000000000..1932b598c0
--- /dev/null
+++ b/tp/t/results/float/empty_caption.pl
@@ -0,0 +1,610 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'empty_caption'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'preamble_before_content'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'b'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+',
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'float',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'In float A, B
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'caption',
+ 'contents' => [],
+ 'extra' => {
+ 'float' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_spaces_after_close_brace'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'float'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'float',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'float'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'caption' => {},
+ 'end_command' => {},
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'b',
+ 'spaces_before_argument' => ' ',
+ 'type' => {
+ 'content' => [
+ {}
+ ],
+ 'normalized' => 'a'
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'c'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+',
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'float',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'In float , C
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'shortcaption',
+ 'contents' => [],
+ 'extra' => {
+ 'float' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_spaces_after_close_brace'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'float'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'float',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'float'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {},
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'c',
+ 'shortcaption' => {},
+ 'spaces_before_argument' => ' ',
+ 'type' => {
+ 'normalized' => ''
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'float',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'In float
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'shortcaption',
+ 'contents' => [],
+ 'extra' => {
+ 'float' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_spaces_after_close_brace'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'caption',
+ 'contents' => [],
+ 'extra' => {
+ 'float' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_spaces_after_close_brace'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'float'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'float',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'float'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'caption' => {},
+ 'end_command' => {},
+ 'shortcaption' => {},
+ 'type' => {
+ 'normalized' => ''
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'empty_caption'}{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'float'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'empty_caption'}{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'empty_caption'}{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'args'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'float'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'extra'}{'shortcaption'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'empty_caption'}{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'empty_caption'}{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[4];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'float'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[6];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'parent'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'extra'}{'caption'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[4];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[6];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'extra'}{'shortcaption'}
= $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
+$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'parent'} =
$result_trees{'empty_caption'}{'contents'}[0];
+$result_trees{'empty_caption'}{'contents'}[0]{'parent'} =
$result_trees{'empty_caption'};
+
+$result_texis{'empty_caption'} = '@float a, b
+In float A, B
+@caption{}
+@end float
+
+@float , c
+In float , C
+@shortcaption{}
+@end float
+
+@float
+In float
+@shortcaption{}
+@caption{}
+@end float
+';
+
+
+$result_texts{'empty_caption'} = 'a, b
+In float A, B
+
+c
+In float , C
+
+In float
+';
+
+$result_errors{'empty_caption'} = [];
+
+
+$result_floats{'empty_caption'} = {
+ '' => [
+ {
+ 'cmdname' => 'float',
+ 'extra' => {
+ 'normalized' => 'c',
+ 'shortcaption' => {
+ 'cmdname' => 'shortcaption',
+ 'extra' => {
+ 'float' => {}
+ }
+ },
+ 'type' => {
+ 'normalized' => ''
+ }
+ },
+ 'structure' => {
+ 'float_number' => 1
+ }
+ },
+ {
+ 'cmdname' => 'float',
+ 'extra' => {
+ 'caption' => {
+ 'cmdname' => 'caption',
+ 'extra' => {
+ 'float' => {}
+ }
+ },
+ 'shortcaption' => {
+ 'cmdname' => 'shortcaption',
+ 'extra' => {
+ 'float' => {}
+ }
+ },
+ 'type' => {
+ 'normalized' => ''
+ }
+ },
+ 'structure' => {}
+ }
+ ],
+ 'a' => [
+ {
+ 'cmdname' => 'float',
+ 'extra' => {
+ 'caption' => {
+ 'cmdname' => 'caption',
+ 'extra' => {
+ 'float' => {}
+ }
+ },
+ 'normalized' => 'b',
+ 'type' => {
+ 'content' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'normalized' => 'a'
+ }
+ },
+ 'structure' => {
+ 'float_number' => 1
+ }
+ }
+ ]
+};
+$result_floats{'empty_caption'}{''}[0]{'extra'}{'shortcaption'}{'extra'}{'float'}
= $result_floats{'empty_caption'}{''}[0];
+$result_floats{'empty_caption'}{''}[1]{'extra'}{'caption'}{'extra'}{'float'} =
$result_floats{'empty_caption'}{''}[1];
+$result_floats{'empty_caption'}{''}[1]{'extra'}{'shortcaption'}{'extra'}{'float'}
= $result_floats{'empty_caption'}{''}[1];
+$result_floats{'empty_caption'}{'a'}[0]{'extra'}{'caption'}{'extra'}{'float'}
= $result_floats{'empty_caption'}{'a'}[0];
+
+
+
+$result_converted{'plaintext'}->{'empty_caption'} = 'In float A, B
+
+a 1:
+In float , C
+
+1:
+In float
+
+';
+
+
+$result_converted{'html'}->{'empty_caption'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="float" id="b">
+<p>In float A, B
+</p><div class="float-caption"><p><strong class="strong">a 1:
</strong></p></div></div>
+<div class="float" id="c">
+<p>In float , C
+</p><div class="float-caption"><p><strong class="strong">1:
</strong></p></div></div>
+<div class="float">
+<p>In float
+</p></div>
+
+
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'empty_caption'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
+1;
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index 00b637e451..f94a48d7f4 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -676,7 +676,7 @@
$result_converted{'html'}->{'empty_listoffloats_with_floats'} = '<!DOCTYPE html>
<body lang="en">
<div class="float" id="label1">
<p>Label no caption.
-</p><div class="float-caption"><p><strong>1
+</p><div class="float-caption"><p><strong class="strong">1
</strong></p></div></div>
<div class="float" id="label2">
<p>Label and caption.
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl
b/tp/t/results/float/numbering_captions_listoffloats.pl
index fc687a22ee..654242ae66 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -8079,7 +8079,7 @@ Next: <a href="#chapter" accesskey="n" rel="next">A
chapter</a> </p>
<div class="float" id="label-but-no-type-and-no-caption">
<p>No type but label and no caption nor shortcaption.
</p>
-<div class="float-caption"><p><strong>2
+<div class="float-caption"><p><strong class="strong">2
</strong></p></div></div>
<div class="float">
@@ -8160,7 +8160,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">A
chapter</a> </p>
<p>A text in float no caption a label a type.
</p>
-<div class="float-caption"><p><strong>Text 1.3
+<div class="float-caption"><p><strong class="strong">Text 1.3
</strong></p></div></div>
<hr>
</div>
diff --git a/tp/t/results/float/ref_to_float.pl
b/tp/t/results/float/ref_to_float.pl
index dcb35822d0..f11d43aba6 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -449,11 +449,11 @@ $result_converted{'html'}->{'ref_to_float'} = '<!DOCTYPE
html>
<body lang="en">
<div class="float" id="Label1">
<p>Float
-</p><div class="float-caption"><p><strong>Text 1
+</p><div class="float-caption"><p><strong class="strong">Text 1
</strong></p></div></div>
<div class="float" id="Label2">
<p>In foat 2.
-</p><div class="float-caption"><p><strong>1
+</p><div class="float-caption"><p><strong class="strong">1
</strong></p></div></div>
<p><a class="ref" href="#Label1">Text 1</a>
</p>
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index 6df6e3b4f7..080a9a793c 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -854,7 +854,7 @@
$result_converted{'html_text'}->{'comment_space_command_on_line'} = '
<div class="float" id="label">
<p>float
-</p><div class="float-caption"><p><strong>Text 1
+</p><div class="float-caption"><p><strong class="strong">Text 1
</strong></p></div></div>
</div>
diff --git
a/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
b/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
index 1e3c0b6d47..de1ee8d676 100644
---
a/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
+++
b/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
@@ -78,7 +78,7 @@ span.smaller {font-size: smaller}
<div class="float">
<p>A figure
-</p><div class="float-caption"><p><strong>Figure
+</p><div class="float-caption"><p><strong class="strong">Figure
</strong></p></div></div>
<dl class="listoffloats">
</dl>
diff --git
a/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
b/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
index 2e2aec953b..b02ef54eca 100644
---
a/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
+++
b/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
@@ -35,7 +35,7 @@ span.smaller {font-size: smaller}
<a class="node-anchor" id="node"></a>
<div class="float">
<p>A figure
-</p><div class="float-caption"><p><strong>Figure
+</p><div class="float-caption"><p><strong class="strong">Figure
</strong></p></div></div>
<dl class="listoffloats">
</dl>
diff --git
a/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
b/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
index e8daee9a41..721e87fbd6 100644
---
a/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
+++
b/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
@@ -38,7 +38,7 @@ span.smaller {font-size: smaller}
</p>
<div class="float" id="float-anchor">
<p>In float
-</p><div class="float-caption"><p><strong>1
+</p><div class="float-caption"><p><strong class="strong">1
</strong></p></div></div>
<p>Ref to float
<a class="ref" href="#float-anchor">1</a>.
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 4d6c22d987..b4bbd5e6c4 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -881,13 +881,13 @@ $result_converted{'html'}->{'double_node_anchor_float'} =
'<!DOCTYPE html>
</div>
<div class="float">
-<div class="float-caption"><p><strong>Text
+<div class="float-caption"><p><strong class="strong">Text
</strong></p></div></div>
<div class="float">
-<div class="float-caption"><p><strong>Text
+<div class="float-caption"><p><strong class="strong">Text
</strong></p></div></div>
<div class="float" id="float1">
-<div class="float-caption"><p><strong>Text 1
+<div class="float-caption"><p><strong class="strong">Text 1
</strong></p></div></div>
<hr>
<div class="header">
diff --git a/tp/t/results/sectioning/equivalent_labels.pl
b/tp/t/results/sectioning/equivalent_labels.pl
index 47fa4ff0a8..ca560037ba 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -674,7 +674,7 @@ $result_converted{'html'}->{'equivalent_labels'} =
'<!DOCTYPE html>
</p>
<div class="float" id="floa">
<p>In float
-</p><div class="float-caption"><p><strong>truc 1
+</p><div class="float-caption"><p><strong class="strong">truc 1
</strong></p></div></div>
diff --git a/tp/t/results/sectioning/no_element.pl
b/tp/t/results/sectioning/no_element.pl
index 2ef4f32d52..0d4e6065e2 100644
--- a/tp/t/results/sectioning/no_element.pl
+++ b/tp/t/results/sectioning/no_element.pl
@@ -991,7 +991,7 @@ h1.settitle {text-align:center}
</p>
<div class="float" id="float-anchor">
<p>In float
-</p><div class="float-caption"><p><strong>1
+</p><div class="float-caption"><p><strong class="strong">1
</strong></p></div></div>
<p>Ref to float
<a class="ref" href="#float-anchor">1</a>.
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl
b/tp/t/results/sectioning/placed_things_before_element.pl
index 66e50a8440..69385f4f95 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -1108,7 +1108,7 @@
$result_converted{'html'}->{'placed_things_before_element'} = '<!DOCTYPE html>
</p>
<div class="float" id="float-anchor">
<p>In float
-</p><div class="float-caption"><p><strong>1
+</p><div class="float-caption"><p><strong class="strong">1
</strong></p></div></div>
<p>Ref to float
<a class="ref" href="#float-anchor">1</a>.
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl
b/tp/t/results/sectioning/placed_things_before_node.pl
index 1b259ee9cd..ab4d5749a4 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -1171,7 +1171,7 @@ $result_converted{'html'}->{'placed_things_before_node'}
= '<!DOCTYPE html>
</p>
<div class="float" id="float-anchor">
<p>In float
-</p><div class="float-caption"><p><strong>1
+</p><div class="float-caption"><p><strong class="strong">1
</strong></p></div></div>
<p>Ref to float
<a class="ref" href="#float-anchor">1</a>.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_float_command): convert prepended float number type information in the same way with a caption or without.,
Patrice Dumas <=