[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Con
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm (_isolate_last_space), tp/Texinfo/Transformations.pm, tp/Texinfo/XS/parsetexi/extra.c (add_info_element_oot), tp/Texinfo/XS/parsetexi/parser.c (isolate_last_space): move comment_at_end from extra to info in element. |
|
Date: |
Fri, 18 Nov 2022 02:33:07 -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 daab1c4481 * tp/Texinfo/Convert/Converter.pm,
tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm,
tp/Texinfo/ParserNonXS.pm (_isolate_last_space), tp/Texinfo/Transformations.pm,
tp/Texinfo/XS/parsetexi/extra.c (add_info_element_oot),
tp/Texinfo/XS/parsetexi/parser.c (isolate_last_space): move comment_at_end from
extra to info in element.
daab1c4481 is described below
commit daab1c4481563f474cc508894445e473610463dc
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 18 08:32:56 2022 +0100
* tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/Texinfo.pm,
tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm
(_isolate_last_space), tp/Texinfo/Transformations.pm,
tp/Texinfo/XS/parsetexi/extra.c (add_info_element_oot),
tp/Texinfo/XS/parsetexi/parser.c (isolate_last_space): move
comment_at_end from extra to info in element.
---
ChangeLog | 9 +++
tp/Texinfo/Convert/Converter.pm | 4 +-
tp/Texinfo/Convert/Texinfo.pm | 4 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 2 +-
tp/Texinfo/ParserNonXS.pm | 12 +--
tp/Texinfo/Transformations.pm | 2 +-
tp/Texinfo/XS/parsetexi/extra.c | 6 ++
tp/Texinfo/XS/parsetexi/parser.c | 2 +-
tp/Texinfo/XS/parsetexi/parser.h | 1 +
tp/t/results/alias/simple.pl | 6 +-
tp/t/results/columnfractions/empty_comment.pl | 2 +-
tp/t/results/columnfractions/good_comment.pl | 2 +-
tp/t/results/columnfractions/good_space_comment.pl | 6 +-
.../index_entry_in_preformatted.pl | 6 +-
tp/t/results/coverage/comment_on_cartouche_line.pl | 2 +-
tp/t/results/coverage/comment_on_group_line.pl | 2 +-
.../coverage/formats_only_title_comments.pl | 8 +-
tp/t/results/coverage/table.pl | 8 +-
tp/t/results/coverage/table_command_comment.pl | 2 +-
.../results/float/comment_space_comand_in_float.pl | 8 +-
tp/t/results/float/empty_label_no_space_comment.pl | 2 +-
.../float/empty_label_with_space_comment.pl | 6 +-
.../itemize/comment_first_on_enumerate_line.pl | 2 +-
.../itemize/comment_first_on_itemize_line.pl | 2 +-
tp/t/results/itemize/empty_accent_argument.pl | 2 +-
tp/t/results/itemize/enumerate_argument.pl | 8 +-
tp/t/results/itemize/enumerate_argument_item.pl | 8 +-
tp/t/results/latex_tests/indices.pl | 6 +-
tp/t/results/menu/comment_on_menu_line.pl | 2 +-
.../misc_commands/comment_space_command_on_line.pl | 60 ++++++---------
tp/t/results/misc_commands/setfilename.pl | 8 +-
.../multitable/prototype_brace_no_brace_comment.pl | 2 +-
.../results/quotation/comment_on_quotation_line.pl | 2 +-
.../quotation/only_comment_on_quotation_line.pl | 2 +-
tp/t/results/raw/misc_raw_comments.pl | 10 +--
.../sectioning/empty_nodes_with_commands.pl | 2 +-
tp/t/results/sectioning/empty_ref_arg.pl | 12 +--
tp/t/results/sectioning/node_line_arguments.pl | 12 +--
tp/t/results/xml_tests/comments_end_lines.pl | 60 +++++----------
.../xml_tests/comments_on_block_command_lines.pl | 88 ++++++++--------------
.../xml_tests/comments_on_misc_command_line.pl | 30 +++-----
tp/t/results/xml_tests/raw_and_comments.pl | 16 ++--
42 files changed, 169 insertions(+), 267 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 649d2c6606..d927150a1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-11-18 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/Texinfo.pm,
+ tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm
+ (_isolate_last_space), tp/Texinfo/Transformations.pm,
+ tp/Texinfo/XS/parsetexi/extra.c (add_info_element_oot),
+ tp/Texinfo/XS/parsetexi/parser.c (isolate_last_space): move
+ comment_at_end from extra to info in element.
+
2022-11-17 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm,
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 2103a45765..cc63b188ec 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1306,8 +1306,8 @@ sub format_comment_or_return_end_line($$)
my $end_line;
- my $comment = $element->{'args'}->[-1]->{'extra'}->{'comment_at_end'}
- if $element->{'args'} and $element->{'args'}->[-1]->{'extra'};
+ my $comment = $element->{'args'}->[-1]->{'info'}->{'comment_at_end'}
+ if $element->{'args'} and $element->{'args'}->[-1]->{'info'};
if ($comment) {
$end_line = $self->convert_tree($comment);
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 29459b560e..7a0b31b0dd 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -141,8 +141,8 @@ sub convert_to_texinfo($;$)
if ($element->{'info'} and $element->{'info'}->{'spaces_after_argument'}) {
$result .= $element->{'info'}->{'spaces_after_argument'};
}
- if ($element->{'extra'} and $element->{'extra'}->{'comment_at_end'}) {
- $result .= convert_to_texinfo($element->{'extra'}->{'comment_at_end'},
+ if ($element->{'info'} and $element->{'info'}->{'comment_at_end'}) {
+ $result .= convert_to_texinfo($element->{'info'}->{'comment_at_end'},
$expand_replaced);
}
$result .= '}' if ($element->{'type'}
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 7502ceeef5..ca1805dc46 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1341,7 +1341,7 @@ sub _convert($$;$)
} elsif ($content->{'cmdname'} eq 'c'
or $content->{'cmdname'} eq 'comment') {
# NOTE it does not happen right now, because a comment
- # will be in extra comment_at_end. If comments are back
+ # will be in info comment_at_end. If comments are back
# in the tree, they should be ignored here, as they would
# better be handled in format_comment_or_return_end_line
} else { # a command
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 3fabd0bc26..25cd2b9500 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2434,13 +2434,13 @@ sub _isolate_last_space
return if (!$current->{'contents'});
- # Store a final comment command in the 'extra' hash.
+ # Store a final comment command in the 'info' hash.
if (scalar(@{$current->{'contents'}}) >= 1
and $current->{'contents'}->[-1]->{'cmdname'}
and ($current->{'contents'}->[-1]->{'cmdname'} eq 'c'
or $current->{'contents'}->[-1]->{'cmdname'} eq 'comment')) {
- #$current->{'extra'} = {} if (!$current->{'extra'});
- $current->{'extra'}->{'comment_at_end'}
+ #$current->{'info'} = {} if (!$current->{'info'});
+ $current->{'info'}->{'comment_at_end'}
= _pop_element_from_contents($current);
# TODO: @c should probably not be allowed inside most brace commands
# as this would be difficult to implement properly in TeX.
@@ -7522,12 +7522,6 @@ I<caption> and I<shortcaption> holds the corresponding
tree elements for float. The C<@caption> or C<@shortcaption>
have the float tree element stored in I<float>.
-=item C<@ifclear>
-
-=item C<@ifset>
-
-The original line is in I<line>.
-
=item C<@inlinefmt>
=item C<@inlineraw>
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index 145d79d37c..44dce688a2 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -262,7 +262,7 @@ sub _new_node($$$$)
'info' => {'spaces_before_argument' => ' '}};
my $node_line_arg = $node->{'args'}->[0];
$node_line_arg->{'parent'} = $node;
- $node_line_arg->{'extra'}->{'comment_at_end'} = $comment_at_end
+ $node_line_arg->{'info'}->{'comment_at_end'} = $comment_at_end
if (defined($comment_at_end));
@{$node_line_arg->{'contents'}} = (@{$node_tree->{'contents'}});
if ($appended_number) {
diff --git a/tp/Texinfo/XS/parsetexi/extra.c b/tp/Texinfo/XS/parsetexi/extra.c
index 5e3f8bea04..9875525df0 100644
--- a/tp/Texinfo/XS/parsetexi/extra.c
+++ b/tp/Texinfo/XS/parsetexi/extra.c
@@ -61,6 +61,12 @@ add_extra_element_oot (ELEMENT *e, char *key, ELEMENT *value)
add_associated_info_key (e->extra_info, key, value, extra_element_oot);
}
+void
+add_info_element_oot (ELEMENT *e, char *key, ELEMENT *value)
+{
+ add_associated_info_key (e->info_info, key, value, extra_element_oot);
+}
+
/* Add an extra key that is a reference to the contents array of another
element (for example, 'node_content' on a node command element). */
void
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 42da476b72..1a26e18010 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -764,7 +764,7 @@ isolate_last_space (ELEMENT *current)
if (last_contents_child(current)->cmd == CM_c
|| last_contents_child(current)->cmd == CM_comment)
{
- add_extra_element_oot (current, "comment_at_end",
+ add_info_element_oot (current, "comment_at_end",
pop_element_from_contents (current));
}
diff --git a/tp/Texinfo/XS/parsetexi/parser.h b/tp/Texinfo/XS/parsetexi/parser.h
index a23915f436..3a329591ab 100644
--- a/tp/Texinfo/XS/parsetexi/parser.h
+++ b/tp/Texinfo/XS/parsetexi/parser.h
@@ -225,6 +225,7 @@ void add_extra_string_dup (ELEMENT *e, char *key, char
*value);
void add_extra_integer (ELEMENT *e, char *key, long value);
void add_info_string (ELEMENT *e, char *key, char *value);
void add_info_string_dup (ELEMENT *e, char *key, char *value);
+void add_info_element_oot (ELEMENT *e, char *key, ELEMENT *value);
KEY_PAIR *lookup_extra (ELEMENT *e, char *key);
KEY_PAIR *lookup_info (ELEMENT *e, char *key);
diff --git a/tp/t/results/alias/simple.pl b/tp/t/results/alias/simple.pl
index 28dc86de24..8712421615 100644
--- a/tp/t/results/alias/simple.pl
+++ b/tp/t/results/alias/simple.pl
@@ -53,7 +53,7 @@ $result_trees{'simple'} = {
'text' => 'o-theralias=verb'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -69,9 +69,7 @@ $result_trees{'simple'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
diff --git a/tp/t/results/columnfractions/empty_comment.pl
b/tp/t/results/columnfractions/empty_comment.pl
index addef8e7b1..57f2d43d9b 100644
--- a/tp/t/results/columnfractions/empty_comment.pl
+++ b/tp/t/results/columnfractions/empty_comment.pl
@@ -16,7 +16,7 @@ $result_trees{'empty_comment'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/columnfractions/good_comment.pl
b/tp/t/results/columnfractions/good_comment.pl
index 905e8b526e..8f91804e38 100644
--- a/tp/t/results/columnfractions/good_comment.pl
+++ b/tp/t/results/columnfractions/good_comment.pl
@@ -21,7 +21,7 @@ $result_trees{'good_comment'} = {
'text' => '0.4 .6 5.'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/columnfractions/good_space_comment.pl
b/tp/t/results/columnfractions/good_space_comment.pl
index 9537195f9b..adfe8e390d 100644
--- a/tp/t/results/columnfractions/good_space_comment.pl
+++ b/tp/t/results/columnfractions/good_space_comment.pl
@@ -21,7 +21,7 @@ $result_trees{'good_space_comment'} = {
'text' => '0 1'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -37,9 +37,7 @@ $result_trees{'good_space_comment'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index 3591596428..668fb82a85 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -214,7 +214,7 @@ $result_trees{'index_entry_in_preformatted'} = {
'text' => 'other'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -230,9 +230,7 @@ $result_trees{'index_entry_in_preformatted'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index e0009a2a56..452519d072 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -12,7 +12,7 @@ $result_trees{'comment_on_cartouche_line'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/coverage/comment_on_group_line.pl
b/tp/t/results/coverage/comment_on_group_line.pl
index 068217b25f..fed2eab79d 100644
--- a/tp/t/results/coverage/comment_on_group_line.pl
+++ b/tp/t/results/coverage/comment_on_group_line.pl
@@ -12,7 +12,7 @@ $result_trees{'comment_on_group_line'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/coverage/formats_only_title_comments.pl
b/tp/t/results/coverage/formats_only_title_comments.pl
index ba38a7a427..9ea9954d58 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -103,7 +103,7 @@ $result_trees{'formats_only_title_comments'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -315,7 +315,7 @@ $result_trees{'formats_only_title_comments'} = {
'type' => 'command_as_argument'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -331,9 +331,7 @@ $result_trees{'formats_only_title_comments'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 79337be053..1745aae46d 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -176,7 +176,7 @@ $result_trees{'table'} = {
'type' => 'command_as_argument'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -374,7 +374,7 @@ $result_trees{'table'} = {
'text' => 'itemx vtable'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -390,9 +390,7 @@ $result_trees{'table'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
diff --git a/tp/t/results/coverage/table_command_comment.pl
b/tp/t/results/coverage/table_command_comment.pl
index e4da2b235f..ef39d98fde 100644
--- a/tp/t/results/coverage/table_command_comment.pl
+++ b/tp/t/results/coverage/table_command_comment.pl
@@ -23,7 +23,7 @@ $result_trees{'table_command_comment'} = {
'type' => 'command_as_argument'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
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 faab92710d..7389dabda6 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -60,7 +60,7 @@ $result_trees{'comment_space_comand_in_float'} = {
'cmdname' => ' '
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -76,9 +76,7 @@ $result_trees{'comment_space_comand_in_float'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_before_argument' => ' '
},
'type' => 'block_line_arg'
@@ -163,7 +161,7 @@ $result_trees{'comment_space_comand_in_float'} = {
'cmdname' => ' '
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
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 4c881363c6..bb6110f147 100644
--- a/tp/t/results/float/empty_label_no_space_comment.pl
+++ b/tp/t/results/float/empty_label_no_space_comment.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_label_no_space_comment'} = {
'type' => 'block_line_arg'
},
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
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 efcf87c3a9..76358260cc 100644
--- a/tp/t/results/float/empty_label_with_space_comment.pl
+++ b/tp/t/results/float/empty_label_with_space_comment.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_label_with_space_comment'} = {
'type' => 'block_line_arg'
},
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -40,9 +40,7 @@ $result_trees{'empty_label_with_space_comment'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_before_argument' => ' '
},
'type' => 'block_line_arg'
diff --git a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
index 37063286e8..b90c38ed6c 100644
--- a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
+++ b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
@@ -12,7 +12,7 @@ $result_trees{'comment_first_on_enumerate_line'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index 25d4cf1b70..98f9632faf 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -18,7 +18,7 @@ $result_trees{'comment_first_on_itemize_line'} = {
'type' => 'command_as_argument_inserted'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/itemize/empty_accent_argument.pl
b/tp/t/results/itemize/empty_accent_argument.pl
index a784d3874d..8cb5355bc6 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -23,7 +23,7 @@ $result_trees{'empty_accent_argument'} = {
'type' => 'command_as_argument'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/itemize/enumerate_argument.pl
b/tp/t/results/itemize/enumerate_argument.pl
index 470a1da7ee..d3183afd45 100644
--- a/tp/t/results/itemize/enumerate_argument.pl
+++ b/tp/t/results/itemize/enumerate_argument.pl
@@ -80,7 +80,7 @@ $result_trees{'enumerate_argument'} = {
'text' => 'A'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -157,7 +157,7 @@ $result_trees{'enumerate_argument'} = {
'text' => 'z'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -173,9 +173,7 @@ $result_trees{'enumerate_argument'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
diff --git a/tp/t/results/itemize/enumerate_argument_item.pl
b/tp/t/results/itemize/enumerate_argument_item.pl
index 559c9361dd..c52a545cf4 100644
--- a/tp/t/results/itemize/enumerate_argument_item.pl
+++ b/tp/t/results/itemize/enumerate_argument_item.pl
@@ -132,7 +132,7 @@ $result_trees{'enumerate_argument_item'} = {
'text' => 'A'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -261,7 +261,7 @@ $result_trees{'enumerate_argument_item'} = {
'text' => 'z'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -277,9 +277,7 @@ $result_trees{'enumerate_argument_item'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
diff --git a/tp/t/results/latex_tests/indices.pl
b/tp/t/results/latex_tests/indices.pl
index b6e56d6c0a..4795e74a93 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -683,7 +683,7 @@ $result_trees{'indices'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -699,9 +699,7 @@ $result_trees{'indices'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
diff --git a/tp/t/results/menu/comment_on_menu_line.pl
b/tp/t/results/menu/comment_on_menu_line.pl
index 2c6bfd4a15..907c5b43c3 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -35,7 +35,7 @@ $result_trees{'comment_on_menu_line'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
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 6d6a858fa2..3c01e18b68 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
@@ -20,7 +20,7 @@ $result_trees{'comment_space_command_on_line'} = {
'cmdname' => ' '
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -68,7 +68,7 @@ $result_trees{'comment_space_command_on_line'} = {
'text' => 'Top'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -84,9 +84,7 @@ $result_trees{'comment_space_command_on_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -127,7 +125,7 @@ $result_trees{'comment_space_command_on_line'} = {
'cmdname' => ' '
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -143,9 +141,7 @@ $result_trees{'comment_space_command_on_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -177,7 +173,7 @@ $result_trees{'comment_space_command_on_line'} = {
'text' => 'chap'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -193,9 +189,7 @@ $result_trees{'comment_space_command_on_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -237,7 +231,7 @@ $result_trees{'comment_space_command_on_line'} = {
'cmdname' => ' '
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -253,9 +247,7 @@ $result_trees{'comment_space_command_on_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -276,7 +268,7 @@ $result_trees{'comment_space_command_on_line'} = {
'text' => 'on'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -292,9 +284,7 @@ $result_trees{'comment_space_command_on_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -328,7 +318,7 @@ $result_trees{'comment_space_command_on_line'} = {
'text' => 'off'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -380,7 +370,7 @@ $result_trees{'comment_space_command_on_line'} = {
'cmdname' => ' '
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -396,9 +386,7 @@ $result_trees{'comment_space_command_on_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -445,7 +433,7 @@ $result_trees{'comment_space_command_on_line'} = {
'cmdname' => ' '
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -461,9 +449,7 @@ $result_trees{'comment_space_command_on_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -493,7 +479,7 @@ $result_trees{'comment_space_command_on_line'} = {
'text' => 'cp'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -509,9 +495,7 @@ $result_trees{'comment_space_command_on_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -580,7 +564,7 @@ $result_trees{'comment_space_command_on_line'} = {
'text' => 'float'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -596,9 +580,7 @@ $result_trees{'comment_space_command_on_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -656,7 +638,7 @@ $result_trees{'comment_space_command_on_line'} = {
'cmdname' => ' '
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/misc_commands/setfilename.pl
b/tp/t/results/misc_commands/setfilename.pl
index de56b9dd4e..17d792db49 100644
--- a/tp/t/results/misc_commands/setfilename.pl
+++ b/tp/t/results/misc_commands/setfilename.pl
@@ -19,7 +19,7 @@ $result_trees{'setfilename'} = {
'text' => 'file_comment'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -89,7 +89,7 @@ $result_trees{'setfilename'} = {
'text' => 'file_space_comment'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -105,9 +105,7 @@ $result_trees{'setfilename'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
diff --git a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
index ebdc5bf8e9..e6b5a87203 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -25,7 +25,7 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
'text' => ' bb'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/quotation/comment_on_quotation_line.pl
b/tp/t/results/quotation/comment_on_quotation_line.pl
index 18572848ff..4bcc72c417 100644
--- a/tp/t/results/quotation/comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/comment_on_quotation_line.pl
@@ -20,7 +20,7 @@ $result_trees{'comment_on_quotation_line'} = {
'cmdname' => ' '
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/quotation/only_comment_on_quotation_line.pl
b/tp/t/results/quotation/only_comment_on_quotation_line.pl
index a54ce79411..47e7015f51 100644
--- a/tp/t/results/quotation/only_comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/only_comment_on_quotation_line.pl
@@ -12,7 +12,7 @@ $result_trees{'only_comment_on_quotation_line'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/raw/misc_raw_comments.pl
b/tp/t/results/raw/misc_raw_comments.pl
index d6334e7626..2be4869a22 100644
--- a/tp/t/results/raw/misc_raw_comments.pl
+++ b/tp/t/results/raw/misc_raw_comments.pl
@@ -17,7 +17,7 @@ $result_trees{'misc_raw_comments'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -56,7 +56,7 @@ $result_trees{'misc_raw_comments'} = {
'text' => 'html'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -130,7 +130,7 @@ $result_trees{'misc_raw_comments'} = {
'text' => 'tex'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -146,9 +146,7 @@ $result_trees{'misc_raw_comments'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
diff --git a/tp/t/results/sectioning/empty_nodes_with_commands.pl
b/tp/t/results/sectioning/empty_nodes_with_commands.pl
index 4551578de7..13fd94e39b 100644
--- a/tp/t/results/sectioning/empty_nodes_with_commands.pl
+++ b/tp/t/results/sectioning/empty_nodes_with_commands.pl
@@ -20,7 +20,7 @@ $result_trees{'empty_nodes_with_commands'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl
b/tp/t/results/sectioning/empty_ref_arg.pl
index 8ce53b889b..a62b34ea5c 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -212,7 +212,7 @@ $result_trees{'empty_ref_arg'} = {
'cmdname' => ' '
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -228,9 +228,7 @@ $result_trees{'empty_ref_arg'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => '
',
'spaces_before_argument' => ' '
@@ -256,7 +254,7 @@ $result_trees{'empty_ref_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -272,9 +270,7 @@ $result_trees{'empty_ref_arg'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_before_argument' => ' '
},
'type' => 'brace_command_arg'
diff --git a/tp/t/results/sectioning/node_line_arguments.pl
b/tp/t/results/sectioning/node_line_arguments.pl
index 915c7cd35c..055ff8c12f 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -372,7 +372,7 @@ $result_trees{'node_line_arguments'} = {
'text' => 'comment'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -388,9 +388,7 @@ $result_trees{'node_line_arguments'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -503,7 +501,7 @@ $result_trees{'node_line_arguments'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -519,9 +517,7 @@ $result_trees{'node_line_arguments'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' ',
'spaces_before_argument' => ' '
},
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl
b/tp/t/results/xml_tests/comments_end_lines.pl
index 087fa36e23..43a05ad5c5 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -61,7 +61,7 @@ $result_trees{'comments_end_lines'} = {
'text' => 'itemize'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -77,9 +77,7 @@ $result_trees{'comments_end_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -133,7 +131,7 @@ $result_trees{'comments_end_lines'} = {
'text' => 'enumerate'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -149,9 +147,7 @@ $result_trees{'comments_end_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -251,7 +247,7 @@ $result_trees{'comments_end_lines'} = {
'text' => 'table'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -267,9 +263,7 @@ $result_trees{'comments_end_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -335,7 +329,7 @@ $result_trees{'comments_end_lines'} = {
'text' => 'quotation'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -351,9 +345,7 @@ $result_trees{'comments_end_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -413,7 +405,7 @@ $result_trees{'comments_end_lines'} = {
'text' => 'group'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -429,9 +421,7 @@ $result_trees{'comments_end_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -491,7 +481,7 @@ $result_trees{'comments_end_lines'} = {
'text' => 'example'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -507,9 +497,7 @@ $result_trees{'comments_end_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -653,7 +641,7 @@ $result_trees{'comments_end_lines'} = {
'text' => 'multitable'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -669,9 +657,7 @@ $result_trees{'comments_end_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -751,7 +737,7 @@ $result_trees{'comments_end_lines'} = {
'text' => 'float'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -767,9 +753,7 @@ $result_trees{'comments_end_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -844,7 +828,7 @@ $result_trees{'comments_end_lines'} = {
'text' => 'flushright'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -860,9 +844,7 @@ $result_trees{'comments_end_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -922,7 +904,7 @@ $result_trees{'comments_end_lines'} = {
'text' => 'raggedright'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -938,9 +920,7 @@ $result_trees{'comments_end_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
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 4afbd96325..f604da6a78 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
@@ -18,7 +18,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'command_as_argument_inserted'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -121,7 +121,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'text' => 'x'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -137,9 +137,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
@@ -230,7 +228,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'command_as_argument'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -246,9 +244,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
@@ -347,7 +343,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'command_as_argument'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -363,9 +359,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
@@ -448,7 +442,7 @@ $result_trees{'comments_on_block_command_lines'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -551,7 +545,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'text' => 'a'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -567,9 +561,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
@@ -663,7 +655,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'command_as_argument'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -679,9 +671,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
@@ -773,7 +763,7 @@ $result_trees{'comments_on_block_command_lines'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -856,7 +846,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'text' => 'quotarg'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -872,9 +862,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
@@ -937,7 +925,7 @@ $result_trees{'comments_on_block_command_lines'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -1015,7 +1003,7 @@ $result_trees{'comments_on_block_command_lines'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -1127,7 +1115,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'text' => 'second arg'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -1143,9 +1131,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' ',
'spaces_before_argument' => ' '
},
@@ -1233,7 +1219,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'text' => 'third'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -1249,9 +1235,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' ',
'spaces_before_argument' => ' '
},
@@ -1347,7 +1331,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'text' => 'fourth'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -1363,9 +1347,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' ',
'spaces_before_argument' => ' '
},
@@ -1429,7 +1411,7 @@ $result_trees{'comments_on_block_command_lines'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -1516,7 +1498,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'text' => '0.4 0.6'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -1532,9 +1514,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -1697,7 +1677,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'bracketed'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -1713,9 +1693,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
@@ -1863,7 +1841,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'text' => 'g'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -1879,9 +1857,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'block_line_arg'
@@ -1956,7 +1932,7 @@ $result_trees{'comments_on_block_command_lines'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -2034,7 +2010,7 @@ $result_trees{'comments_on_block_command_lines'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
diff --git a/tp/t/results/xml_tests/comments_on_misc_command_line.pl
b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
index 7429a3c218..064c9a542c 100644
--- a/tp/t/results/xml_tests/comments_on_misc_command_line.pl
+++ b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
@@ -17,7 +17,7 @@ $result_trees{'comments_on_misc_command_line'} = {
'text' => 'comments_on_misc_command_line.info'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -33,9 +33,7 @@ $result_trees{'comments_on_misc_command_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -62,7 +60,7 @@ $result_trees{'comments_on_misc_command_line'} = {
'text' => 'phoo,;,:'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -78,9 +76,7 @@ $result_trees{'comments_on_misc_command_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -111,7 +107,7 @@ $result_trees{'comments_on_misc_command_line'} = {
'text' => 'none'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -127,9 +123,7 @@ $result_trees{'comments_on_misc_command_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -183,7 +177,7 @@ $result_trees{'comments_on_misc_command_line'} = {
'text' => '200mm'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -199,9 +193,7 @@ $result_trees{'comments_on_misc_command_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -234,7 +226,7 @@ $result_trees{'comments_on_misc_command_line'} = {
'text' => ' aaa'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -250,9 +242,7 @@ $result_trees{'comments_on_misc_command_line'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
diff --git a/tp/t/results/xml_tests/raw_and_comments.pl
b/tp/t/results/xml_tests/raw_and_comments.pl
index c33a7ea9bb..0a96688982 100644
--- a/tp/t/results/xml_tests/raw_and_comments.pl
+++ b/tp/t/results/xml_tests/raw_and_comments.pl
@@ -12,7 +12,7 @@ $result_trees{'raw_and_comments'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -52,7 +52,7 @@ $result_trees{'raw_and_comments'} = {
'text' => 'tex'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -68,9 +68,7 @@ $result_trees{'raw_and_comments'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
@@ -113,7 +111,7 @@ $result_trees{'raw_and_comments'} = {
{
'args' => [
{
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -153,7 +151,7 @@ $result_trees{'raw_and_comments'} = {
'text' => 'xml'
}
],
- 'extra' => {
+ 'info' => {
'comment_at_end' => {
'args' => [
{
@@ -169,9 +167,7 @@ $result_trees{'raw_and_comments'} = {
'
]
}
- }
- },
- 'info' => {
+ },
'spaces_after_argument' => ' '
},
'type' => 'line_arg'
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm (_isolate_last_space), tp/Texinfo/Transformations.pm, tp/Texinfo/XS/parsetexi/extra.c (add_info_element_oot), tp/Texinfo/XS/parsetexi/parser.c (isolate_last_space): move comment_at_end from extra to info in element.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/extra.c (add_info_string), tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): rename spaces type used for spaces after command before argument or opening brace as spaces_after_cmd_before_arg and move it to info in element.
- Next by Date:
branch master updated: Texinfo/Structuring.pm: cut at 80 columns, reindent.
- Previous by thread:
branch master updated: * tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/extra.c (add_info_string), tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): rename spaces type used for spaces after command before argument or opening brace as spaces_after_cmd_before_arg and move it to info in element.
- Next by thread:
branch master updated: Texinfo/Structuring.pm: cut at 80 columns, reindent.
- Index(es):