[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Common.pm (_substitute_references),
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Common.pm (_substitute_references), tp/Texinfo/Convert/Converter.pm (float_type_number) (float_name_caption), tp/Texinfo/Convert/HTML.pm (_convert_listoffloats_command), tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/NodeNameNormalization.pm (_parse_float_type), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/TexinfoMarkup.p (_convert), tp/Texinfo/XS/parsetexi/api.c (store_additional_info): put float_type directly in extra [...] |
|
Date: |
Mon, 20 Feb 2023 10:54:48 -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 bdb6b8ccf4 * tp/Texinfo/Common.pm (_substitute_references),
tp/Texinfo/Convert/Converter.pm (float_type_number) (float_name_caption),
tp/Texinfo/Convert/HTML.pm (_convert_listoffloats_command),
tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/LaTeX.pm (_convert),
tp/Texinfo/Convert/NodeNameNormalization.pm (_parse_float_type),
tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/TexinfoMarkup.p
(_convert), tp/Texinfo/XS/parsetexi/api.c (store_additional_info): put float_t
[...]
bdb6b8ccf4 is described below
commit bdb6b8ccf4143153ef753298967d13cb6747ef08
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Feb 20 16:54:38 2023 +0100
* tp/Texinfo/Common.pm (_substitute_references),
tp/Texinfo/Convert/Converter.pm (float_type_number)
(float_name_caption), tp/Texinfo/Convert/HTML.pm
(_convert_listoffloats_command), tp/Texinfo/Convert/IXIN.pm,
tp/Texinfo/Convert/LaTeX.pm (_convert),
tp/Texinfo/Convert/NodeNameNormalization.pm (_parse_float_type),
tp/Texinfo/Convert/Plaintext.pm (_convert),
tp/Texinfo/Convert/TexinfoMarkup.p (_convert),
tp/Texinfo/XS/parsetexi/api.c (store_additional_info): put
float_type directly in extra as string.
---
ChangeLog | 13 ++
tp/Texinfo/Common.pm | 6 +-
tp/Texinfo/Convert/Converter.pm | 7 +-
tp/Texinfo/Convert/HTML.pm | 10 +-
tp/Texinfo/Convert/IXIN.pm | 9 +-
tp/Texinfo/Convert/LaTeX.pm | 28 ++--
tp/Texinfo/Convert/NodeNameNormalization.pm | 14 +-
tp/Texinfo/Convert/Plaintext.pm | 13 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 10 +-
tp/Texinfo/XS/parsetexi/api.c | 10 +-
.../results/converters_tests/at_commands_in_raw.pl | 4 +-
tp/t/results/converters_tests/form_feeds.pl | 20 +--
.../references_to_top_no_top_output.pl | 20 +--
.../converters_tests/things_before_setfilename.pl | 20 +--
.../things_before_setfilename_no_element.pl | 20 +--
tp/t/results/coverage/block_commands.pl | 8 +-
.../coverage/punctuation_in_line_commands.pl | 20 +--
tp/t/results/coverage_braces/caption_not_closed.pl | 8 +-
tp/t/results/coverage_braces/test_image.pl | 12 +-
tp/t/results/float/anchor_in_caption.pl | 12 +-
tp/t/results/float/cindex_in_caption.pl | 12 +-
.../results/float/comment_space_comand_in_float.pl | 12 +-
tp/t/results/float/complex_float.pl | 20 +--
tp/t/results/float/empty_caption.pl | 24 +--
tp/t/results/float/empty_label_no_space.pl | 8 +-
tp/t/results/float/empty_label_no_space_comment.pl | 8 +-
tp/t/results/float/empty_label_with_space.pl | 8 +-
.../float/empty_label_with_space_comment.pl | 8 +-
tp/t/results/float/empty_listoffloats.pl | 4 +-
.../float/empty_listoffloats_with_floats.pl | 36 ++---
tp/t/results/float/float_copying.pl | 12 +-
tp/t/results/float/float_in_block_commands.pl | 24 +--
tp/t/results/float/float_with_at_commands.pl | 12 +-
tp/t/results/float/footnote_in_caption.pl | 12 +-
.../results/float/footnote_in_caption_and_error.pl | 12 +-
tp/t/results/float/listoffloats_with_commands.pl | 4 +-
.../float/numbering_captions_listoffloats.pl | 176 ++++++---------------
tp/t/results/float/ref_to_float.pl | 16 +-
tp/t/results/float/simple.pl | 8 +-
.../float/special_characters_in_float_type.pl | 12 +-
tp/t/results/html_tests/float_copying.pl | 12 +-
.../html_tests/transliterated_names_conflicts.pl | 8 +-
tp/t/results/info_tests/empty_caption.pl | 12 +-
tp/t/results/info_tests/error_in_footnote.pl | 16 +-
tp/t/results/info_tests/float_long_captions.pl | 20 +--
tp/t/results/info_tests/float_without_type.pl | 12 +-
.../invalid_nestings/float_in_style_command.pl | 8 +-
.../invalid_nestings/section_on_float_line.pl | 8 +-
tp/t/results/latex_tests/float_and_refs.pl | 36 ++---
.../misc_commands/comment_space_command_on_line.pl | 12 +-
.../equivalent_nodes_defined_linked.pl | 12 +-
tp/t/results/moresectioning/no_element.pl | 8 +-
.../moresectioning/placed_things_before_element.pl | 8 +-
.../moresectioning/placed_things_before_node.pl | 8 +-
tp/t/results/paragraph/commands_in_flushright.pl | 8 +-
tp/t/results/preformatted/caption_in_example.pl | 8 +-
.../results/sectioning/double_node_anchor_float.pl | 24 +--
tp/t/results/sectioning/equivalent_labels.pl | 12 +-
tp/t/results/xml_tests/commands_and_spaces.pl | 8 +-
tp/t/results/xml_tests/comments_end_lines.pl | 8 +-
.../xml_tests/comments_on_block_command_lines.pl | 8 +-
tp/t/results/xml_tests/image_inline_or_not.pl | 8 +-
62 files changed, 266 insertions(+), 690 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e6f2e01668..ff93952457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2023-02-20 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Common.pm (_substitute_references),
+ tp/Texinfo/Convert/Converter.pm (float_type_number)
+ (float_name_caption), tp/Texinfo/Convert/HTML.pm
+ (_convert_listoffloats_command), tp/Texinfo/Convert/IXIN.pm,
+ tp/Texinfo/Convert/LaTeX.pm (_convert),
+ tp/Texinfo/Convert/NodeNameNormalization.pm (_parse_float_type),
+ tp/Texinfo/Convert/Plaintext.pm (_convert),
+ tp/Texinfo/Convert/TexinfoMarkup.p (_convert),
+ tp/Texinfo/XS/parsetexi/api.c (store_additional_info): put
+ float_type directly in extra as string.
+
2023-02-20 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/NodeNameNormalization.pm (_parse_float_type),
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 1b4939ac0e..291758f0bc 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1893,11 +1893,7 @@ sub _substitute_references($$$)
$current->{'extra'}->{$key}, $reference_associations,
"[$command_or_type]{$key}");
} else {
- if (($current->{'cmdname'}
- and ($current->{'cmdname'} eq 'listoffloats'
- or $current->{'cmdname'} eq 'float')
- and $key eq 'float_type')
- or ($key eq 'index_entry')
+ if ($key eq 'index_entry'
or ($current->{'type'}
and $current->{'type'} eq 'menu_entry'
and $key eq 'menu_entry_node_label')) {
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index df962e8e80..0bdbb03b3e 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1250,8 +1250,7 @@ sub float_type_number($$)
my $type_element;
if ($float->{'extra'}
- and $float->{'extra'}->{'float_type'}
- and $float->{'extra'}->{'float_type'}->{'normalized'} ne '') {
+ and $float->{'extra'}->{'float_type'} ne '') {
$type_element = $float->{'args'}->[0];
}
@@ -1291,8 +1290,8 @@ sub float_name_caption($$)
# print STDERR " CAPTION: $caption_texi\n";
#}
my $type_element;
- if ($element->{'extra'} and $element->{'extra'}->{'float_type'}
- and $element->{'extra'}->{'float_type'}->{'normalized'} ne '') {
+ if ($element->{'extra'}
+ and $element->{'extra'}->{'float_type'} ne '') {
$type_element = $element->{'args'}->[0];
}
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 5d0ed1cdc7..aebaeb2b6f 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -4693,12 +4693,10 @@ sub _convert_listoffloats_command($$$$)
my $floats = $self->get_info('floats');
if (!$self->in_string()
- and $command->{'extra'} and $command->{'extra'}->{'float_type'}
- and defined($command->{'extra'}->{'float_type'}->{'normalized'})
- and $floats
- and $floats->{$command->{'extra'}->{'float_type'}->{'normalized'}}
- and
scalar(@{$floats->{$command->{'extra'}->{'float_type'}->{'normalized'}}})) {
- my $listoffloats_name =
$command->{'extra'}->{'float_type'}->{'normalized'};
+ and $command->{'extra'} and defined($command->{'extra'}->{'float_type'})
+ and $floats and $floats->{$command->{'extra'}->{'float_type'}}
+ and scalar(@{$floats->{$command->{'extra'}->{'float_type'}}})) {
+ my $listoffloats_name = $command->{'extra'}->{'float_type'};
my $result = $self->html_attribute_class('dl', [$cmdname]).">\n" ;
foreach my $float (@{$floats->{$listoffloats_name}}) {
my $float_href = $self->command_href($float);
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index 514a5336c5..ba676c5b2c 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -787,8 +787,8 @@ sub output_ixin($$)
my $associated_node_id =
$self->_associated_node_id($listoffloats_element,
\%node_label_number);
if ($listoffloats_element->{'extra'}
- and $listoffloats_element->{'extra'}->{'float_type'}) {
- my $float_type =
$listoffloats_element->{'extra'}->{'float_type'}->{'normalized'};
+ and defined($listoffloats_element->{'extra'}->{'float_type'})) {
+ my $float_type = $listoffloats_element->{'extra'}->{'float_type'};
if ($float_type ne '') {
$floats_information{$float_type}->{'type'}
= $self->convert_tree($listoffloats_element->{'args'}->[0]);
@@ -851,8 +851,9 @@ sub output_ixin($$)
# already determined from listoffloats
if (!defined($floats_information{$type}->{'type'})) {
my $float_element = $self->{'floats'}->{$type}->[0];
- if ($float_element->{'extra'}->{'float_type'}
- and $float_element->{'extra'}->{'float_type'}->{'normalized'} ne
'') {
+ if ($float_element->{'extra'}
+ and defined($float_element->{'extra'}->{'float_type'})
+ and $float_element->{'extra'}->{'float_type'} ne '') {
$floats_information{$type}->{'type'}
= $self->convert_tree($float_element->{'args'}->[0]);
}
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 37c5cce967..829ad16ced 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3248,8 +3248,9 @@ sub _convert($$)
my $float_type;
if (exists($reference->{'cmdname'})
and $reference->{'cmdname'} eq 'float') {
- if ($reference->{'extra'}->{'float_type'}
- and $reference->{'extra'}->{'float_type'}->{'normalized'} ne
'') {
+ if ($reference->{'extra'}
+ and defined($reference->{'extra'}->{'float_type'})
+ and $reference->{'extra'}->{'float_type'} ne '') {
$float_type
= _convert($self, $reference->{'args'}->[0]);
} else {
@@ -3503,8 +3504,8 @@ sub _convert($$)
if (scalar(@{$self->{'formatting_context'}->[-1]
->{'non_floating_commands'}})) {
my $normalized_float_type = '';
- if ($float->{'extra'}->{'float_type'}) {
- $normalized_float_type =
$float->{'extra'}->{'float_type'}->{'normalized'};
+ if ($float->{'extra'} and defined($float->{'extra'}->{'float_type'})) {
+ $normalized_float_type = $float->{'extra'}->{'float_type'};
}
if (not exists($self->{'normalized_float_latex'}
->{$normalized_float_type})) {
@@ -3660,9 +3661,10 @@ sub _convert($$)
} elsif ($cmdname eq 'float') {
if (not $self->{'formatting_context'}->[-1]->{'in_skipped_node_top'}) {
my $normalized_float_type = '';
- if ($element->{'extra'}->{'float_type'}) {
+ if ($element->{'extra'}
+ and defined($element->{'extra'}->{'float_type'})) {
$normalized_float_type
- = $element->{'extra'}->{'float_type'}->{'normalized'};
+ = $element->{'extra'}->{'float_type'};
}
if (not exists($self->{'normalized_float_latex'}
->{$normalized_float_type})) {
@@ -3843,12 +3845,11 @@ sub _convert($$)
}
return $result;
} elsif ($cmdname eq 'listoffloats') {
- if ($element->{'extra'} and $element->{'extra'}->{'float_type'}
- and defined($element->{'extra'}->{'float_type'}->{'normalized'})
+ if ($element->{'extra'} and defined($element->{'extra'}->{'float_type'})
and $self->{'floats'}
- and
$self->{'floats'}->{$element->{'extra'}->{'float_type'}->{'normalized'}}
- and
@{$self->{'floats'}->{$element->{'extra'}->{'float_type'}->{'normalized'}}}) {
- my $normalized_float_type =
$element->{'extra'}->{'float_type'}->{'normalized'};
+ and $self->{'floats'}->{$element->{'extra'}->{'float_type'}}
+ and @{$self->{'floats'}->{$element->{'extra'}->{'float_type'}}}) {
+ my $normalized_float_type = $element->{'extra'}->{'float_type'};
if (not exists($self->{'normalized_float_latex'}
->{$normalized_float_type})) {
cluck("\@listoffloats $normalized_float_type: not found\n");
@@ -4313,9 +4314,10 @@ sub _convert($$)
$latex_float_environment = $non_floating_float_environment;
} else {
my $normalized_float_type = '';
- if ($element->{'extra'}->{'float_type'}) {
+ if ($element->{'extra'}
+ and defined($element->{'extra'}->{'float_type'})) {
$normalized_float_type
- = $element->{'extra'}->{'float_type'}->{'normalized'};
+ = $element->{'extra'}->{'float_type'};
}
# this should never happen as we returned at the command
# open. If this happens it means that the tree has been modified...
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index fe5fc2ba6a..e18cca25d9 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -418,19 +418,15 @@ sub _parse_float_type($)
{
my $current = shift;
- my $float_type_info = {};
- if ($current->{'args'} and @{$current->{'args'}}
+ my $normalized = '';
+ if ($current->{'args'} and scalar(@{$current->{'args'}})
and $current->{'args'}->[0]->{'contents'}) {
- my $normalized
- = convert_to_normalized(
+ $normalized = convert_to_normalized(
{'contents' => $current->{'args'}->[0]->{'contents'}});
- $float_type_info->{'normalized'} = $normalized;
- } else {
- $float_type_info->{'normalized'} = '';
}
#$current->{'extra'} = {} if (!$current->{'extra'});
- $current->{'extra'}->{'float_type'} = $float_type_info;
- return $float_type_info->{'normalized'};
+ $current->{'extra'}->{'float_type'} = $normalized;
+ return $normalized;
}
# Called from Texinfo::ParserNonXS and Texinfo::XS::parsetexi::Parsetexi.
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index f50a556de1..b7799ac4b9 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -2839,13 +2839,12 @@ sub _convert($$)
return $result;
} elsif ($command eq 'listoffloats') {
my $lines_count = 0;
- if ($element->{'extra'} and $element->{'extra'}->{'float_type'}
- and defined($element->{'extra'}->{'float_type'}->{'normalized'})
+ if ($element->{'extra'} and defined($element->{'extra'}->{'float_type'})
and $self->{'floats'}
- and
$self->{'floats'}->{$element->{'extra'}->{'float_type'}->{'normalized'}}
+ and $self->{'floats'}->{$element->{'extra'}->{'float_type'}}
and scalar(@{$self->{'floats'}
-
->{$element->{'extra'}->{'float_type'}->{'normalized'}}})) {
- my $float_type = $element->{'extra'}->{'float_type'}->{'normalized'};
+ ->{$element->{'extra'}->{'float_type'}}})) {
+ my $float_type = $element->{'extra'}->{'float_type'};
push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0};
if (!$self->{'empty_lines_count'}) {
$result .= "\n";
@@ -3542,8 +3541,8 @@ sub _convert($$)
if ($command) {
if ($command eq 'float') {
if ($element->{'extra'}
- and (($element->{'extra'}->{'float_type'}
- and $element->{'extra'}->{'float_type'}->{'normalized'} ne '')
+ and ((defined($element->{'extra'}->{'float_type'})
+ and $element->{'extra'}->{'float_type'} ne '')
or ($element->{'structure'}
and defined($element->{'structure'}->{'float_number'}))
or $element->{'extra'}->{'caption'}
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index b11acb66c2..4521133b33 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -891,10 +891,9 @@ sub _convert($$;$)
} else {
my $attribute = [_leading_spaces_arg($element)];
if ($cmdname eq 'listoffloats' and $element->{'extra'}
- and $element->{'extra'}->{'float_type'}
- and
defined($element->{'extra'}->{'float_type'}->{'normalized'})) {
+ and defined($element->{'extra'}->{'float_type'})) {
unshift @$attribute, ['type',
-
$element->{'extra'}->{'float_type'}->{'normalized'}];
+ $element->{'extra'}->{'float_type'}];
}
my ($arg, $end_space, $end_line)
= $self->_convert_argument_and_end_line($element);
@@ -1262,10 +1261,9 @@ sub _convert($$;$)
{ 'contents' => $element->{'extra'}->{'node_content'} });
push @$attribute, ['name', $normalized];
}
- if ($element->{'extra'}->{'float_type'} and
- defined($element->{'extra'}->{'float_type'}->{'normalized'})) {
+ if (defined($element->{'extra'}->{'float_type'})) {
push @$attribute, ['type',
-
$element->{'extra'}->{'float_type'}->{'normalized'}];
+ $element->{'extra'}->{'float_type'}];
}
if ($element->{'structure'}
and defined($element->{'structure'}->{'float_number'})) {
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index c6e7110a73..3ba408267a 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -393,15 +393,7 @@ store_additional_info (ELEMENT *e, ASSOCIATED_INFO* a,
char *key)
case extra_string:
{ /* A simple string. */
char *value = (char *) f;
- if (!strcmp (key, "float_type"))
- {
- HV *float_type = newHV ();
- SV *sv = newSVpv_utf8 (value, 0);
- hv_store (float_type, "normalized", strlen ("normalized"),
sv, 0);
- STORE(newRV_inc ((SV *)float_type));
- }
- else
- STORE(newSVpv_utf8 (value, 0));
+ STORE(newSVpv_utf8 (value, 0));
break;
}
case extra_integer:
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index a3bd679830..25d44d74dd 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -955,9 +955,7 @@ $result_trees{'at_commands_in_raw'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Figs'
- }
+ 'float_type' => 'Figs'
},
'info' => {
'spaces_before_argument' => {
diff --git a/tp/t/results/converters_tests/form_feeds.pl
b/tp/t/results/converters_tests/form_feeds.pl
index 4288409b55..a61b16d130 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -1077,9 +1077,7 @@ $result_trees{'form_feeds'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'shortcaption' => {}
},
'source_info' => {
@@ -1171,9 +1169,7 @@ $result_trees{'form_feeds'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'type'
- },
+ 'float_type' => 'type',
'node_content' => [
{}
],
@@ -1214,9 +1210,7 @@ $result_trees{'form_feeds'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'type'
- }
+ 'float_type' => 'type'
},
'info' => {
'spaces_before_argument' => {
@@ -1414,9 +1408,7 @@ $result_floats{'form_feeds'} = {
},
'info' => {}
},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'shortcaption' => {
'cmdname' => 'shortcaption',
'extra' => {
@@ -1431,9 +1423,7 @@ $result_floats{'form_feeds'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'type'
- },
+ 'float_type' => 'type',
'normalized' => 'fl'
},
'info' => {},
diff --git a/tp/t/results/converters_tests/references_to_top_no_top_output.pl
b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
index 345a60cb7d..f8de809f6f 100644
--- a/tp/t/results/converters_tests/references_to_top_no_top_output.pl
+++ b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
@@ -563,9 +563,7 @@ $result_trees{'references_to_top_no_top_output'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'list'
- },
+ 'float_type' => 'list',
'node_content' => [
{}
],
@@ -1111,9 +1109,7 @@ $result_trees{'references_to_top_no_top_output'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'list'
- },
+ 'float_type' => 'list',
'node_content' => [
{}
],
@@ -1154,9 +1150,7 @@ $result_trees{'references_to_top_no_top_output'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'list'
- }
+ 'float_type' => 'list'
},
'info' => {
'spaces_before_argument' => {
@@ -1432,9 +1426,7 @@ $result_floats{'references_to_top_no_top_output'} = {
'info' => {},
'structure' => {}
},
- 'float_type' => {
- 'normalized' => 'list'
- },
+ 'float_type' => 'list',
'normalized' => 'My-Flist'
},
'info' => {},
@@ -1459,9 +1451,7 @@ $result_floats{'references_to_top_no_top_output'} = {
'section_number' => 1
}
},
- 'float_type' => {
- 'normalized' => 'list'
- },
+ 'float_type' => 'list',
'normalized' => 'Main-Flist'
},
'info' => {},
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 8f28b6edfb..a4b2f7114e 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -335,9 +335,7 @@ $result_trees{'things_before_setfilename'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -514,9 +512,7 @@ $result_trees{'things_before_setfilename'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -765,9 +761,7 @@ $result_trees{'things_before_setfilename'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {
'spaces_before_argument' => {
@@ -1337,9 +1331,7 @@ $result_floats{'things_before_setfilename'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'float-anchor'
},
'info' => {},
@@ -1358,9 +1350,7 @@ $result_floats{'things_before_setfilename'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'ta'
},
'info' => {},
diff --git
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index d9080b04de..2c904c8364 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -335,9 +335,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -514,9 +512,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -765,9 +761,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {
'spaces_before_argument' => {
@@ -1062,9 +1056,7 @@ $result_floats{'things_before_setfilename_no_element'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'float-anchor'
},
'info' => {},
@@ -1083,9 +1075,7 @@ $result_floats{'things_before_setfilename_no_element'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'ta'
},
'info' => {},
diff --git a/tp/t/results/coverage/block_commands.pl
b/tp/t/results/coverage/block_commands.pl
index a614063c87..42ba0fd880 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -287,9 +287,7 @@ $result_trees{'block_commands'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'a float'
- },
+ 'float_type' => 'a float',
'node_content' => [
{}
],
@@ -362,9 +360,7 @@ $result_floats{'block_commands'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'a float'
- },
+ 'float_type' => 'a float',
'normalized' => 'b-float'
},
'info' => {},
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 388c68167d..cc3bfabdda 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -412,9 +412,7 @@ $result_trees{'punctuation_in_line_commands'} = {
],
'extra' => {
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'float type! After punc'
- },
+ 'float_type' => 'float type! After punc',
'node_content' => [
{}
],
@@ -543,9 +541,7 @@ $result_trees{'punctuation_in_line_commands'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'float type! After punc'
- },
+ 'float_type' => 'float type! After punc',
'node_content' => [
{}
],
@@ -586,9 +582,7 @@ $result_trees{'punctuation_in_line_commands'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'float type! After punc'
- }
+ 'float_type' => 'float type! After punc'
},
'info' => {
'spaces_before_argument' => {
@@ -968,9 +962,7 @@ $result_floats{'punctuation_in_line_commands'} = {
'info' => {},
'structure' => {}
},
- 'float_type' => {
- 'normalized' => 'float type! After punc'
- },
+ 'float_type' => 'float type! After punc',
'normalized' => 'float-label_0021-After-punc',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -994,9 +986,7 @@ $result_floats{'punctuation_in_line_commands'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'float type! After punc'
- },
+ 'float_type' => 'float type! After punc',
'normalized' => 'label-with-caption'
},
'info' => {},
diff --git a/tp/t/results/coverage_braces/caption_not_closed.pl
b/tp/t/results/coverage_braces/caption_not_closed.pl
index 735c019baf..aa6618dd97 100644
--- a/tp/t/results/coverage_braces/caption_not_closed.pl
+++ b/tp/t/results/coverage_braces/caption_not_closed.pl
@@ -130,9 +130,7 @@ $result_trees{'caption_not_closed'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {
'spaces_before_argument' => {
@@ -211,9 +209,7 @@ $result_floats{'caption_not_closed'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {}
}
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index 8bf080cf8c..17483411c7 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -2668,9 +2668,7 @@ $result_trees{'test_image'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Image'
- },
+ 'float_type' => 'Image',
'node_content' => [
{}
],
@@ -2711,9 +2709,7 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Image'
- }
+ 'float_type' => 'Image'
},
'info' => {
'spaces_before_argument' => {
@@ -3104,9 +3100,7 @@ $result_floats{'test_image'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Image'
- },
+ 'float_type' => 'Image',
'normalized' => 'Image-with-commands'
},
'info' => {},
diff --git a/tp/t/results/float/anchor_in_caption.pl
b/tp/t/results/float/anchor_in_caption.pl
index 85820cca86..bb82e21721 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -102,9 +102,7 @@ $result_trees{'anchor_in_caption'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'fl'
- }
+ 'float_type' => 'fl'
},
'info' => {
'spaces_before_argument' => {
@@ -251,9 +249,7 @@ $result_trees{'anchor_in_caption'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'fl'
- },
+ 'float_type' => 'fl',
'node_content' => [
{}
],
@@ -370,9 +366,7 @@ $result_floats{'anchor_in_caption'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'fl'
- },
+ 'float_type' => 'fl',
'normalized' => 'label'
},
'info' => {},
diff --git a/tp/t/results/float/cindex_in_caption.pl
b/tp/t/results/float/cindex_in_caption.pl
index 09c7fa5e21..b70ba3ad70 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -102,9 +102,7 @@ $result_trees{'cindex_in_caption'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'fl'
- }
+ 'float_type' => 'fl'
},
'info' => {
'spaces_before_argument' => {
@@ -267,9 +265,7 @@ $result_trees{'cindex_in_caption'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'fl'
- },
+ 'float_type' => 'fl',
'node_content' => [
{}
],
@@ -440,9 +436,7 @@ $result_floats{'cindex_in_caption'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'fl'
- },
+ 'float_type' => 'fl',
'normalized' => 'label'
},
'info' => {},
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 5ef7ec237c..f688021bdb 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -174,9 +174,7 @@ $result_trees{'comment_space_comand_in_float'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text '
- },
+ 'float_type' => 'Text ',
'node_content' => [
{},
{}
@@ -233,9 +231,7 @@ $result_trees{'comment_space_comand_in_float'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text '
- }
+ 'float_type' => 'Text '
},
'info' => {
'spaces_before_argument' => {
@@ -339,9 +335,7 @@ $result_floats{'comment_space_comand_in_float'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text '
- },
+ 'float_type' => 'Text ',
'normalized' => 'label-'
},
'info' => {},
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index 994f365b0d..107d248e98 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -111,9 +111,7 @@ $result_trees{'complex_float'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {
'spaces_before_argument' => {
@@ -2319,9 +2317,7 @@ $result_trees{'complex_float'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -3502,9 +3498,7 @@ $result_trees{'complex_float'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -3950,9 +3944,7 @@ $result_floats{'complex_float'} = {
'info' => {},
'structure' => {}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'text-with-a-lot-of-features',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -3984,9 +3976,7 @@ $result_floats{'complex_float'} = {
'section_number' => 1
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption'
},
'info' => {},
diff --git a/tp/t/results/float/empty_caption.pl
b/tp/t/results/float/empty_caption.pl
index 28f8002941..7ca0f4389a 100644
--- a/tp/t/results/float/empty_caption.pl
+++ b/tp/t/results/float/empty_caption.pl
@@ -108,9 +108,7 @@ $result_trees{'empty_caption'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'a'
- },
+ 'float_type' => 'a',
'node_content' => [
{}
],
@@ -221,9 +219,7 @@ $result_trees{'empty_caption'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -346,9 +342,7 @@ $result_trees{'empty_caption'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'shortcaption' => {}
},
'source_info' => {
@@ -409,9 +403,7 @@ $result_floats{'empty_caption'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'c',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -434,9 +426,7 @@ $result_floats{'empty_caption'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'shortcaption' => {
'cmdname' => 'shortcaption',
'extra' => {
@@ -456,9 +446,7 @@ $result_floats{'empty_caption'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'a'
- },
+ 'float_type' => 'a',
'normalized' => 'b'
},
'info' => {},
diff --git a/tp/t/results/float/empty_label_no_space.pl
b/tp/t/results/float/empty_label_no_space.pl
index 4cfb5de55d..4e0abd0608 100644
--- a/tp/t/results/float/empty_label_no_space.pl
+++ b/tp/t/results/float/empty_label_no_space.pl
@@ -69,9 +69,7 @@ $result_trees{'empty_label_no_space'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'Type'
- }
+ 'float_type' => 'Type'
},
'info' => {
'spaces_before_argument' => {
@@ -107,9 +105,7 @@ $result_floats{'empty_label_no_space'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Type'
- }
+ 'float_type' => 'Type'
},
'info' => {}
}
diff --git a/tp/t/results/float/empty_label_no_space_comment.pl
b/tp/t/results/float/empty_label_no_space_comment.pl
index b7fd64f2a2..fd70c9df62 100644
--- a/tp/t/results/float/empty_label_no_space_comment.pl
+++ b/tp/t/results/float/empty_label_no_space_comment.pl
@@ -81,9 +81,7 @@ $result_trees{'empty_label_no_space_comment'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'Type'
- }
+ 'float_type' => 'Type'
},
'info' => {
'spaces_before_argument' => {
@@ -119,9 +117,7 @@ $result_floats{'empty_label_no_space_comment'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Type'
- }
+ 'float_type' => 'Type'
},
'info' => {}
}
diff --git a/tp/t/results/float/empty_label_with_space.pl
b/tp/t/results/float/empty_label_with_space.pl
index e53e5b220a..c00fa7796b 100644
--- a/tp/t/results/float/empty_label_with_space.pl
+++ b/tp/t/results/float/empty_label_with_space.pl
@@ -69,9 +69,7 @@ $result_trees{'empty_label_with_space'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'Type'
- }
+ 'float_type' => 'Type'
},
'info' => {
'spaces_before_argument' => {
@@ -107,9 +105,7 @@ $result_floats{'empty_label_with_space'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Type'
- }
+ 'float_type' => 'Type'
},
'info' => {}
}
diff --git a/tp/t/results/float/empty_label_with_space_comment.pl
b/tp/t/results/float/empty_label_with_space_comment.pl
index 266d40596f..513049227f 100644
--- a/tp/t/results/float/empty_label_with_space_comment.pl
+++ b/tp/t/results/float/empty_label_with_space_comment.pl
@@ -84,9 +84,7 @@ $result_trees{'empty_label_with_space_comment'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'Type'
- }
+ 'float_type' => 'Type'
},
'info' => {
'spaces_before_argument' => {
@@ -122,9 +120,7 @@ $result_floats{'empty_label_with_space_comment'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Type'
- }
+ 'float_type' => 'Type'
},
'info' => {}
}
diff --git a/tp/t/results/float/empty_listoffloats.pl
b/tp/t/results/float/empty_listoffloats.pl
index 9496e6dfec..1def7b8b8e 100644
--- a/tp/t/results/float/empty_listoffloats.pl
+++ b/tp/t/results/float/empty_listoffloats.pl
@@ -27,9 +27,7 @@ $result_trees{'empty_listoffloats'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- }
+ 'float_type' => ''
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index dd41fb8b97..18a8b7d585 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -91,9 +91,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -215,9 +213,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -296,9 +292,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- }
+ 'float_type' => ''
},
'source_info' => {
'file_name' => '',
@@ -400,9 +394,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => ''
- }
+ 'float_type' => ''
},
'source_info' => {
'file_name' => '',
@@ -429,9 +421,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- }
+ 'float_type' => ''
},
'source_info' => {
'file_name' => '',
@@ -495,9 +485,7 @@ $result_floats{'empty_listoffloats_with_floats'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'label1'
},
'info' => {},
@@ -514,9 +502,7 @@ $result_floats{'empty_listoffloats_with_floats'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'label2'
},
'info' => {},
@@ -527,9 +513,7 @@ $result_floats{'empty_listoffloats_with_floats'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- }
+ 'float_type' => ''
}
},
{
@@ -541,9 +525,7 @@ $result_floats{'empty_listoffloats_with_floats'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => ''
- }
+ 'float_type' => ''
}
}
]
diff --git a/tp/t/results/float/float_copying.pl
b/tp/t/results/float/float_copying.pl
index 22f8a9072f..9c2a43a1de 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -505,9 +505,7 @@ $result_trees{'float_copying'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Copyright notice'
- },
+ 'float_type' => 'Copyright notice',
'node_content' => [
{}
],
@@ -859,9 +857,7 @@ $result_trees{'float_copying'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Copyright notice'
- }
+ 'float_type' => 'Copyright notice'
},
'info' => {
'spaces_before_argument' => {
@@ -1179,9 +1175,7 @@ $result_floats{'float_copying'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Copyright notice'
- },
+ 'float_type' => 'Copyright notice',
'normalized' => 'public-domain'
},
'info' => {},
diff --git a/tp/t/results/float/float_in_block_commands.pl
b/tp/t/results/float/float_in_block_commands.pl
index ce0c2a384a..846395b6fd 100644
--- a/tp/t/results/float/float_in_block_commands.pl
+++ b/tp/t/results/float/float_in_block_commands.pl
@@ -131,9 +131,7 @@ $result_trees{'float_in_block_commands'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -304,9 +302,7 @@ $result_trees{'float_in_block_commands'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -477,9 +473,7 @@ $result_trees{'float_in_block_commands'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -600,9 +594,7 @@ $result_floats{'float_in_block_commands'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'in-example'
},
'info' => {},
@@ -619,9 +611,7 @@ $result_floats{'float_in_block_commands'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'in-quotation'
},
'info' => {},
@@ -638,9 +628,7 @@ $result_floats{'float_in_block_commands'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'in-cartouche'
},
'info' => {},
diff --git a/tp/t/results/float/float_with_at_commands.pl
b/tp/t/results/float/float_with_at_commands.pl
index be6b23feee..3dd535f89d 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -275,9 +275,7 @@ $result_trees{'float_with_at_commands'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => "entr\x{e9}e"
- },
+ 'float_type' => "entr\x{e9}e",
'node_content' => [
{},
{},
@@ -348,9 +346,7 @@ $result_trees{'float_with_at_commands'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => "entr\x{e9}e"
- }
+ 'float_type' => "entr\x{e9}e"
},
'info' => {
'spaces_before_argument' => {
@@ -411,9 +407,7 @@ $result_floats{'float_with_at_commands'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => "entr\x{e9}e"
- },
+ 'float_type' => "entr\x{e9}e",
'normalized' => 'premi_00e8re-entr_00e9e'
},
'info' => {},
diff --git a/tp/t/results/float/footnote_in_caption.pl
b/tp/t/results/float/footnote_in_caption.pl
index bd9d3c9e34..83342d5f4a 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -102,9 +102,7 @@ $result_trees{'footnote_in_caption'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'fl'
- }
+ 'float_type' => 'fl'
},
'info' => {
'spaces_before_argument' => {
@@ -250,9 +248,7 @@ $result_trees{'footnote_in_caption'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'fl'
- },
+ 'float_type' => 'fl',
'node_content' => [
{}
],
@@ -368,9 +364,7 @@ $result_floats{'footnote_in_caption'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'fl'
- },
+ 'float_type' => 'fl',
'normalized' => 'label'
},
'info' => {},
diff --git a/tp/t/results/float/footnote_in_caption_and_error.pl
b/tp/t/results/float/footnote_in_caption_and_error.pl
index 8adf2ce95b..5528366254 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -102,9 +102,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'fl'
- }
+ 'float_type' => 'fl'
},
'info' => {
'spaces_before_argument' => {
@@ -258,9 +256,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'fl'
- },
+ 'float_type' => 'fl',
'node_content' => [
{}
],
@@ -386,9 +382,7 @@ $result_floats{'footnote_in_caption_and_error'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'fl'
- },
+ 'float_type' => 'fl',
'normalized' => 'label'
},
'info' => {},
diff --git a/tp/t/results/float/listoffloats_with_commands.pl
b/tp/t/results/float/listoffloats_with_commands.pl
index f809a83267..6a36f2684f 100644
--- a/tp/t/results/float/listoffloats_with_commands.pl
+++ b/tp/t/results/float/listoffloats_with_commands.pl
@@ -74,9 +74,7 @@ $result_trees{'listoffloats_with_commands'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => "th\x{e9}or\x{e8}me"
- }
+ 'float_type' => "th\x{e9}or\x{e8}me"
},
'info' => {
'spaces_before_argument' => {
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl
b/tp/t/results/float/numbering_captions_listoffloats.pl
index e91178dc66..3ba9c23d9a 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -247,9 +247,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -403,9 +401,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'shortcaption' => {}
},
'info' => {
@@ -558,9 +554,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -659,9 +653,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
],
'extra' => {
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -751,9 +743,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
],
'extra' => {
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- }
+ 'float_type' => ''
},
'source_info' => {
'file_name' => '',
@@ -887,9 +877,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'shortcaption' => {}
},
'source_info' => {
@@ -1037,9 +1025,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -1204,9 +1190,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Warning'
- },
+ 'float_type' => 'Warning',
'node_content' => [
{}
],
@@ -1718,9 +1702,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -1857,9 +1839,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -2118,9 +2098,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => "th\x{e9}or\x{e8}me"
- },
+ 'float_type' => "th\x{e9}or\x{e8}me",
'node_content' => [
{}
],
@@ -2276,9 +2254,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -2443,9 +2419,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Warning'
- },
+ 'float_type' => 'Warning',
'node_content' => [
{}
],
@@ -2738,9 +2712,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
],
'extra' => {
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -3080,9 +3052,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -3234,9 +3204,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -3486,9 +3454,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -3829,9 +3795,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -4071,9 +4035,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -4230,9 +4192,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -4477,9 +4437,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -4992,9 +4950,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {
'spaces_before_argument' => {
@@ -5068,9 +5024,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => "th\x{e9}or\x{e8}me"
- }
+ 'float_type' => "th\x{e9}or\x{e8}me"
},
'info' => {
'spaces_before_argument' => {
@@ -6170,9 +6124,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'info' => {},
'structure' => {}
},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'label-but-no-type',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6190,9 +6142,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'cmdname' => 'float',
'extra' => {
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'label-but-no-type-and-no-caption'
},
'info' => {},
@@ -6204,9 +6154,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'cmdname' => 'float',
'extra' => {
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- }
+ 'float_type' => ''
}
},
{
@@ -6219,9 +6167,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'shortcaption' => {
'cmdname' => 'shortcaption',
'extra' => {
@@ -6240,9 +6186,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'label-but-no-type-2',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6273,9 +6217,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'section_number' => 1
}
},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'label-but-no-type-in-chapter',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6304,9 +6246,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'info' => {},
'structure' => {}
},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'label-but-no-type-in-unnumbered',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6335,9 +6275,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'info' => {},
'structure' => {}
},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'label-but-no-type-in-unnumbered-subsec-in-chapter',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6364,9 +6302,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'info' => {}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'text-with-a-lot-of-features',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6390,9 +6326,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'shortcaption' => {
'cmdname' => 'shortcaption',
'extra' => {
@@ -6412,9 +6346,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'text-in-chapter'
},
'info' => {},
@@ -6433,9 +6365,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'info' => {}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption'
},
'info' => {},
@@ -6454,9 +6384,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'section_number' => '1.1'
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'text-in-section'
},
'info' => {},
@@ -6474,9 +6402,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'unnumbered-float',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6505,9 +6431,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'info' => {},
'structure' => {}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'Section-within-unnumbered-float',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6538,9 +6462,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'section_number' => 2
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'Chapter-with-subsec-float',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6564,9 +6486,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'unnumbered-sec-float',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6597,9 +6517,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
'section_number' => 'A'
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'appendix-sec-float',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6625,9 +6543,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Warning'
- },
+ 'float_type' => 'Warning',
'normalized' => 'warning-in-top',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6651,9 +6567,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Warning'
- },
+ 'float_type' => 'Warning',
'normalized' => 'warning-in-chapter',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -6679,9 +6593,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => "th\x{e9}or\x{e8}me"
- },
+ 'float_type' => "th\x{e9}or\x{e8}me",
'normalized' => 'theoreme'
},
'info' => {},
diff --git a/tp/t/results/float/ref_to_float.pl
b/tp/t/results/float/ref_to_float.pl
index e8fceeedec..55a9a3914c 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -86,9 +86,7 @@ $result_trees{'ref_to_float'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -178,9 +176,7 @@ $result_trees{'ref_to_float'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -325,9 +321,7 @@ $result_floats{'ref_to_float'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'Label2'
},
'info' => {},
@@ -340,9 +334,7 @@ $result_floats{'ref_to_float'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'Label1'
},
'info' => {},
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index 2c62937270..66ab0562a3 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -117,9 +117,7 @@ $result_trees{'simple'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Type'
- },
+ 'float_type' => 'Type',
'node_content' => [
{}
],
@@ -172,9 +170,7 @@ $result_floats{'simple'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Type'
- },
+ 'float_type' => 'Type',
'normalized' => 'Label'
},
'info' => {},
diff --git a/tp/t/results/float/special_characters_in_float_type.pl
b/tp/t/results/float/special_characters_in_float_type.pl
index d1415d856d..e1cb4caedc 100644
--- a/tp/t/results/float/special_characters_in_float_type.pl
+++ b/tp/t/results/float/special_characters_in_float_type.pl
@@ -341,9 +341,7 @@ $result_trees{'special_characters_in_float_type'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'A < " `` ` \' \' \\aaa . --- in var'
- },
+ 'float_type' => 'A < " `` ` \' \' \\aaa . --- in var',
'node_content' => [
{},
{},
@@ -411,9 +409,7 @@ $result_trees{'special_characters_in_float_type'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'A < " `` ` \' \' \\aaa . --- in var'
- }
+ 'float_type' => 'A < " `` ` \' \' \\aaa . --- in var'
},
'info' => {
'spaces_before_argument' => {
@@ -601,9 +597,7 @@ $result_floats{'special_characters_in_float_type'} = {
'section_number' => 1
}
},
- 'float_type' => {
- 'normalized' => 'A < " `` ` \' \' \\aaa . --- in var'
- },
+ 'float_type' => 'A < " `` ` \' \' \\aaa . --- in var',
'normalized' =>
'L-_003c-_0022-_0060_0060-_0060-_0027-_0027-_005caaa-_002e-_002d_002d_002d-in-var'
},
'info' => {},
diff --git a/tp/t/results/html_tests/float_copying.pl
b/tp/t/results/html_tests/float_copying.pl
index 622484e002..fa794654a9 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -562,9 +562,7 @@ $result_trees{'float_copying'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Copyright notice'
- },
+ 'float_type' => 'Copyright notice',
'node_content' => [
{}
],
@@ -1227,9 +1225,7 @@ $result_trees{'float_copying'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Copyright notice'
- }
+ 'float_type' => 'Copyright notice'
},
'info' => {
'spaces_before_argument' => {
@@ -1645,9 +1641,7 @@ $result_floats{'float_copying'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Copyright notice'
- },
+ 'float_type' => 'Copyright notice',
'normalized' => 'public-domain'
},
'info' => {},
diff --git a/tp/t/results/html_tests/transliterated_names_conflicts.pl
b/tp/t/results/html_tests/transliterated_names_conflicts.pl
index 6b268df9da..9dfaf397dc 100644
--- a/tp/t/results/html_tests/transliterated_names_conflicts.pl
+++ b/tp/t/results/html_tests/transliterated_names_conflicts.pl
@@ -383,9 +383,7 @@ $result_trees{'transliterated_names_conflicts'} = [
],
'extra' => {
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Figure'
- },
+ 'float_type' => 'Figure',
'node_content' => [
{}
],
@@ -1036,9 +1034,7 @@ $result_floats{'transliterated_names_conflicts'} = {
'section_number' => 2
}
},
- 'float_type' => {
- 'normalized' => 'Figure'
- },
+ 'float_type' => 'Figure',
'normalized' => 'Pr_00e8s'
},
'info' => {},
diff --git a/tp/t/results/info_tests/empty_caption.pl
b/tp/t/results/info_tests/empty_caption.pl
index 61d661bcc8..24467fd7cc 100644
--- a/tp/t/results/info_tests/empty_caption.pl
+++ b/tp/t/results/info_tests/empty_caption.pl
@@ -133,9 +133,7 @@ $result_trees{'empty_caption'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'a'
- },
+ 'float_type' => 'a',
'node_content' => [
{}
],
@@ -176,9 +174,7 @@ $result_trees{'empty_caption'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'a'
- }
+ 'float_type' => 'a'
},
'info' => {
'spaces_before_argument' => {
@@ -275,9 +271,7 @@ $result_floats{'empty_caption'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'a'
- },
+ 'float_type' => 'a',
'normalized' => 'b'
},
'info' => {},
diff --git a/tp/t/results/info_tests/error_in_footnote.pl
b/tp/t/results/info_tests/error_in_footnote.pl
index 04b5b95ff3..0b27be14f6 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -252,9 +252,7 @@ $result_trees{'error_in_footnote'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -295,9 +293,7 @@ $result_trees{'error_in_footnote'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {
'spaces_before_argument' => {
@@ -334,9 +330,7 @@ $result_trees{'error_in_footnote'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {
'spaces_before_argument' => {
@@ -462,9 +456,7 @@ $result_floats{'error_in_footnote'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'label'
},
'info' => {},
diff --git a/tp/t/results/info_tests/float_long_captions.pl
b/tp/t/results/info_tests/float_long_captions.pl
index c7d5d96fb8..ef3b076edf 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -130,9 +130,7 @@ $result_trees{'float_long_captions'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -250,9 +248,7 @@ $result_trees{'float_long_captions'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -293,9 +289,7 @@ $result_trees{'float_long_captions'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {
'spaces_before_argument' => {
@@ -397,9 +391,7 @@ $result_floats{'float_long_captions'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'text1'
},
'info' => {},
@@ -416,9 +408,7 @@ $result_floats{'float_long_captions'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'text2'
},
'info' => {},
diff --git a/tp/t/results/info_tests/float_without_type.pl
b/tp/t/results/info_tests/float_without_type.pl
index c72c46d241..f4ba681cda 100644
--- a/tp/t/results/info_tests/float_without_type.pl
+++ b/tp/t/results/info_tests/float_without_type.pl
@@ -106,9 +106,7 @@ $result_trees{'float_without_type'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'a'
- }
+ 'float_type' => 'a'
},
'info' => {
'spaces_before_argument' => {
@@ -145,9 +143,7 @@ $result_trees{'float_without_type'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'a'
- }
+ 'float_type' => 'a'
},
'info' => {
'spaces_before_argument' => {
@@ -234,9 +230,7 @@ $result_floats{'float_without_type'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'a'
- }
+ 'float_type' => 'a'
},
'info' => {}
}
diff --git a/tp/t/results/invalid_nestings/float_in_style_command.pl
b/tp/t/results/invalid_nestings/float_in_style_command.pl
index a849f838c6..dd11c509f5 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -138,9 +138,7 @@ $result_trees{'float_in_style_command'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'A'
- },
+ 'float_type' => 'A',
'node_content' => [
{}
],
@@ -222,9 +220,7 @@ $result_floats{'float_in_style_command'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'A'
- },
+ 'float_type' => 'A',
'normalized' => 'B'
},
'info' => {},
diff --git a/tp/t/results/invalid_nestings/section_on_float_line.pl
b/tp/t/results/invalid_nestings/section_on_float_line.pl
index e14f624627..6ad5e031cd 100644
--- a/tp/t/results/invalid_nestings/section_on_float_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_float_line.pl
@@ -38,9 +38,7 @@ $result_trees{'section_on_float_line'} = {
],
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 't'
- },
+ 'float_type' => 't',
'node_content' => [
{}
],
@@ -157,9 +155,7 @@ $result_floats{'section_on_float_line'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 't'
- },
+ 'float_type' => 't',
'normalized' => 'l'
},
'info' => {},
diff --git a/tp/t/results/latex_tests/float_and_refs.pl
b/tp/t/results/latex_tests/float_and_refs.pl
index 8d9d99f75c..fc5c2e8ae7 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -295,9 +295,7 @@ $result_trees{'float_and_refs'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -457,9 +455,7 @@ $result_trees{'float_and_refs'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Thing'
- },
+ 'float_type' => 'Thing',
'node_content' => [
{}
],
@@ -619,9 +615,7 @@ $result_trees{'float_and_refs'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Figure'
- },
+ 'float_type' => 'Figure',
'node_content' => [
{}
],
@@ -1604,9 +1598,7 @@ $result_trees{'float_and_refs'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- }
+ 'float_type' => ''
},
'source_info' => {
'file_name' => '',
@@ -1633,9 +1625,7 @@ $result_trees{'float_and_refs'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Figure'
- }
+ 'float_type' => 'Figure'
},
'info' => {
'spaces_before_argument' => {
@@ -1667,9 +1657,7 @@ $result_trees{'float_and_refs'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Thing'
- }
+ 'float_type' => 'Thing'
},
'info' => {
'spaces_before_argument' => {
@@ -1997,9 +1985,7 @@ $result_floats{'float_and_refs'} = {
'section_number' => 1
}
},
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'no-type',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -2025,9 +2011,7 @@ $result_floats{'float_and_refs'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Figure'
- },
+ 'float_type' => 'Figure',
'normalized' => 'my-figure',
'shortcaption' => {
'cmdname' => 'shortcaption',
@@ -2053,9 +2037,7 @@ $result_floats{'float_and_refs'} = {
}
},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Thing'
- },
+ 'float_type' => 'Thing',
'normalized' => 'with-type',
'shortcaption' => {
'cmdname' => 'shortcaption',
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 6060970a74..31b2a73b9e 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
@@ -638,9 +638,7 @@ $result_trees{'comment_space_command_on_line'} = {
],
'extra' => {
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -696,9 +694,7 @@ $result_trees{'comment_space_command_on_line'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text '
- }
+ 'float_type' => 'Text '
},
'info' => {
'spaces_before_argument' => {
@@ -916,9 +912,7 @@ $result_floats{'comment_space_command_on_line'} = {
'section_number' => 1
}
},
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'label'
},
'info' => {},
diff --git a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
index 2b41eac6ab..d760c7748a 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
@@ -325,9 +325,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'Figure'
- }
+ 'float_type' => 'Figure'
},
'info' => {
'spaces_before_argument' => {
@@ -364,9 +362,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
],
'cmdname' => 'listoffloats',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Figure'
- }
+ 'float_type' => 'Figure'
},
'info' => {
'spaces_before_argument' => {
@@ -680,9 +676,7 @@ $result_floats{'equivalent_nodes_defined_linked'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Figure'
- }
+ 'float_type' => 'Figure'
},
'info' => {}
}
diff --git a/tp/t/results/moresectioning/no_element.pl
b/tp/t/results/moresectioning/no_element.pl
index 111757bc91..32cb792164 100644
--- a/tp/t/results/moresectioning/no_element.pl
+++ b/tp/t/results/moresectioning/no_element.pl
@@ -391,9 +391,7 @@ $result_trees{'no_element'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -698,9 +696,7 @@ $result_floats{'no_element'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'float-anchor'
},
'info' => {},
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 89d46c85e9..8e75442d76 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -318,9 +318,7 @@ $result_trees{'placed_things_before_element'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -784,9 +782,7 @@ $result_floats{'placed_things_before_element'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'float-anchor'
},
'info' => {},
diff --git a/tp/t/results/moresectioning/placed_things_before_node.pl
b/tp/t/results/moresectioning/placed_things_before_node.pl
index daeeea802f..c1e6804860 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -322,9 +322,7 @@ $result_trees{'placed_things_before_node'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'node_content' => [
{}
],
@@ -1004,9 +1002,7 @@ $result_floats{'placed_things_before_node'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => ''
- },
+ 'float_type' => '',
'normalized' => 'float-anchor'
},
'info' => {},
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl
b/tp/t/results/paragraph/commands_in_flushright.pl
index 67801847d2..9c620db1f3 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -820,9 +820,7 @@ $result_trees{'commands_in_flushright'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'label'
- },
+ 'float_type' => 'label',
'node_content' => [
{}
],
@@ -1296,9 +1294,7 @@ $result_floats{'commands_in_flushright'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'label'
- },
+ 'float_type' => 'label',
'normalized' => 'type'
},
'info' => {},
diff --git a/tp/t/results/preformatted/caption_in_example.pl
b/tp/t/results/preformatted/caption_in_example.pl
index 95e34b2e20..d3549d9b19 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -183,9 +183,7 @@ $result_trees{'caption_in_example'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'float'
- }
+ 'float_type' => 'float'
},
'info' => {
'spaces_before_argument' => {
@@ -253,9 +251,7 @@ $result_floats{'caption_in_example'} = {
'float' => {}
}
},
- 'float_type' => {
- 'normalized' => 'float'
- }
+ 'float_type' => 'float'
},
'info' => {}
}
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 7a4028b813..dc268b9d6f 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -257,9 +257,7 @@ $result_trees{'double_node_anchor_float'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {
'spaces_before_argument' => {
@@ -341,9 +339,7 @@ $result_trees{'double_node_anchor_float'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {
'spaces_before_argument' => {
@@ -425,9 +421,7 @@ $result_trees{'double_node_anchor_float'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'node_content' => [
{}
],
@@ -696,27 +690,21 @@ $result_floats{'double_node_anchor_float'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {}
},
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- }
+ 'float_type' => 'Text'
},
'info' => {}
},
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'Text'
- },
+ 'float_type' => 'Text',
'normalized' => 'float1'
},
'info' => {},
diff --git a/tp/t/results/sectioning/equivalent_labels.pl
b/tp/t/results/sectioning/equivalent_labels.pl
index 916dd04d51..05c9d37e9e 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -160,9 +160,7 @@ $result_trees{'equivalent_labels'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'truc'
- },
+ 'float_type' => 'truc',
'node_content' => [
{}
],
@@ -447,9 +445,7 @@ $result_menus{'equivalent_labels'} = {
'menu_next' => {
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'truc'
- },
+ 'float_type' => 'truc',
'normalized' => 'floa'
},
'info' => {},
@@ -501,9 +497,7 @@ $result_floats{'equivalent_labels'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'truc'
- },
+ 'float_type' => 'truc',
'normalized' => 'floa'
},
'info' => {},
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 6f15c9f028..db0137a7e2 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -741,9 +741,7 @@ $result_trees{'commands_and_spaces'} = {
],
'extra' => {
'caption' => {},
- 'float_type' => {
- 'normalized' => 'ff'
- },
+ 'float_type' => 'ff',
'node_content' => [
{}
],
@@ -1954,9 +1952,7 @@ $result_floats{'commands_and_spaces'} = {
},
'info' => {}
},
- 'float_type' => {
- 'normalized' => 'ff'
- },
+ 'float_type' => 'ff',
'normalized' => 'b',
'shortcaption' => {
'cmdname' => 'shortcaption',
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl
b/tp/t/results/xml_tests/comments_end_lines.pl
index 470f042618..07c3dbc7c7 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -832,9 +832,7 @@ $result_trees{'comments_end_lines'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'f'
- },
+ 'float_type' => 'f',
'node_content' => [
{}
],
@@ -1096,9 +1094,7 @@ $result_floats{'comments_end_lines'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'f'
- },
+ 'float_type' => 'f',
'normalized' => 'g'
},
'info' => {},
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index 740f71c635..52e7024401 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -2050,9 +2050,7 @@ $result_trees{'comments_on_block_command_lines'} = {
}
],
'extra' => {
- 'float_type' => {
- 'normalized' => 'f'
- },
+ 'float_type' => 'f',
'node_content' => [
{}
],
@@ -2392,9 +2390,7 @@ $result_floats{'comments_on_block_command_lines'} = {
{
'cmdname' => 'float',
'extra' => {
- 'float_type' => {
- 'normalized' => 'f'
- },
+ 'float_type' => 'f',
'normalized' => 'g'
},
'info' => {},
diff --git a/tp/t/results/xml_tests/image_inline_or_not.pl
b/tp/t/results/xml_tests/image_inline_or_not.pl
index 6c4f4a2bdc..ef2e52957c 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -1415,9 +1415,7 @@ $result_trees{'image_inline_or_not'} = {
'extra' => {
'caption' => {},
'float_section' => {},
- 'float_type' => {
- 'normalized' => 'F'
- },
+ 'float_type' => 'F',
'node_content' => [
{}
],
@@ -1726,9 +1724,7 @@ $result_floats{'image_inline_or_not'} = {
'section_number' => 1
}
},
- 'float_type' => {
- 'normalized' => 'F'
- },
+ 'float_type' => 'F',
'normalized' => 'g'
},
'info' => {},
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Common.pm (_substitute_references), tp/Texinfo/Convert/Converter.pm (float_type_number) (float_name_caption), tp/Texinfo/Convert/HTML.pm (_convert_listoffloats_command), tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/NodeNameNormalization.pm (_parse_float_type), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/TexinfoMarkup.p (_convert), tp/Texinfo/XS/parsetexi/api.c (store_additional_info): put float_type directly in extra [...],
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Convert/NodeNameNormalization.pm (_parse_float_type), tp/Texinfo/XS/parsetexi/api.c (store_additional_info), tp/Texinfo/XS/parsetexi/end_line.c (parse_float_type), tp/Texinfo/XS/parsetexi/extra.c (add_extra_float_type), tp/Texinfo/XS/parsetexi/tree.c (destroy_associated_info): do not store 'content' in extra float_type, it is not used anymore. Do corresponding changes in the XS parser, removing the add_extra_float_type function, the extra_float_type extra type and the EXTRA_F [...]
- Next by Date:
branch master updated: * tp/Texinfo/Convert/NodeNameNormalization.pm (_parse_float_type), tp/Texinfo/XS/parsetexi/end_line.c (parse_float_type): check only that there is one argument, not that there is content in the argument.
- Previous by thread:
branch master updated: * tp/Texinfo/Convert/NodeNameNormalization.pm (_parse_float_type), tp/Texinfo/XS/parsetexi/api.c (store_additional_info), tp/Texinfo/XS/parsetexi/end_line.c (parse_float_type), tp/Texinfo/XS/parsetexi/extra.c (add_extra_float_type), tp/Texinfo/XS/parsetexi/tree.c (destroy_associated_info): do not store 'content' in extra float_type, it is not used anymore. Do corresponding changes in the XS parser, removing the add_extra_float_type function, the extra_float_type extra type and the EXTRA_F [...]
- Next by thread:
branch master updated: * tp/Texinfo/Convert/NodeNameNormalization.pm (_parse_float_type), tp/Texinfo/XS/parsetexi/end_line.c (parse_float_type): check only that there is one argument, not that there is content in the argument.
- Index(es):