summaryrefslogtreecommitdiff
path: root/macros/texinfo/texinfo/tp/t/results/coverage
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-11-09 03:02:50 +0000
committerNorbert Preining <norbert@preining.info>2022-11-09 03:02:50 +0000
commit5de83ec843cdc88e6adc42b1fe3f0ec48c52b7f3 (patch)
treeb49f7c180396c8ef389c8fd519370b6d03f4e100 /macros/texinfo/texinfo/tp/t/results/coverage
parent118cb5bbc5236bf86ca1088b9b3bae04c7b09beb (diff)
CTAN sync 202211090302
Diffstat (limited to 'macros/texinfo/texinfo/tp/t/results/coverage')
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl47
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed.pl42
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_comment.pl70
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_newline.pl52
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_paragraph.pl70
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/accents_errors.pl369
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/arg_in_brace_no_arg_command.pl52
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl101
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/block_commands.pl521
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/cartouche.pl96
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/cartouche_in_example.pl217
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/cartouche_in_quotation.pl207
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/center.pl110
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end.pl838
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl124
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl119
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl130
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl122
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl142
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl122
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl142
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl117
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl67
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl67
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl67
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl67
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl67
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/commands.pl749
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/commands_in_math.pl2108
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl131
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/comment_on_group_line.pl133
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/def.pl3828
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/delcomment.pl208
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/displaymath.pl855
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/empty_w.pl89
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl134
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/exdent_and_commands.pl569
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl2374
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright.pl320
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl311
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/flushright_example_nested.pl378
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/flushright_not_closed.pl65
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/formats_only_title_comments.pl840
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/formats_only_titles.pl655
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/formats_titles.pl968
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/group_beginning_and_end_on_line.pl82
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/group_not_closed.pl65
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/hyphenation.pl78
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/indentedblock.pl140
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/indicateurl_end_lines.pl135
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/insertcopying.pl270
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/invalid_U.pl450
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/item_container.pl481
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl485
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/math.pl707
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/multitable.pl887
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/nested_block_commands.pl2288
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/not_i_j_in_dotless.pl124
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/preformatted.pl442
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl510
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl274
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/raggedright.pl109
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/setfilename_in_paragraph.pl67
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/spaces_after_braced_command.pl315
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl43
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl124
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/symbol_after_block.pl2355
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/symbol_after_command.pl700
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/table.pl925
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl190
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/test_errormsg.pl193
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/test_tie.pl57
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/test_today.pl46
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/titlefont_in_center.pl87
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl1186
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/unknown_commands.pl29
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl66
77 files changed, 17282 insertions, 15488 deletions
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl b/macros/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl
index ade9cb862f..b793b16882 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,38 +10,34 @@ $result_trees{'accent_and_dash'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'a--'
+ 'contents' => [
+ {
+ 'text' => 'a--'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'accent_and_dash'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent_and_dash'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_and_dash'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'accent_and_dash'}{'contents'}[0]{'contents'}[0];
-$result_trees{'accent_and_dash'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent_and_dash'}{'contents'}[0];
-$result_trees{'accent_and_dash'}{'contents'}[0]{'parent'} = $result_trees{'accent_and_dash'};
$result_texis{'accent_and_dash'} = '@^{a--}';
@@ -59,12 +55,15 @@ $result_converted{'plaintext'}->{'accent_and_dash'} = 'a-̂
';
-$result_converted{'html_text'}->{'accent_and_dash'} = '<p>a&ndash;^</p>';
+$result_converted{'html_text'}->{'accent_and_dash'} = '<p>a&ndash;&#770;</p>';
$result_converted{'xml'}->{'accent_and_dash'} = '<para><accent type="circ">a&textndash;</accent></para>';
-$result_converted{'docbook'}->{'accent_and_dash'} = '<para>a&#8211;^</para>';
+$result_converted{'latex_text'}->{'accent_and_dash'} = '\\^{a--}';
+
+
+$result_converted{'docbook'}->{'accent_and_dash'} = '<para>a&#8211;&#770;</para>';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed.pl
index d45f28145b..8656c786d0 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,38 +10,34 @@ $result_trees{'accent_no_closed'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'accent_no_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_no_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'accent_no_closed'}{'contents'}[0]{'contents'}[0];
-$result_trees{'accent_no_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed'}{'contents'}[0];
-$result_trees{'accent_no_closed'}{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed'};
$result_texis{'accent_no_closed'} = '@~{e}';
@@ -50,7 +46,7 @@ $result_texts{'accent_no_closed'} = 'e~';
$result_errors{'accent_no_closed'} = [
{
- 'error_line' => ':1: @~ missing closing brace
+ 'error_line' => '@~ missing closing brace
',
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_comment.pl b/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_comment.pl
index cd47276d24..cf4bd76e91 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_comment.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_comment.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,58 +10,50 @@ $result_trees{'accent_no_closed_comment'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'e '
- },
- {
- 'args' => [
+ 'contents' => [
+ {
+ 'text' => 'e '
+ },
{
- 'parent' => {},
- 'text' => ' comment
+ 'args' => [
+ {
+ 'text' => ' comment
',
- 'type' => 'misc_arg'
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment
+'
+ ]
+ }
}
],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment
-'
- ]
- },
- 'parent' => {}
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'accent_no_closed_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_no_closed_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'accent_no_closed_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'accent_no_closed_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'accent_no_closed_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_no_closed_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'accent_no_closed_comment'}{'contents'}[0]{'contents'}[0];
-$result_trees{'accent_no_closed_comment'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed_comment'}{'contents'}[0];
-$result_trees{'accent_no_closed_comment'}{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed_comment'};
$result_texis{'accent_no_closed_comment'} = '@~{e @c comment
}';
@@ -71,7 +63,7 @@ $result_texts{'accent_no_closed_comment'} = 'e ~';
$result_errors{'accent_no_closed_comment'} = [
{
- 'error_line' => ':1: @~ missing closing brace
+ 'error_line' => '@~ missing closing brace
',
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_newline.pl b/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_newline.pl
index 0e4829b463..ea07e83b23 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_newline.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_newline.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,46 +10,40 @@ $result_trees{'accent_no_closed_newline'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'e
+ 'contents' => [
+ {
+ 'text' => 'e
'
- },
- {
- 'parent' => {},
- 'text' => '
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'accent_no_closed_newline'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed_newline'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_no_closed_newline'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'accent_no_closed_newline'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_no_closed_newline'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'accent_no_closed_newline'}{'contents'}[0]{'contents'}[0];
-$result_trees{'accent_no_closed_newline'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed_newline'}{'contents'}[0];
-$result_trees{'accent_no_closed_newline'}{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed_newline'};
$result_texis{'accent_no_closed_newline'} = '@~{e
@@ -62,7 +56,7 @@ $result_texts{'accent_no_closed_newline'} = 'e
$result_errors{'accent_no_closed_newline'} = [
{
- 'error_line' => ':1: @~ missing closing brace
+ 'error_line' => '@~ missing closing brace
',
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_paragraph.pl b/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_paragraph.pl
index 831a513854..b6336476b1 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_paragraph.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/accent_no_closed_paragraph.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,59 +10,49 @@ $result_trees{'accent_no_closed_paragraph'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'e
+ 'contents' => [
+ {
+ 'text' => 'e
'
- },
- {
- 'parent' => {},
- 'text' => '
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'contents' => [
+ 'type' => 'paragraph'
+ },
{
- 'parent' => {},
- 'text' => 'other para.
+ 'contents' => [
+ {
+ 'text' => 'other para.
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'accent_no_closed_paragraph'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed_paragraph'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_no_closed_paragraph'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'accent_no_closed_paragraph'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_no_closed_paragraph'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'accent_no_closed_paragraph'}{'contents'}[0]{'contents'}[0];
-$result_trees{'accent_no_closed_paragraph'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed_paragraph'}{'contents'}[0];
-$result_trees{'accent_no_closed_paragraph'}{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed_paragraph'};
-$result_trees{'accent_no_closed_paragraph'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'accent_no_closed_paragraph'}{'contents'}[1];
-$result_trees{'accent_no_closed_paragraph'}{'contents'}[1]{'parent'} = $result_trees{'accent_no_closed_paragraph'};
$result_texis{'accent_no_closed_paragraph'} = '@~{e
@@ -77,7 +67,7 @@ $result_texts{'accent_no_closed_paragraph'} = 'e
$result_errors{'accent_no_closed_paragraph'} = [
{
- 'error_line' => ':1: @~ missing closing brace
+ 'error_line' => '@~ missing closing brace
',
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/accents_errors.pl b/macros/texinfo/texinfo/tp/t/results/coverage/accents_errors.pl
index 7965369d31..8d8b94e328 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/accents_errors.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/accents_errors.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,192 +10,177 @@ $result_trees{'accents_errors'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'accent at end of line '
- },
- {
- 'cmdname' => 'ringaccent',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'accent at end of line '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => 'ringaccent',
+ 'extra' => {
+ 'spaces' => '
'
- },
- {
- 'parent' => {},
- 'text' => 'accent at end of line and spaces '
- },
- {
- 'cmdname' => 'ringaccent',
- 'contents' => [],
- 'extra' => {
- 'spaces' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'ccent at end of line and spaces '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => 'ringaccent',
+ 'extra' => {
+ 'spaces' => '
'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'ccent followed by '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'ringaccent',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'cmdname' => '.'
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
- 'text' => 'accent followed by '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => 'ringaccent',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => '.',
- 'parent' => {}
- },
- {
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'accent character with spaces '
- },
- {
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' following.
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'accent character with spaces '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'f'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '~',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'ollowing.
'
- },
- {
- 'parent' => {},
- 'text' => 'accent character at end of line '
- },
- {
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ },
+ {
+ 'text' => 'accent character at end of line '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '~',
+ 'extra' => {
+ 'spaces' => '
'
- },
- {
- 'parent' => {},
- 'text' => 'accent character followed by '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => '.',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'ccent character followed by '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ },
+ {
+ 'cmdname' => '.'
+ },
+ {
+ 'text' => '
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'accents_errors'}{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'parent'} = $result_trees{'accents_errors'};
-$result_trees{'accents_errors'}{'contents'}[1]{'parent'} = $result_trees{'accents_errors'};
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[11]{'parent'} = $result_trees{'accents_errors'}{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[2]{'parent'} = $result_trees{'accents_errors'};
$result_texis{'accents_errors'} = 'accent at end of line @ringaccent
accent at end of line and spaces @ringaccent
@@ -207,68 +192,56 @@ accent character followed by @@ @~@.
';
-$result_texts{'accents_errors'} = 'accent at end of line *
-accent at end of line and spaces *
-accent followed by @ *.
+$result_texts{'accents_errors'} = 'accent at end of line a*ccent at end of line and spaces a*ccent followed by @ *.
-accent character with spaces ~ following.
-accent character at end of line ~
-accent character followed by @ ~.
+accent character with spaces f~ollowing.
+accent character at end of line a~ccent character followed by @ ~.
';
$result_errors{'accents_errors'} = [
{
- 'error_line' => ':1: warning: accent command `@ringaccent\' must not be followed by new line
+ 'error_line' => 'warning: command `@ringaccent\' must not be followed by new line
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'accent command `@ringaccent\' must not be followed by new line',
+ 'text' => 'command `@ringaccent\' must not be followed by new line',
'type' => 'warning'
},
{
- 'error_line' => ':2: warning: accent command `@ringaccent\' must not be followed by new line
+ 'error_line' => 'warning: command `@ringaccent\' must not be followed by new line
',
'file_name' => '',
'line_nr' => 2,
'macro' => '',
- 'text' => 'accent command `@ringaccent\' must not be followed by new line',
+ 'text' => 'command `@ringaccent\' must not be followed by new line',
'type' => 'warning'
},
{
- 'error_line' => ':3: use braces to give a command as an argument to @ringaccent
+ 'error_line' => '@ringaccent expected braces
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'use braces to give a command as an argument to @ringaccent',
+ 'text' => '@ringaccent expected braces',
'type' => 'error'
},
{
- 'error_line' => ':5: warning: accent command `@~\' must not be followed by whitespace
-',
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => '',
- 'text' => 'accent command `@~\' must not be followed by whitespace',
- 'type' => 'warning'
- },
- {
- 'error_line' => ':6: warning: accent command `@~\' must not be followed by new line
+ 'error_line' => 'warning: command `@~\' must not be followed by new line
',
'file_name' => '',
'line_nr' => 6,
'macro' => '',
- 'text' => 'accent command `@~\' must not be followed by new line',
+ 'text' => 'command `@~\' must not be followed by new line',
'type' => 'warning'
},
{
- 'error_line' => ':7: use braces to give a command as an argument to @~
+ 'error_line' => '@~ expected braces
',
'file_name' => '',
'line_nr' => 7,
'macro' => '',
- 'text' => 'use braces to give a command as an argument to @~',
+ 'text' => '@~ expected braces',
'type' => 'error'
}
];
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/arg_in_brace_no_arg_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
index f8321ee7d4..245ca9ebba 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,44 +10,38 @@ $result_trees{'arg_in_brace_no_arg_command'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'in tex'
+ 'contents' => [
+ {
+ 'text' => 'in tex'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'TeX',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'TeX',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'arg_in_brace_no_arg_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'arg_in_brace_no_arg_command'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'arg_in_brace_no_arg_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'arg_in_brace_no_arg_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'arg_in_brace_no_arg_command'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'arg_in_brace_no_arg_command'}{'contents'}[0];
-$result_trees{'arg_in_brace_no_arg_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'arg_in_brace_no_arg_command'}{'contents'}[0];
-$result_trees{'arg_in_brace_no_arg_command'}{'contents'}[0]{'parent'} = $result_trees{'arg_in_brace_no_arg_command'};
$result_texis{'arg_in_brace_no_arg_command'} = '@TeX{in tex}
';
@@ -58,7 +52,7 @@ $result_texts{'arg_in_brace_no_arg_command'} = 'TeX
$result_errors{'arg_in_brace_no_arg_command'} = [
{
- 'error_line' => ':1: warning: command @TeX does not accept arguments
+ 'error_line' => 'warning: command @TeX does not accept arguments
',
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl
index e97b0d63c9..305e8795c2 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,59 +10,48 @@ $result_trees{'at_after_accent_command'} = {
{
'contents' => [
{
- 'cmdname' => 'ringaccent',
- 'contents' => [],
- 'extra' => {
- 'spaces' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '. '
- },
- {
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '.
+ 'contents' => [
+ {
+ 'cmdname' => 'ringaccent',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => '. '
+ },
+ {
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => '.
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_after_accent_command'}{'contents'}[0];
-$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_after_accent_command'}{'contents'}[0];
-$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_after_accent_command'}{'contents'}[0];
-$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_after_accent_command'}{'contents'}[0];
-$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_after_accent_command'}{'contents'}[0];
-$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_after_accent_command'}{'contents'}[0];
-$result_trees{'at_after_accent_command'}{'contents'}[0]{'parent'} = $result_trees{'at_after_accent_command'};
$result_texis{'at_after_accent_command'} = '@ringaccent @@. @^@@.
';
@@ -73,21 +62,21 @@ $result_texts{'at_after_accent_command'} = '*@. ^@.
$result_errors{'at_after_accent_command'} = [
{
- 'error_line' => ':1: use braces to give a command as an argument to @ringaccent
+ 'error_line' => '@ringaccent expected braces
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'use braces to give a command as an argument to @ringaccent',
+ 'text' => '@ringaccent expected braces',
'type' => 'error'
},
{
- 'error_line' => ':1: use braces to give a command as an argument to @^
+ 'error_line' => '@^ expected braces
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'use braces to give a command as an argument to @^',
+ 'text' => '@^ expected braces',
'type' => 'error'
}
];
@@ -101,7 +90,7 @@ $result_converted{'plaintext'}->{'at_after_accent_command'} = '̊@. ̂@.
';
-$result_converted{'html_text'}->{'at_after_accent_command'} = '<p>*@. ^@.
+$result_converted{'html_text'}->{'at_after_accent_command'} = '<p>&#778;@. &#770;@.
</p>';
@@ -109,7 +98,11 @@ $result_converted{'xml'}->{'at_after_accent_command'} = '<para><accent type="rin
</para>';
-$result_converted{'docbook'}->{'at_after_accent_command'} = '<para>*@. ^@.
+$result_converted{'latex_text'}->{'at_after_accent_command'} = '\\r{}@. \\^{}@.
+';
+
+
+$result_converted{'docbook'}->{'at_after_accent_command'} = '<para>&#778;@. &#770;@.
</para>';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/block_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage/block_commands.pl
index 313824b4b1..993c6c4d09 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/block_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/block_commands.pl
@@ -1,215 +1,141 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'block_commands'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'in group
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ 'cmdname' => 'group',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'group'
+ 'text' => 'in group
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'group'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'group'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 2,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'warning'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ },
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'in quotation
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'warning'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
+ 'cmdname' => 'quotation',
'contents' => [
{
- 'parent' => {},
- 'text' => 'a float'
- }
- ],
- 'parent' => {},
- 'type' => 'block_line_arg'
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'in quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
{
- 'parent' => {},
- 'text' => 'b float'
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'spaces_after_argument' => '
-',
'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'float',
- 'contents' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'In float
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -219,157 +145,147 @@ $result_trees{'block_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'in caption
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
+ 'text' => 'a float'
+ }
+ ],
+ 'type' => 'block_line_arg'
+ },
+ {
+ 'contents' => [
{
- 'parent' => {},
- 'text' => '
+ 'text' => 'b float'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
',
- 'type' => 'empty_line'
- },
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'float',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In float
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in caption'
+ 'contents' => [
+ {
+ 'text' => 'in caption
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'in caption'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'brace_command_context'
}
],
- 'parent' => {},
- 'type' => 'brace_command_context'
- }
- ],
- 'cmdname' => 'caption',
- 'contents' => [],
- 'extra' => {
- 'float' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 14,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ 'cmdname' => 'caption',
+ 'extra' => {
+ 'float' => {}
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
'
- },
- {
- 'args' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'float'
+ 'contents' => [
+ {
+ 'text' => 'float'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'float'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'float',
+ 'caption' => {},
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'b-float',
'spaces_before_argument' => ' ',
- 'text_arg' => 'float'
+ 'type' => {
+ 'content' => [
+ {}
+ ],
+ 'normalized' => 'a float'
+ }
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 10,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'caption' => {},
- 'end_command' => {},
- 'node_content' => [
- {}
- ],
- 'normalized' => 'b-float',
- 'spaces_before_argument' => ' ',
- 'type' => {
- 'content' => [
- {}
- ],
- 'normalized' => 'a float'
- }
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 10,
- 'macro' => ''
- },
- 'number' => 1,
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'block_commands'}{'contents'}[0]{'parent'} = $result_trees{'block_commands'};
-$result_trees{'block_commands'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'block_commands'}{'contents'}[1];
-$result_trees{'block_commands'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[1];
-$result_trees{'block_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[1]{'contents'}[1];
-$result_trees{'block_commands'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'block_commands'}{'contents'}[1];
-$result_trees{'block_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'block_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[1]{'contents'}[2];
-$result_trees{'block_commands'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'block_commands'}{'contents'}[1];
-$result_trees{'block_commands'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'block_commands'}{'contents'}[1]{'contents'}[2];
-$result_trees{'block_commands'}{'contents'}[1]{'parent'} = $result_trees{'block_commands'};
-$result_trees{'block_commands'}{'contents'}[2]{'parent'} = $result_trees{'block_commands'};
-$result_trees{'block_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[3]{'args'}[0];
-$result_trees{'block_commands'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[3];
-$result_trees{'block_commands'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[3]{'contents'}[0];
-$result_trees{'block_commands'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[3];
-$result_trees{'block_commands'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'block_commands'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[3]{'contents'}[1];
-$result_trees{'block_commands'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'block_commands'}{'contents'}[3];
-$result_trees{'block_commands'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'block_commands'}{'contents'}[3]{'contents'}[1];
-$result_trees{'block_commands'}{'contents'}[3]{'parent'} = $result_trees{'block_commands'};
-$result_trees{'block_commands'}{'contents'}[4]{'parent'} = $result_trees{'block_commands'};
-$result_trees{'block_commands'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'args'}[0];
-$result_trees{'block_commands'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'args'}[1];
-$result_trees{'block_commands'}{'contents'}[5]{'args'}[1]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[0];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'extra'}{'float'} = $result_trees{'block_commands'}{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[4]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[5]{'args'}[0];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'contents'}[5]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'extra'}{'caption'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3];
-$result_trees{'block_commands'}{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[5];
-$result_trees{'block_commands'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'block_commands'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'block_commands'}{'contents'}[5]{'extra'}{'type'}{'content'}[0] = $result_trees{'block_commands'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands'}{'contents'}[5]{'parent'} = $result_trees{'block_commands'};
+$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'float'} = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5];
+$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'caption'} = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
+$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'args'}[1]{'contents'}[0];
+$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'type'}{'content'}[0] = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
$result_texis{'block_commands'} = '
@group
@@ -418,16 +334,7 @@ $result_floats{'block_commands'} = {
'float' => {}
}
},
- 'end_command' => {
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'float',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'float'
- }
- },
'normalized' => 'b-float',
- 'spaces_before_argument' => ' ',
'type' => {
'content' => [
{
@@ -437,7 +344,9 @@ $result_floats{'block_commands'} = {
'normalized' => 'a float'
}
},
- 'number' => 1
+ 'structure' => {
+ 'float_number' => 1
+ }
}
]
};
@@ -459,18 +368,18 @@ in caption
$result_converted{'html_text'}->{'block_commands'} = '
-<p>in group
-</p>
-<blockquote>
-<p><b>warning:</b> in quotation
+<div class="group"><p>in group
+</p></div>
+<blockquote class="quotation">
+<p><b class="b">warning:</b> in quotation
</p></blockquote>
-<div class="float"><span id="b-float"></span>
+<div class="float" id="b-float">
<p>In float
</p>
-<div class="float-caption"><p><strong>a float 1: </strong>in caption
+<div class="caption"><p><strong class="strong">a float 1: </strong>in caption
</p>
<p>in caption</p></div></div>';
@@ -495,6 +404,26 @@ $result_converted{'xml'}->{'block_commands'} = '
';
+$result_converted{'latex_text'}->{'block_commands'} = '
+in group
+
+\\begin{quote}
+\\textbf{warning:} in quotation
+\\end{quote}
+
+\\begin{TexinfoFloatafloat}
+In float
+
+
+\\caption{in caption
+
+in caption}
+
+\\label{anchor:b-float}%
+\\end{TexinfoFloatafloat}
+';
+
+
$result_converted{'docbook'}->{'block_commands'} = '
<para>in group
</para>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/cartouche.pl b/macros/texinfo/texinfo/tp/t/results/coverage/cartouche.pl
index e46b4d8e3f..2621614b11 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/cartouche.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/cartouche.pl
@@ -1,84 +1,70 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'cartouche'} = {
'contents' => [
{
- 'cmdname' => 'cartouche',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'in cartouche.
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ 'cmdname' => 'cartouche',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'cartouche'
+ 'text' => 'in cartouche.
+'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cartouche'
+ }
+ ],
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'cartouche'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'cartouche',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'cartouche'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'cartouche'}{'contents'}[0];
-$result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'cartouche'}{'contents'}[0];
-$result_trees{'cartouche'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'cartouche'}{'contents'}[0]{'contents'}[1];
-$result_trees{'cartouche'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'cartouche'}{'contents'}[0];
-$result_trees{'cartouche'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'cartouche'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'cartouche'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'cartouche'}{'contents'}[0]{'contents'}[2];
-$result_trees{'cartouche'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'cartouche'}{'contents'}[0];
-$result_trees{'cartouche'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'cartouche'}{'contents'}[0]{'contents'}[2];
-$result_trees{'cartouche'}{'contents'}[0]{'parent'} = $result_trees{'cartouche'};
$result_texis{'cartouche'} = '@cartouche
in cartouche.
@@ -110,6 +96,12 @@ $result_converted{'xml'}->{'cartouche'} = '<cartouche endspaces=" ">
</para></cartouche>';
+$result_converted{'latex_text'}->{'cartouche'} = '\\begin{mdframed}[style=Texinfocartouche]
+in cartouche.
+\\end{mdframed}
+';
+
+
$result_converted{'docbook'}->{'cartouche'} = '<para>in cartouche.
</para>';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/cartouche_in_example.pl b/macros/texinfo/texinfo/tp/t/results/coverage/cartouche_in_example.pl
index 085fc13935..8b098613f9 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/cartouche_in_example.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/cartouche_in_example.pl
@@ -1,56 +1,96 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'cartouche_in_example'} = {
'contents' => [
{
- 'cmdname' => 'example',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'In example
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'cmdname' => 'cartouche',
+ 'cmdname' => 'example',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'contents' => [
+ {
+ 'text' => 'In example
+'
+ }
+ ],
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'cartouche',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In cartouche in example
+'
+ }
+ ],
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cartouche'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'cartouche'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'In cartouche in example
+ 'text' => 'end example
'
}
],
- 'parent' => {},
'type' => 'preformatted'
},
{
@@ -58,117 +98,40 @@ $result_trees{'cartouche_in_example'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'cartouche'
+ 'text' => 'example'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'cartouche',
'spaces_before_argument' => ' ',
- 'text_arg' => 'cartouche'
+ 'text_arg' => 'example'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 7,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'end example
-'
+ }
}
],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'example'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'example',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'example'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'cartouche_in_example'}{'contents'}[0];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[1];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[3];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[4];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'cartouche_in_example'}{'contents'}[0];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[4];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_example'};
$result_texis{'cartouche_in_example'} = '@example
In example
@@ -199,11 +162,11 @@ $result_converted{'plaintext'}->{'cartouche_in_example'} = ' In example
$result_converted{'html_text'}->{'cartouche_in_example'} = '<div class="example">
-<pre class="example">In example
+<pre class="example-preformatted">In example
</pre><table class="cartouche" border="1"><tr><td>
-<pre class="example">In cartouche in example
+<pre class="example-preformatted">In cartouche in example
</pre></td></tr></table>
-<pre class="example">end example
+<pre class="example-preformatted">end example
</pre></div>
';
@@ -218,6 +181,22 @@ $result_converted{'xml'}->{'cartouche_in_example'} = '<example endspaces=" ">
';
+$result_converted{'latex_text'}->{'cartouche_in_example'} = '\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily In example
+\\end{Texinfopreformatted}
+\\begin{mdframed}[style=Texinfocartouche]
+\\begin{Texinfopreformatted}%
+\\ttfamily In cartouche in example
+\\end{Texinfopreformatted}
+\\end{mdframed}
+\\begin{Texinfopreformatted}%
+\\ttfamily end example
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+';
+
+
$result_converted{'docbook'}->{'cartouche_in_example'} = '<screen>In example
</screen><screen>In cartouche in example
</screen><screen>end example
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/cartouche_in_quotation.pl b/macros/texinfo/texinfo/tp/t/results/coverage/cartouche_in_quotation.pl
index e0e6a1b986..e2fdc93747 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/cartouche_in_quotation.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/cartouche_in_quotation.pl
@@ -1,56 +1,96 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'cartouche_in_quotation'} = {
'contents' => [
{
- 'cmdname' => 'quotation',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'In quotation
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'cmdname' => 'cartouche',
+ 'cmdname' => 'quotation',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'contents' => [
+ {
+ 'text' => 'In quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'cartouche',
'contents' => [
{
- 'parent' => {},
- 'text' => 'In cartouche in quotation
+ 'contents' => [
+ {
+ 'text' => 'In cartouche in quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cartouche'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'cartouche'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'end quotation
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
@@ -58,117 +98,40 @@ $result_trees{'cartouche_in_quotation'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'cartouche'
+ 'text' => 'quotation'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'cartouche',
'spaces_before_argument' => ' ',
- 'text_arg' => 'cartouche'
+ 'text_arg' => 'quotation'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 7,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'end quotation
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'quotation'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[1];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[3];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[4];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[4];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'parent'} = $result_trees{'cartouche_in_quotation'};
$result_texis{'cartouche_in_quotation'} = '@quotation
In quotation
@@ -198,7 +161,7 @@ $result_converted{'plaintext'}->{'cartouche_in_quotation'} = ' In quotation
';
-$result_converted{'html_text'}->{'cartouche_in_quotation'} = '<blockquote>
+$result_converted{'html_text'}->{'cartouche_in_quotation'} = '<blockquote class="quotation">
<p>In quotation
</p><table class="cartouche" border="1"><tr><td>
<p>In cartouche in quotation
@@ -218,6 +181,16 @@ $result_converted{'xml'}->{'cartouche_in_quotation'} = '<quotation endspaces=" "
';
+$result_converted{'latex_text'}->{'cartouche_in_quotation'} = '\\begin{quote}
+In quotation
+\\begin{mdframed}[style=Texinfocartouche]
+In cartouche in quotation
+\\end{mdframed}
+end quotation
+\\end{quote}
+';
+
+
$result_converted{'docbook'}->{'cartouche_in_quotation'} = '<blockquote><para>In quotation
</para><para>In cartouche in quotation
</para><para>end quotation
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/center.pl b/macros/texinfo/texinfo/tp/t/results/coverage/center.pl
index 16538c4a4e..41cae1492f 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/center.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/center.pl
@@ -1,85 +1,73 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'center'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'in center '
- },
- {
- 'args' => [
+ 'contents' => [
+ {
+ 'text' => 'in center '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'in code'
+ 'contents' => [
+ {
+ 'text' => 'in code'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {}
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'center',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'cmdname' => 'center',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'center'}{'contents'}[0]{'parent'} = $result_trees{'center'};
-$result_trees{'center'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'center'}{'contents'}[1]{'args'}[0];
-$result_trees{'center'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'center'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'center'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'center'}{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'center'}{'contents'}[1]{'args'}[0];
-$result_trees{'center'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'center'}{'contents'}[1];
-$result_trees{'center'}{'contents'}[1]{'parent'} = $result_trees{'center'};
-$result_trees{'center'}{'contents'}[2]{'parent'} = $result_trees{'center'};
$result_texis{'center'} = '
@center in center @code{in code}
@@ -99,13 +87,13 @@ $result_floats{'center'} = {};
-$result_converted{'plaintext'}->{'center'} = ' in center \'in code\'
+$result_converted{'plaintext'}->{'center'} = ' in center ‘in code’
';
$result_converted{'html_text'}->{'center'} = '
-<div align="center">in center <code>in code</code>
+<div class="center">in center <code class="code">in code</code>
</div>
';
@@ -116,8 +104,16 @@ $result_converted{'xml'}->{'center'} = '
';
+$result_converted{'latex_text'}->{'center'} = '
+\\begin{center}
+in center \\texttt{in code}
+\\end{center}
+
+';
+
+
$result_converted{'docbook'}->{'center'} = '
-in center <literal>in code</literal>
+<simpara role="center">in center <literal>in code</literal></simpara>
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end.pl
new file mode 100644
index 0000000000..873680d1b7
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end.pl
@@ -0,0 +1,838 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In quotation
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'missing_argument' => 1,
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In quotation
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'q'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'uotation'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'q'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In quotation
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'qu'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'otation'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'qu'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In quotation
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quot'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'atio'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'n'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotn'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'q'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'uotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'qu'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'otation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quot'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'ation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 25,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'verbatim',
+ 'contents' => [
+ {
+ 'text' => 'In verbatim
+',
+ 'type' => 'raw'
+ },
+ {
+ 'text' => '@end verb@code{a}tim
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 29,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end'} = '@quotation
+In quotation
+@end @code{quotation}
+
+@quotation
+In quotation
+@end q@code{uotation}
+
+@quotation
+In quotation
+@end qu@code{otation}
+
+@quotation
+In quotation
+@end quot@asis{atio}n
+
+@quotation
+In quotation
+@end q@asis{}uotation
+
+@quotation
+In quotation
+@end qu@asis{}otation
+
+@quotation
+In quotation
+@end quot@asis{}ation
+
+@verbatim
+In verbatim
+@end verb@code{a}tim
+';
+
+
+$result_texts{'command_in_end'} = 'In quotation
+
+In quotation
+
+In quotation
+
+In quotation
+
+In quotation
+
+In quotation
+
+In quotation
+
+In verbatim
+@end verb@code{a}tim
+';
+
+$result_errors{'command_in_end'} = [
+ {
+ 'error_line' => 'warning: @code should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@code should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: @code{quotation}
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: @code{quotation}',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'warning: @code should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => '@code should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: unknown @end q
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => 'unknown @end q',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: q@code{uotation}
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: q@code{uotation}',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'warning: @code should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => '',
+ 'text' => '@code should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: unknown @end qu
+',
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => '',
+ 'text' => 'unknown @end qu',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: qu@code{otation}
+',
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: qu@code{otation}',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: unknown @end quotn
+',
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => '',
+ 'text' => 'unknown @end quotn',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: quot@asis{atio}n
+',
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: quot@asis{atio}n',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: q@asis{}uotation
+',
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: q@asis{}uotation',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: qu@asis{}otation
+',
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: qu@asis{}otation',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: quot@asis{}ation
+',
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: quot@asis{}ation',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'no matching `@end verbatim\'
+',
+ 'file_name' => '',
+ 'line_nr' => 31,
+ 'macro' => '',
+ 'text' => 'no matching `@end verbatim\'',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'no matching `@end quotation\'
+',
+ 'file_name' => '',
+ 'line_nr' => 31,
+ 'macro' => '',
+ 'text' => 'no matching `@end quotation\'',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'no matching `@end quotation\'
+',
+ 'file_name' => '',
+ 'line_nr' => 31,
+ 'macro' => '',
+ 'text' => 'no matching `@end quotation\'',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'no matching `@end quotation\'
+',
+ 'file_name' => '',
+ 'line_nr' => 31,
+ 'macro' => '',
+ 'text' => 'no matching `@end quotation\'',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'no matching `@end quotation\'
+',
+ 'file_name' => '',
+ 'line_nr' => 31,
+ 'macro' => '',
+ 'text' => 'no matching `@end quotation\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
new file mode 100644
index 0000000000..e84024c21c
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
@@ -0,0 +1,124 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_expanded_raw_command_after'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In TeX
+'
+ }
+ ],
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'tex'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'asis'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'tex'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_expanded_raw_command_after'} = '@tex
+In TeX
+@end tex@asis{asis}
+';
+
+
+$result_texts{'command_in_end_expanded_raw_command_after'} = '';
+
+$result_errors{'command_in_end_expanded_raw_command_after'} = [
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: tex@asis{asis}
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: tex@asis{asis}',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_expanded_raw_command_after'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
new file mode 100644
index 0000000000..b4d5ded914
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
@@ -0,0 +1,119 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_expanded_raw_command_empty_after'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In TeX
+'
+ }
+ ],
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'tex'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'tex'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_expanded_raw_command_empty_after'} = '@tex
+In TeX
+@end tex@asis{}
+';
+
+
+$result_texts{'command_in_end_expanded_raw_command_empty_after'} = '';
+
+$result_errors{'command_in_end_expanded_raw_command_empty_after'} = [
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: tex@asis{}
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: tex@asis{}',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_expanded_raw_command_empty_after'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
new file mode 100644
index 0000000000..d301e075ea
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
@@ -0,0 +1,130 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_expanded_raw_in_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In TeX
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'tex'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'missing_argument' => 1,
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'rawpreformatted'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_expanded_raw_in_command'} = '@tex
+In TeX
+@end @code{tex}
+';
+
+
+$result_texts{'command_in_end_expanded_raw_in_command'} = '';
+
+$result_errors{'command_in_end_expanded_raw_in_command'} = [
+ {
+ 'error_line' => 'warning: @code should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@code should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: @code{tex}
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: @code{tex}',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'no matching `@end tex\'
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'no matching `@end tex\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_expanded_raw_in_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
new file mode 100644
index 0000000000..a0d3faddf3
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
@@ -0,0 +1,122 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_expanded_raw_one_char_before_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In TeX
+'
+ }
+ ],
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 't'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'ex'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'tex'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_expanded_raw_one_char_before_command'} = '@tex
+In TeX
+@end t@asis{}ex
+';
+
+
+$result_texts{'command_in_end_expanded_raw_one_char_before_command'} = '';
+
+$result_errors{'command_in_end_expanded_raw_one_char_before_command'} = [
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: t@asis{}ex
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: t@asis{}ex',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_expanded_raw_one_char_before_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
new file mode 100644
index 0000000000..69d780b2c9
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
@@ -0,0 +1,142 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_expanded_raw_one_char_not_in_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In TeX
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 't'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'ex'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 't'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'rawpreformatted'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_expanded_raw_one_char_not_in_command'} = '@tex
+In TeX
+@end t@asis{ex}
+';
+
+
+$result_texts{'command_in_end_expanded_raw_one_char_not_in_command'} = '';
+
+$result_errors{'command_in_end_expanded_raw_one_char_not_in_command'} = [
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: unknown @end t
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'unknown @end t',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: t@asis{ex}
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: t@asis{ex}',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'no matching `@end tex\'
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'no matching `@end tex\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_expanded_raw_one_char_not_in_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
new file mode 100644
index 0000000000..e31dbffd82
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
@@ -0,0 +1,122 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_expanded_raw_two_char_before_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In TeX
+'
+ }
+ ],
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'te'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'x'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'tex'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_expanded_raw_two_char_before_command'} = '@tex
+In TeX
+@end te@asis{}x
+';
+
+
+$result_texts{'command_in_end_expanded_raw_two_char_before_command'} = '';
+
+$result_errors{'command_in_end_expanded_raw_two_char_before_command'} = [
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: te@asis{}x
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: te@asis{}x',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_expanded_raw_two_char_before_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
new file mode 100644
index 0000000000..033d25730b
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
@@ -0,0 +1,142 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_expanded_raw_two_char_not_in_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In TeX
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'te'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'x'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'te'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'rawpreformatted'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_expanded_raw_two_char_not_in_command'} = '@tex
+In TeX
+@end te@asis{x}
+';
+
+
+$result_texts{'command_in_end_expanded_raw_two_char_not_in_command'} = '';
+
+$result_errors{'command_in_end_expanded_raw_two_char_not_in_command'} = [
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: unknown @end te
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'unknown @end te',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: te@asis{x}
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: te@asis{x}',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'no matching `@end tex\'
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'no matching `@end tex\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_expanded_raw_two_char_not_in_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
new file mode 100644
index 0000000000..248a91024f
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
@@ -0,0 +1,117 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_ignored_raw_command_after'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'type' => 'elided_block'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'html'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'asis'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'html'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_ignored_raw_command_after'} = '@html
+@end html@asis{asis}
+';
+
+
+$result_texts{'command_in_end_ignored_raw_command_after'} = '';
+
+$result_errors{'command_in_end_ignored_raw_command_after'} = [
+ {
+ 'error_line' => 'warning: @asis should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@asis should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: html@asis{asis}
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: html@asis{asis}',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_ignored_raw_command_after'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
new file mode 100644
index 0000000000..3f51245fa1
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
@@ -0,0 +1,67 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_ignored_raw_in_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'type' => 'elided_block'
+ },
+ {
+ 'text' => '',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_ignored_raw_in_command'} = '@html
+';
+
+
+$result_texts{'command_in_end_ignored_raw_in_command'} = '';
+
+$result_errors{'command_in_end_ignored_raw_in_command'} = [
+ {
+ 'error_line' => 'no matching `@end html\'
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'no matching `@end html\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_ignored_raw_in_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
new file mode 100644
index 0000000000..11df9d9ac5
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
@@ -0,0 +1,67 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_ignored_raw_one_char_before_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'type' => 'elided_block'
+ },
+ {
+ 'text' => '',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_ignored_raw_one_char_before_command'} = '@html
+';
+
+
+$result_texts{'command_in_end_ignored_raw_one_char_before_command'} = '';
+
+$result_errors{'command_in_end_ignored_raw_one_char_before_command'} = [
+ {
+ 'error_line' => 'no matching `@end html\'
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'no matching `@end html\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_ignored_raw_one_char_before_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
new file mode 100644
index 0000000000..0ac1d7b1a9
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
@@ -0,0 +1,67 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_ignored_raw_one_char_not_in_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'type' => 'elided_block'
+ },
+ {
+ 'text' => '',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_ignored_raw_one_char_not_in_command'} = '@html
+';
+
+
+$result_texts{'command_in_end_ignored_raw_one_char_not_in_command'} = '';
+
+$result_errors{'command_in_end_ignored_raw_one_char_not_in_command'} = [
+ {
+ 'error_line' => 'no matching `@end html\'
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'no matching `@end html\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_ignored_raw_one_char_not_in_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
new file mode 100644
index 0000000000..00d9f2bb0c
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
@@ -0,0 +1,67 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_ignored_raw_two_char_before_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'type' => 'elided_block'
+ },
+ {
+ 'text' => '',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_ignored_raw_two_char_before_command'} = '@html
+';
+
+
+$result_texts{'command_in_end_ignored_raw_two_char_before_command'} = '';
+
+$result_errors{'command_in_end_ignored_raw_two_char_before_command'} = [
+ {
+ 'error_line' => 'no matching `@end html\'
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'no matching `@end html\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_ignored_raw_two_char_before_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
new file mode 100644
index 0000000000..a673fbf7fd
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
@@ -0,0 +1,67 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'command_in_end_ignored_raw_two_char_not_in_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'type' => 'elided_block'
+ },
+ {
+ 'text' => '',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'command_in_end_ignored_raw_two_char_not_in_command'} = '@html
+';
+
+
+$result_texts{'command_in_end_ignored_raw_two_char_not_in_command'} = '';
+
+$result_errors{'command_in_end_ignored_raw_two_char_not_in_command'} = [
+ {
+ 'error_line' => 'no matching `@end html\'
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'no matching `@end html\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'command_in_end_ignored_raw_two_char_not_in_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage/commands.pl
index 94b926dfb1..bcbcd2c141 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/commands.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,511 +10,388 @@ $result_trees{'commands'} = {
{
'contents' => [
{
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'contents' => [
{
- 'contents' => [],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'TeX',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => '
-',
- 'parent' => {}
- },
- {
- 'args' => [
+ 'cmdname' => '@'
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'e'
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '"',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => 'TeX',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '
+'
+ },
+ {
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '"',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'dotless',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'dotless',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'space_command_arg'
+ 'cmdname' => 'ringaccent',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'ringaccent',
- 'contents' => [],
- 'extra' => {
- 'spaces' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_line'
},
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'File '
+ 'contents' => [
+ {
+ 'text' => 'File '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'click',
+ 'extra' => {
+ 'clickstyle' => 'arrow'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' Open'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'clicksequence',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'cmdname' => '.'
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
},
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'text' => 'b'
}
],
- 'cmdname' => 'click',
- 'contents' => [],
'extra' => {
- 'clickstyle' => 'arrow'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
+ 'spaces_before_argument' => ' '
},
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' Open'
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'clicksequence',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => '.',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
- },
- {
- 'args' => [
+ 'cmdname' => 'email',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'code --- -- \'\' ``'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
},
{
- 'contents' => [
+ 'text' => '
+'
+ },
+ {
+ 'text' => '--- -- \'\' ``. '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'b'
+ 'contents' => [
+ {
+ 'text' => 'small caps'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'sc',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.
+'
}
],
- 'cmdname' => 'email',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
- 'text' => ' '
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'code --- -- \'\' ``'
+ 'text' => 'index entry ``in text\'\' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'LaTeX',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_number' => 1,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ },
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 8,
'macro' => ''
},
- 'parent' => {}
+ 'type' => 'index_entry_command'
},
{
- 'parent' => {},
'text' => '
-'
- },
- {
- 'parent' => {},
- 'text' => '--- -- \'\' ``. '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'small caps'
- }
- ],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'sc',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '.
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'index entry ``in text\'\' '
- },
- {
- 'args' => [
- {
- 'contents' => [],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'LaTeX',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'cindex',
- 'extra' => {
- 'index_entry' => {
- 'command' => {},
- 'content' => [],
- 'content_normalized' => [],
- 'in_code' => 0,
- 'index_at_command' => 'cindex',
- 'index_name' => 'cp',
- 'index_type_command' => 'cindex',
- 'key' => 'index entry "in text" LaTeX',
- 'number' => 1
- },
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'index_entry_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'majorheading '
- },
- {
- 'args' => [
+ 'text' => 'majorheading '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'in b'
+ 'contents' => [
+ {
+ 'text' => 'in b'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'b',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'b',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {}
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'majorheading',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'majorheading',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'level' => 1,
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[5];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[9];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[11];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[1];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[13];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[14]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[15]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[16];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[16];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[17]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[18]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[18];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[18]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[19]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[20]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[21]{'args'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[21];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[21]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[22]{'parent'} = $result_trees{'commands'}{'contents'}[0];
-$result_trees{'commands'}{'contents'}[0]{'parent'} = $result_trees{'commands'};
-$result_trees{'commands'}{'contents'}[1]{'parent'} = $result_trees{'commands'};
-$result_trees{'commands'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[2]{'args'}[0];
-$result_trees{'commands'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'commands'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands'}{'contents'}[2]{'args'}[0];
-$result_trees{'commands'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[2];
-$result_trees{'commands'}{'contents'}[2]{'extra'}{'index_entry'}{'command'} = $result_trees{'commands'}{'contents'}[2];
-$result_trees{'commands'}{'contents'}[2]{'extra'}{'index_entry'}{'content'} = $result_trees{'commands'}{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'commands'}{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'commands'}{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'commands'}{'contents'}[2]{'parent'} = $result_trees{'commands'};
-$result_trees{'commands'}{'contents'}[3]{'parent'} = $result_trees{'commands'};
-$result_trees{'commands'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[4]{'args'}[0];
-$result_trees{'commands'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'commands'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[4]{'args'}[0]{'contents'}[1];
-$result_trees{'commands'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands'}{'contents'}[4]{'args'}[0];
-$result_trees{'commands'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[4];
-$result_trees{'commands'}{'contents'}[4]{'parent'} = $result_trees{'commands'};
+$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[4];
$result_texis{'commands'} = '@@ @TeX{} @
@"e @^{@dotless{i}} @~{a} @ringaccent a
+
@clicksequence{File @click{} Open}@.
@email{a, b} @code{code --- -- \'\' ``}
--- -- \'\' ``. @sc{small caps}.
@@ -526,6 +403,7 @@ $result_texis{'commands'} = '@@ @TeX{} @
$result_texts{'commands'} = '@ TeX e" i^ a~ a*
+
File -> Open.
b code --- -- \'\' ``
-- - " ". SMALL CAPS.
@@ -537,10 +415,10 @@ majorheading in b
$result_errors{'commands'} = [
{
- 'error_line' => ':7: warning: entry for index `cp\' outside of any node
+ 'error_line' => 'warning: entry for index `cp\' outside of any node
',
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 8,
'macro' => '',
'text' => 'entry for index `cp\' outside of any node',
'type' => 'warning'
@@ -551,9 +429,17 @@ $result_errors{'commands'} = [
$result_floats{'commands'} = {};
+$result_indices_sort_strings{'commands'} = {
+ 'cp' => [
+ 'index entry "in text" LaTeX'
+ ]
+};
+
+
+
+$result_converted{'plaintext'}->{'commands'} = '@ TeX ë î ã å
-$result_converted{'plaintext'}->{'commands'} = '@ TeX ë î ã å File -> Open. b <a> \'code --- -- \'\' ``\' -- - " ". SMALL
-CAPS.
+ File → Open. b <a> ‘code --- -- \'\' ``’ — – ” “. SMALL CAPS.
majorheading in b
*****************
@@ -562,18 +448,20 @@ majorheading in b
$result_converted{'html_text'}->{'commands'} = '<p>@ TeX &nbsp;&euml; &icirc; &atilde; &aring;
-File &rarr; Open.
-<a href="mailto:a">b</a> <code>code --- -- \'\' ``</code>
-&mdash; &ndash; &rdquo; &ldquo;. <small>SMALL CAPS</small>.
</p>
-<span id="index-index-entry-_0060_0060in-text_0027_0027-LaTeX"></span>
+<p>File &rarr; Open.
+<a class="email" href="mailto:a">b</a> <code class="code">code --- -- \'\' ``</code>
+&mdash; &ndash; &rdquo; &ldquo;. <small class="sc">SMALL CAPS</small>.
+</p>
+<a class="index-entry-id" id="index-index-entry-_0060_0060in-text_0027_0027-LaTeX"></a>
-<span id="majorheading-in-b"></span><h2 class="majorheading">majorheading <b>in b</b></h2>
+<h2 class="majorheading" id="majorheading-in-b">majorheading <b class="b">in b</b></h2>
';
-$result_converted{'xml'}->{'commands'} = '<para>&arobase; &tex; <spacecmd type="nl"/><accent type="uml" bracketed="off">e</accent> <accent type="circ"><dotless>i</dotless></accent> <accent type="tilde">a</accent> <accent type="ring" spaces=" ">a</accent>
-<clicksequence>File <click command="arrow"/> Open</clicksequence>&eosperiod;
+$result_converted{'xml'}->{'commands'} = '<para>&arobase; &tex; <spacecmd type="nl"/><accent type="uml" bracketed="off">e</accent> <accent type="circ"><dotless>i</dotless></accent> <accent type="tilde">a</accent> <accent type="ring" spaces=" " bracketed="off">a</accent>
+</para>
+<para><clicksequence>File <click command="arrow"/> Open</clicksequence>&eosperiod;
<email><emailaddress>a</emailaddress><emailname spaces=" ">b</emailname></email> <code>code --- -- \'\' ``</code>
&textmdash; &textndash; &textrdquo; &textldquo;. <sc>small caps</sc>.
</para>
@@ -583,14 +471,27 @@ $result_converted{'xml'}->{'commands'} = '<para>&arobase; &tex; <spacecmd type="
';
+$result_converted{'latex_text'}->{'commands'} = '@ \\TeX{} \\ {}\\"{e} \\^{\\i{}} \\~{a} \\r{a}
+
+File $\\rightarrow{}$ Open\\@.
+\\href{mailto:a}{b} \\texttt{code {-}{-}{-} {-}{-} {\'}{\'} {`}{`}}
+--- -- \'\' ``. \\textsc{small caps}.
+
+\\index[cp]{index entry ""in text"" LaTeX@index entry ``in text\'\' \\LaTeX{}}%
+
+\\Texinfonopagebreakheading{\\chapter*}{{majorheading \\textbf{in b}}}
+';
+
+
$result_converted{'docbook'}->{'commands'} = '<para>@ &tex; &#160;&#235; &#238; &#227; &#229;
-File &#8594; Open.
+</para>
+<para>File &#8594; Open.
<ulink url="mailto:a">b</ulink> <literal>code --- -- \'\' ``</literal>
&#8212; &#8211; &#8221; &#8220;. SMALL CAPS.
</para>
<indexterm role="cp"><primary>index entry &#8220;in text&#8221; &latex;</primary></indexterm>
-<bridgehead renderas="other">majorheading <emphasis role="bold">in b</emphasis></bridgehead>
+<bridgehead renderas="sect1">majorheading <emphasis role="bold">in b</emphasis></bridgehead>
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/commands_in_math.pl b/macros/texinfo/texinfo/tp/t/results/coverage/commands_in_math.pl
new file mode 100644
index 0000000000..35c5a588db
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/commands_in_math.pl
@@ -0,0 +1,2108 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'commands_in_math'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'displaymath',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '``simple-double--three---four----\'\''
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'strong',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'w',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'text' => '`'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'w',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '`simple-double-'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'w',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '-three---four----\''
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'w',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '\''
+ },
+ {
+ 'cmdname' => '*'
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'displaymath'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'displaymath'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'displaymath',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'u'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '"',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'U'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => '"',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'n'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '\'',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'o'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '=',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '`',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => '\'',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'dotless',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'j'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'dotless',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'E'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '=',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => '`',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'l',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'C'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '\'',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => ',',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'C'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '\'',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => ',',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => ',',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'H',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'dotaccent',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ringaccent',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'tieaccent',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'u',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ubaraccent',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'udotaccent',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'v',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ogonek',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' a'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'h'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sup',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'l'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sub',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'cmdname' => '*'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => ' '
+ },
+ {
+ 'cmdname' => ' '
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '
+'
+ },
+ {
+ 'cmdname' => '-'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '|'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => ':'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '!'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '?'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '.'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '}'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '{'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '/'
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'today',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'displaymath'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'displaymath'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'displaymath',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'click',
+ 'extra' => {
+ 'clickstyle' => 'arrow'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '0075'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'U',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'TeX',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'LaTeX',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'copyright',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'dots',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'enddots',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'equiv',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'error',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'expansion',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'minus',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'point',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'print',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'result',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'aa',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'AA',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ae',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'oe',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'AE',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'OE',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'o',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'O',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ss',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'l',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'L',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'DH',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'TH',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'dh',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'th',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'exclamdown',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'questiondown',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'pounds',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'registeredsymbol',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ordf',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ordm',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'comma',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'displaymath'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'displaymath'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 24,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'displaymath',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'quotedblleft',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'quotedblright',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'quoteleft',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 28,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'quoteright',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 28,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'quotedblbase',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 28,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'quotesinglbase',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 28,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'guillemetleft',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 28,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'guillemetright',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 29,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'guillemotleft',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 29,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'guillemotright',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 29,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'guilsinglleft',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 29,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'guilsinglright',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 30,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'textdegree',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 30,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'euro',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 30,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'arrow',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 30,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'leq',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 30,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'geq',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 30,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'displaymath'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'displaymath'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 31,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 26,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'commands_in_math'} = '
+@displaymath
+@strong{``simple-double--three---four----\'\'} @w{aa}
+`@w{}`simple-double-@w{}-three---four----\'@w{}\'@*
+@end displaymath
+
+@displaymath
+@"u @"{U} @~n @^a @\'e @=o @`i @\'{e} @dotless{i} @dotless{j} @`{@=E}
+@l{} @,{@\'C} @,{@\'C} @,c @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
+@u{a} @ubaraccent{a} @udotaccent{a} @v{a} @ogonek{a} a@sup{h}@sub{l}
+@* @ @ @
+@- @| @: @! @? @. @@ @} @{ @/
+@today{}
+@end displaymath
+
+@displaymath
+@click{}
+@U{0075}
+@TeX{} @LaTeX{} @bullet{} @copyright{} @dots{} @enddots{} @equiv{}
+@error{} @expansion{} @minus{} @point{} @print{} @result{}
+@aa{} @AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
+@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
+@registeredsymbol{} @ordf{} @ordm{} @comma{}
+@end displaymath
+
+@displaymath
+@quotedblleft{} @quotedblright{}
+@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
+@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
+@guilsinglright{} @textdegree{} @euro{} @arrow{} @leq{} @geq{}
+@end displaymath
+';
+
+
+$result_texts{'commands_in_math'} = '
+``simple-double--three---four----\'\' aa
+``simple-double--three---four----\'\'
+
+
+u" U" n~ a^ e\' o= i` e\' i j E=`
+/l C\', C\', c, a\'\' a. a* a[
+a( a_ .a a< a; ahl
+
+ ! ? . @ } {
+a sunny day
+
+->
+0075
+TeX LaTeX * (C) ... ... ==
+error--> ==> - -!- -| =>
+aa AA ae oe AE OE /o /O ss /l /L D
+TH d th ! ? #
+(R) a o ,
+
+" "
+` \' ,, , <<
+>> << >> <
+> o Euro -> <= >=
+';
+
+$result_errors{'commands_in_math'} = [
+ {
+ 'error_line' => '@| should only appear in heading or footing
+',
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => '',
+ 'text' => '@| should only appear in heading or footing',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'commands_in_math'} = {};
+
+
+
+$result_converted{'plaintext'}->{'commands_in_math'} = '*``simple-double--three---four----\'\'* aa
+``simple-double--three---four----\'\'
+
+
+ü Ü ñ â é ō ì é ı ȷ Ḕ
+ł Ḉ Ḉ ç a̋ ȧ å a͡
+ă a̲ ạ ǎ ą a^{h}_{l}
+
+ ! ? . @ } {
+a sunny day
+
+→
+u
+TeX LaTeX • © ... ... ≡
+error→ ↦ − ★ ⊣ ⇒
+å Å æ œ Æ Œ ø Ø ß ł Ł Ð
+Þ ð þ ¡ ¿ £
+® ª º ,
+
+“ ”
+‘ ’ „ ‚ «
+» « » ‹
+› ° € → ≤ ≥
+';
+
+
+$result_converted{'html_text'}->{'commands_in_math'} = '
+<div class="displaymath"><em><strong class="strong">``simple-double--three---four----\'\'</strong> aa<!-- /@w -->
+`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----\'<!-- /@w -->\'
+
+</em></div>
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; &inodot; &#567; &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
+
+ &nbsp;&nbsp; &nbsp; ! ? . @ } {
+a sunny day
+</em></div>
+<div class="displaymath"><em>&rarr;
+&#x0075;
+TeX LaTeX &bull; &copy; &hellip; ... &equiv;
+error&rarr; &rarr; &minus; &lowast; -| &rArr;
+&aring; &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH;
+&THORN; &eth; &thorn; &iexcl; &iquest; &pound;
+&reg; &ordf; &ordm; ,
+</em></div>
+<div class="displaymath"><em>&ldquo; &rdquo;
+&lsquo; &rsquo; &bdquo; &sbquo; &laquo;
+&raquo; &laquo; &raquo; &lsaquo;
+&rsaquo; &deg; &euro; &rarr; &le; &ge;
+</em></div>';
+
+
+$result_converted{'xml'}->{'commands_in_math'} = '
+<displaymath endspaces=" ">
+<strong>``simple-double--three---four----\'\'</strong> <w>aa</w>
+`<w></w>`simple-double-<w></w>-three---four----\'<w></w>\'&linebreak;
+</displaymath>
+
+<displaymath endspaces=" ">
+<accent type="uml" bracketed="off">u</accent> <accent type="uml">U</accent> <accent type="tilde" bracketed="off">n</accent> <accent type="circ" bracketed="off">a</accent> <accent type="acute" bracketed="off">e</accent> <accent type="macr" bracketed="off">o</accent> <accent type="grave" bracketed="off">i</accent> <accent type="acute">e</accent> <dotless>i</dotless> <dotless>j</dotless> <accent type="grave"><accent type="macr" bracketed="off">E</accent></accent>
+&lslash; <accent type="cedil"><accent type="acute" bracketed="off">C</accent></accent> <accent type="cedil"><accent type="acute" bracketed="off">C</accent></accent> <accent type="cedil" bracketed="off">c</accent> <accent type="doubleacute">a</accent> <accent type="dotaccent">a</accent> <accent type="ring">a</accent> <accent type="tieaccent">a</accent>
+<accent type="breve">a</accent> <accent type="ubaraccent">a</accent> <accent type="udotaccent">a</accent> <accent type="caron">a</accent> <accent type="ogon">a</accent> a<sup>h</sup><sub>l</sub>
+&linebreak; <spacecmd type="spc"/><spacecmd type="spc"/> <spacecmd type="nl"/>&hyphenbreak; <divideheading/> &noeos; &eosexcl; &eosquest; &eosperiod; &arobase; &rbrace; &lbrace; &slashbreak;
+<today/>
+</displaymath>
+
+<displaymath endspaces=" ">
+<click command="arrow"/>
+<U>0075</U>
+&tex; &latex; &bullet; &copyright; &dots; &enddots; &equiv;
+&errorglyph; &expansion; &minus; &point; &printglyph; &result;
+&aring; &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &lslash; &Lslash; &ETH;
+&THORN; &eth; &thorn; &iexcl; &iquest; &pound;
+&registered; &ordf; &ordm; &comma;
+</displaymath>
+
+<displaymath endspaces=" ">
+&ldquo; &rdquo;
+&lsquo; &rsquo; &bdquo; &sbquo; &laquo;
+&raquo; &guillemotleft; &guillemotright; &lsaquo;
+&rsaquo; &deg; &euro; &rarr; &le; &ge;
+</displaymath>
+';
+
+
+$result_converted{'latex_text'}->{'commands_in_math'} = '
+\\[
+\\mathbf{``simple-double--three---four----\'\'} \\hbox{aa}
+`\\hbox{}`simple-double-\\hbox{}-three---four----\'\\hbox{}\'
+\\]
+
+\\[
+\\ddot{u} \\ddot{U} \\tilde{n} \\hat{a} \\acute{e} \\bar{o} \\grave{i} \\acute{e} \\imath{} \\jmath{} \\grave{\\bar{E}}
+\\mathord{\\text{\\l{}}} \\textsl{\\c{\\\'{C}}} \\textsl{\\c{\\\'{C}}} \\textsl{\\c{c}} \\textsl{\\H{a}} \\dot{a} \\mathring{a} \\textsl{\\t{a}}
+\\breve{a} \\textsl{\\b{a}} \\textsl{\\d{a}} \\check{a} \\textsl{\\k{a}} a^{h}_{l}
+ \\ {}\\ {} \\ {}\\-{} ! ? . @ \\} \\{
+\\today{}
+\\]
+
+\\[
+\\rightarrow{}
+u
+TeX LaTeX \\bullet{} \\copyright{} \\dots{} \\dots{} \\equiv{}
+\\fbox{error} \\mapsto{} - \\star{} \\dashv{} \\Rightarrow{}
+\\mathord{\\text{\\aa{}}} \\mathord{\\text{\\AA{}}} \\mathord{\\text{\\ae{}}} \\mathord{\\text{\\oe{}}} \\mathord{\\text{\\AE{}}} \\mathord{\\text{\\OE{}}} \\mathord{\\text{\\o{}}} \\mathord{\\text{\\O{}}} \\mathord{\\text{\\ss{}}} \\mathord{\\text{\\l{}}} \\mathord{\\text{\\L{}}} \\mathord{\\text{\\DH{}}}
+\\mathord{\\text{\\TH{}}} \\mathord{\\text{\\dh{}}} \\mathord{\\text{\\th{}}} \\mathord{\\text{\\textexclamdown{}}} \\mathord{\\text{\\textquestiondown{}}} \\mathsterling{}
+\\circledR{} \\mathord{\\text{\\textordfeminine{}}} \\mathord{\\text{\\textordmasculine{}}} ,
+\\]
+
+\\[
+\\mathord{\\text{\\textquotedblleft{}}} \\mathord{\\text{\\textquotedblright{}}}
+\\mathord{\\text{\\textquoteleft{}}} \\mathord{\\text{\\textquoteright{}}} \\mathord{\\text{\\quotedblbase{}}} \\mathord{\\text{\\quotesinglbase{}}} \\mathord{\\text{\\guillemotleft{}}}
+\\mathord{\\text{\\guillemotright{}}} \\mathord{\\text{\\guillemotleft{}}} \\mathord{\\text{\\guillemotright{}}} \\mathord{\\text{\\guilsinglleft{}}}
+\\mathord{\\text{\\guilsinglright{}}} ^{\\circ{}} \\euro{} \\rightarrow{} \\leq{} \\geq{}
+\\]
+';
+
+
+$result_converted{'docbook'}->{'commands_in_math'} = '
+<informalequation><mathphrase><emphasis role="bold">``simple-double--three---four----\'\'</emphasis> aa<!-- /@w -->
+`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----\'<!-- /@w -->\'
+
+</mathphrase></informalequation>
+<informalequation><mathphrase>&#252; &#220; &#241; &#226; &#233; &#333; &#236; &#233; &#305; &#567; &#274;&#768;
+&#322; &#262;&#807; &#262;&#807; &#231; a&#779; &#551; &#229; a&#865;
+&#259; a&#818; &#7841; &#462; &#261; a<superscript>h</superscript><subscript>l</subscript>
+
+ &#160;&#160; &#160; ! ? . @ } {
+a sunny day
+</mathphrase></informalequation>
+<informalequation><mathphrase>&#8594;
+&#x0075;
+&tex; &latex; &#8226; &#169; &#8230; ... &#8801;
+error&#8594; &#8614; &#8722; &#9733; &#8867; &#8658;
+&#229; &#197; &#230; &#339; &#198; &#338; &#248; &#216; &#223; &#322; &#321; &#208;
+&#222; &#240; &#254; &#161; &#191; &#163;
+&#174; &#170; &#186; &#44;
+</mathphrase></informalequation>
+<informalequation><mathphrase>&#8220; &#8221;
+&#8216; &#8217; &#8222; &#8218; &#171;
+&#187; &#171; &#187; &#8249;
+&#8250; &#176; &#8364; &#8594; &#8804; &#8805;
+</mathphrase></informalequation>';
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl b/macros/texinfo/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl
index aa8b577ebf..1e97c2bf8a 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -1,108 +1,91 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'comment_on_cartouche_line'} = {
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [],
- 'extra' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' comment
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
+ 'args' => [
+ {
'extra' => {
- 'misc_args' => [
- ' comment
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment
'
- ]
+ ]
+ }
+ }
},
- 'parent' => {}
+ 'type' => 'block_line_arg'
}
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'cartouche',
- 'contents' => [
- {
+ ],
+ 'cmdname' => 'cartouche',
'contents' => [
{
- 'parent' => {},
- 'text' => 'in cartouche.
+ 'contents' => [
+ {
+ 'text' => 'in cartouche.
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ }
+ ],
+ 'type' => 'paragraph'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'cartouche'
+ 'contents' => [
+ {
+ 'text' => 'cartouche'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'cartouche'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'cartouche',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'cartouche'
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'parent'} = $result_trees{'comment_on_cartouche_line'};
$result_texis{'comment_on_cartouche_line'} = '@cartouche @c comment
in cartouche.
@@ -136,6 +119,12 @@ $result_converted{'xml'}->{'comment_on_cartouche_line'} = '<cartouche spaces=" "
';
+$result_converted{'latex_text'}->{'comment_on_cartouche_line'} = '\\begin{mdframed}[style=Texinfocartouche]
+in cartouche.
+\\end{mdframed}
+';
+
+
$result_converted{'docbook'}->{'comment_on_cartouche_line'} = '<para>in cartouche.
</para>';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/comment_on_group_line.pl b/macros/texinfo/texinfo/tp/t/results/coverage/comment_on_group_line.pl
index da728ad646..39992dd54b 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/comment_on_group_line.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/comment_on_group_line.pl
@@ -1,108 +1,91 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'comment_on_group_line'} = {
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [],
- 'extra' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' comment
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
+ 'args' => [
+ {
'extra' => {
- 'misc_args' => [
- ' comment
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment
'
- ]
+ ]
+ }
+ }
},
- 'parent' => {}
+ 'type' => 'block_line_arg'
}
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'group',
- 'contents' => [
- {
+ ],
+ 'cmdname' => 'group',
'contents' => [
{
- 'parent' => {},
- 'text' => 'in group.
+ 'contents' => [
+ {
+ 'text' => 'in group.
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ }
+ ],
+ 'type' => 'paragraph'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'group'
+ 'contents' => [
+ {
+ 'text' => 'group'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'group'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'comment_on_group_line'}{'contents'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comment_on_group_line'}{'contents'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'comment_on_group_line'}{'contents'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'parent'} = $result_trees{'comment_on_group_line'};
$result_texis{'comment_on_group_line'} = '@group @c comment
in group.
@@ -124,8 +107,8 @@ $result_converted{'plaintext'}->{'comment_on_group_line'} = 'in group.
';
-$result_converted{'html_text'}->{'comment_on_group_line'} = '<p>in group.
-</p>';
+$result_converted{'html_text'}->{'comment_on_group_line'} = '<div class="group"><p>in group.
+</p></div>';
$result_converted{'xml'}->{'comment_on_group_line'} = '<group spaces=" " endspaces=" "><!-- c comment -->
@@ -134,6 +117,10 @@ $result_converted{'xml'}->{'comment_on_group_line'} = '<group spaces=" " endspac
';
+$result_converted{'latex_text'}->{'comment_on_group_line'} = 'in group.
+';
+
+
$result_converted{'docbook'}->{'comment_on_group_line'} = '<para>in group.
</para>';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/def.pl b/macros/texinfo/texinfo/tp/t/results/coverage/def.pl
index 8efedab41c..d85496ca3f 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/def.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/def.pl
@@ -1,2224 +1,1830 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'def'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'deffn',
'contents' => [
{
- 'args' => [
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'deffn',
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'c--ategory'
+ 'contents' => [
+ {
+ 'text' => 'c--ategory'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'text' => 'd--effn_name'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'a--rguments...'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
- 'extra' => {
- 'def_role' => 'category'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'name'
- },
- 'parent' => {},
- 'text' => 'd--effn_name'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'a--rguments...'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffn',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'd--effn_name',
- 'number' => 1
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 1,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffn',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffn'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'd--effn
+ 'contents' => [
+ {
+ 'text' => 'd--effn
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'def_item'
- },
- {
- 'args' => [
+ 'type' => 'def_item'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'deffn'
+ 'contents' => [
+ {
+ 'text' => 'deffn'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'deffn'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'deffn',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'deffn'
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 2,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'deffn',
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'args' => [
+ 'cmdname' => 'deffn',
+ 'contents' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'def_role' => 'category'
- },
- 'parent' => {},
- 'text' => 'cate--gory'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'name'
- },
- 'parent' => {},
- 'text' => 'de--ffn_name'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'ar--guments'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'more'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'args'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'cmdname' => '*',
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {}
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'even'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'more'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'so'
- },
+ 'args' => [
{
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'text' => 'cate--gory'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'text' => 'de--ffn_name'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'ar--guments'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'more'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'args'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'cmdname' => '*',
+ 'extra' => {
+ 'def_role' => 'arg'
+ }
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'even'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'more'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'so'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
',
- 'type' => 'spaces_at_end'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffn',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'de--ffn_name',
- 'number' => 2
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 2,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffn',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffn'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'def--fn
+ 'contents' => [
+ {
+ 'text' => 'def--fn
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'def_item'
- },
- {
- 'args' => [
+ 'type' => 'def_item'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'deffn'
+ 'contents' => [
+ {
+ 'text' => 'deffn'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'deffn'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'deffn',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'deffn'
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 6,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'deffn',
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'args' => [
+ 'cmdname' => 'deffn',
+ 'contents' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'def_role' => 'category'
- },
- 'parent' => {},
- 'text' => 'fset'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'text' => 'fset'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'var',
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'a'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'g'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
- 'cmdname' => 'var',
- 'contents' => [],
- 'extra' => {
- 'def_role' => 'name'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'a'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'g'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffn',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'i',
- 'number' => 3
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 3,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffn',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffn'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'args' => [
{
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'cmde'
+ 'contents' => [
+ {
+ 'text' => 'cmde'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'text' => 'truc'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
- 'extra' => {
- 'def_role' => 'category'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'name'
- },
- 'parent' => {},
- 'text' => 'truc'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [],
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'truc',
- 'number' => 4
+ 'cmdname' => 'deffnx',
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 4,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffnx',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'def_role' => 'category'
- },
- 'parent' => {},
- 'text' => 'Command'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'log trap'
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'text' => 'Command'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'log trap'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
- 'extra' => {
- 'def_role' => 'name'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [],
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'log trap',
- 'number' => 5
+ 'cmdname' => 'deffnx',
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 5,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffnx',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'def_role' => 'category'
- },
- 'parent' => {},
- 'text' => 'Command'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'log trap1'
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'text' => 'Command'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'log trap1'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'name',
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
- 'extra' => {
- 'def_role' => 'name',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 14,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [],
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 14,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'log trap1',
- 'number' => 6
+ 'cmdname' => 'deffnx',
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 6,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffnx',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 14,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'def_role' => 'category'
- },
- 'parent' => {},
- 'text' => 'Command'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'log trap2'
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'text' => 'Command'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'log trap2'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'name',
+ 'spaces_after_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
- 'extra' => {
- 'def_role' => 'name',
- 'spaces_after_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 15,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [],
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 15,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'log trap2',
- 'number' => 7
+ 'cmdname' => 'deffnx',
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 7,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffnx',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 15,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'def_role' => 'category'
- },
- 'parent' => {},
- 'text' => 'cmde'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'text' => 'cmde'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'id ule'
+ 'contents' => [
+ {
+ 'text' => 'id ule'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'b',
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ }
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'truc'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
- 'cmdname' => 'b',
- 'contents' => [],
- 'extra' => {
- 'def_role' => 'name'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 16,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'truc'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'id ule',
- 'number' => 8
+ 'cmdname' => 'deffnx',
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 8,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffnx',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 16,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'def_role' => 'category'
- },
- 'parent' => {},
- 'text' => 'cmde2'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'id '
- },
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'text' => 'cmde2'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
+ {
+ 'text' => 'id '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' ule'
}
],
- 'cmdname' => 'samp',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 17,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' ule'
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'b',
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'truc'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
- 'cmdname' => 'b',
- 'contents' => [],
- 'extra' => {
- 'def_role' => 'name'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 17,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'truc'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'id i ule',
- 'number' => 9
+ 'cmdname' => 'deffnx',
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 9,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffnx',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 17,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'args' => [
{
- 'contents' => [
- {
- 'contents' => [],
- 'extra' => {
- 'def_role' => 'category'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 18,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'name'
- },
- 'parent' => {},
- 'text' => 'machin'
- },
+ 'args' => [
{
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'text' => 'machin'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
',
- 'type' => 'spaces_at_end'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'machin',
- 'number' => 10
+ 'cmdname' => 'deffnx',
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 10,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffnx'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 18,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'args' => [
{
- 'contents' => [
- {
- 'contents' => [],
- 'extra' => {
- 'def_role' => 'category'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 19,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'bidule machin'
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'bidule machin'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
- 'extra' => {
- 'def_role' => 'name'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 19,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'bidule machin',
- 'number' => 11
+ 'cmdname' => 'deffnx',
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 11,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffnx'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 19,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'args' => [
{
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'truc'
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'text' => 'machin'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
- 'extra' => {
- 'def_role' => 'category'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 20,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'name'
- },
- 'parent' => {},
- 'text' => 'machin'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
+ 'cmdname' => 'deffnx',
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 12,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'text' => 'followed'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'by'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'a'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'comment'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'type' => 'line_arg'
+ }
],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'machin',
- 'number' => 12
+ 'cmdname' => 'deffnx',
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 13,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
},
- 'original_def_cmdname' => 'deffnx'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 20,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'args' => [
{
'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'truc'
+ 'text' => ' comment
+',
+ 'type' => 'misc_arg'
}
],
+ 'cmdname' => 'c',
'extra' => {
- 'def_role' => 'category'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 21,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'name'
- },
- 'parent' => {},
- 'text' => 'followed'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'by'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'a'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'comment'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'misc_args' => [
+ ' comment
+'
+ ]
+ }
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'followed',
- 'number' => 13
+ 'type' => 'inter_def_item'
},
- 'original_def_cmdname' => 'deffnx',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 21,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'contents' => [
{
'args' => [
{
- 'parent' => {},
- 'text' => ' comment
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'text' => 'after'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'a'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'deff'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'item'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
',
- 'type' => 'misc_arg'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'type' => 'line_arg'
}
],
- 'cmdname' => 'c',
+ 'cmdname' => 'deffnx',
'extra' => {
- 'misc_args' => [
- ' comment
-'
- ]
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 14,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => ' '
},
- 'parent' => {}
- }
- ],
- 'parent' => {},
- 'type' => 'inter_def_item'
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
+ },
{
'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'truc'
+ 'text' => ' comment
+',
+ 'type' => 'misc_arg'
}
],
+ 'cmdname' => 'c',
'extra' => {
- 'def_role' => 'category'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 23,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'name'
- },
- 'parent' => {},
- 'text' => 'after'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'a'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'deff'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'item'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'misc_args' => [
+ ' comment
+'
+ ]
+ }
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'after',
- 'number' => 14
+ 'type' => 'inter_def_item'
},
- 'original_def_cmdname' => 'deffnx',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 23,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'contents' => [
{
'args' => [
{
- 'parent' => {},
- 'text' => ' comment
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 25,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'text' => 'deffnx'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'before'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'end'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'deffn'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => '
',
- 'type' => 'misc_arg'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'type' => 'line_arg'
}
],
- 'cmdname' => 'c',
+ 'cmdname' => 'deffnx',
'extra' => {
- 'misc_args' => [
- ' comment
-'
- ]
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 15,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffnx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => ' '
},
- 'parent' => {}
- }
- ],
- 'parent' => {},
- 'type' => 'inter_def_item'
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 25,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
+ },
{
'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'truc'
+ 'text' => 'Various deff lines
+'
}
],
- 'extra' => {
- 'def_role' => 'category'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 25,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed_def_content'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'name'
- },
- 'parent' => {},
- 'text' => 'deffnx'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'before'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'end'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'extra' => {
- 'def_role' => 'arg'
- },
- 'parent' => {},
- 'text' => 'deffn'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'deffnx',
- 'extra' => {
- 'def_command' => 'deffn',
- 'def_parsed_hash' => {
- 'category' => {},
- 'name' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deffnx',
- 'index_name' => 'fn',
- 'index_type_command' => 'deffn',
- 'key' => 'deffnx',
- 'number' => 15
+ 'type' => 'def_item'
},
- 'original_def_cmdname' => 'deffnx',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 25,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'def_line'
- },
- {
- 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Various deff lines
+ 'contents' => [
+ {
+ 'text' => 'deffn'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'def_item'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'deffn'
- }
- ],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'deffn'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'deffn',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'deffn'
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 27,
+ 'line_nr' => 11,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'def'}{'contents'}[0]{'parent'} = $result_trees{'def'};
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[1];
-$result_trees{'def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[1];
-$result_trees{'def'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[1];
-$result_trees{'def'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[2];
-$result_trees{'def'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[1];
-$result_trees{'def'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'def'}{'contents'}[1]{'contents'}[2];
-$result_trees{'def'}{'contents'}[1]{'parent'} = $result_trees{'def'};
-$result_trees{'def'}{'contents'}[2]{'parent'} = $result_trees{'def'};
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[3]{'contents'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[3];
-$result_trees{'def'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[1];
-$result_trees{'def'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[3];
-$result_trees{'def'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[3]{'contents'}[2];
-$result_trees{'def'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[3];
-$result_trees{'def'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'def'}{'contents'}[3]{'contents'}[2];
-$result_trees{'def'}{'contents'}[3]{'parent'} = $result_trees{'def'};
-$result_trees{'def'}{'contents'}[4]{'parent'} = $result_trees{'def'};
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[6];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[6]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[11]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[11]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[11];
-$result_trees{'def'}{'contents'}[5]{'contents'}[11]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[12]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[13]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[13];
-$result_trees{'def'}{'contents'}[5]{'contents'}[13]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[14]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[15]{'contents'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[15]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[15];
-$result_trees{'def'}{'contents'}[5]{'contents'}[15]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[16]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[16];
-$result_trees{'def'}{'contents'}[5]{'contents'}[16]{'parent'} = $result_trees{'def'}{'contents'}[5];
-$result_trees{'def'}{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[16];
-$result_trees{'def'}{'contents'}[5]{'parent'} = $result_trees{'def'};
+$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}[0] = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14];
$result_texis{'def'} = '
@deffn {c--ategory} d--effn_name a--rguments...
@@ -2275,7 +1881,7 @@ Various deff lines
$result_errors{'def'} = [
{
- 'error_line' => ':2: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 2,
@@ -2284,7 +1890,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':7: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 7,
@@ -2293,7 +1899,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':11: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 11,
@@ -2302,7 +1908,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':12: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 12,
@@ -2311,7 +1917,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':13: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 13,
@@ -2320,7 +1926,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':14: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 14,
@@ -2329,7 +1935,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':15: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 15,
@@ -2338,7 +1944,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':16: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 16,
@@ -2347,7 +1953,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':17: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 17,
@@ -2356,7 +1962,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':18: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 18,
@@ -2365,7 +1971,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':19: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 19,
@@ -2374,7 +1980,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':20: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 20,
@@ -2383,7 +1989,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':21: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 21,
@@ -2392,7 +1998,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':23: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 23,
@@ -2401,7 +2007,7 @@ $result_errors{'def'} = [
'type' => 'warning'
},
{
- 'error_line' => ':25: warning: entry for index `fn\' outside of any node
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
',
'file_name' => '',
'line_nr' => 25,
@@ -2415,13 +2021,34 @@ $result_errors{'def'} = [
$result_floats{'def'} = {};
+$result_indices_sort_strings{'def'} = {
+ 'fn' => [
+ 'after',
+ 'bidule machin',
+ 'd--effn_name',
+ 'de--ffn_name',
+ 'deffnx',
+ 'followed',
+ 'i',
+ 'id i ule',
+ 'id ule',
+ 'log trap',
+ 'log trap1',
+ 'log trap2',
+ 'machin',
+ 'machin',
+ 'truc'
+ ]
+};
+
+
$result_converted{'plaintext'}->{'def'} = ' -- c--ategory: d--effn_name a--rguments...
- d-effn
+ d–effn
-- cate--gory: de--ffn_name ar--guments more args
even more so
- def-fn
+ def–fn
-- fset: I a g
-- cmde: truc
@@ -2441,30 +2068,30 @@ $result_converted{'plaintext'}->{'def'} = ' -- c--ategory: d--effn_name a--rgume
$result_converted{'html_text'}->{'def'} = '
-<dl class="def">
-<dt id="index-d_002d_002deffn_005fname"><span class="category">c--ategory: </span><span><strong>d--effn_name</strong> <em>a--rguments...</em><a href=\'#index-d_002d_002deffn_005fname\' class=\'copiable-anchor\'> &para;</a></span></dt>
+<dl class="first-deffn">
+<dt class="deffn" id="index-d_002d_002deffn_005fname"><span class="category-def">c&ndash;ategory: </span><span><strong class="def-name">d--effn_name</strong> <var class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" href=\'#index-d_002d_002deffn_005fname\'> &para;</a></span></dt>
<dd><p>d&ndash;effn
</p></dd></dl>
-<dl class="def">
-<dt id="index-de_002d_002dffn_005fname"><span class="category">cate--gory: </span><span><strong>de--ffn_name</strong> <em>ar--guments more args <br> even more so</em><a href=\'#index-de_002d_002dffn_005fname\' class=\'copiable-anchor\'> &para;</a></span></dt>
+<dl class="first-deffn">
+<dt class="deffn" id="index-de_002d_002dffn_005fname"><span class="category-def">cate&ndash;gory: </span><span><strong class="def-name">de--ffn_name</strong> <var class="def-var-arguments">ar&ndash;guments more args <br> even more so</var><a class="copiable-link" href=\'#index-de_002d_002dffn_005fname\'> &para;</a></span></dt>
<dd><p>def&ndash;fn
</p></dd></dl>
-<dl class="def">
-<dt id="index-i"><span class="category">fset: </span><span><strong><var>i</var></strong> <em>a g</em><a href=\'#index-i\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-truc"><span class="category">cmde: </span><span><strong>truc</strong> <em></em><a href=\'#index-truc\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-log-trap"><span class="category">Command: </span><span><strong>log trap</strong> <em></em><a href=\'#index-log-trap\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-log-trap1"><span class="category">Command: </span><span><strong>log trap1</strong> <em></em><a href=\'#index-log-trap1\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-log-trap2"><span class="category">Command: </span><span><strong>log trap2</strong> <em></em><a href=\'#index-log-trap2\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-id-ule"><span class="category">cmde: </span><span><strong><b>id ule</b></strong> <em>truc</em><a href=\'#index-id-ule\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-id-i-ule"><span class="category">cmde2: </span><span><strong><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em><a href=\'#index-id-i-ule\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-machin"><span class="category">: </span><span><strong>machin</strong><a href=\'#index-machin\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-bidule-machin"><span class="category">: </span><span><strong>bidule machin</strong><a href=\'#index-bidule-machin\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-machin-1"><span class="category">truc: </span><span><strong>machin</strong><a href=\'#index-machin-1\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-followed"><span class="category">truc: </span><span><strong>followed</strong> <em>by a comment</em><a href=\'#index-followed\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-after"><span class="category">truc: </span><span><strong>after</strong> <em>a deff item</em><a href=\'#index-after\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dt id="index-deffnx"><span class="category">truc: </span><span><strong>deffnx</strong> <em>before end deffn</em><a href=\'#index-deffnx\' class=\'copiable-anchor\'> &para;</a></span></dt>
+<dl class="first-deffn">
+<dt class="deffn" id="index-i"><span class="category-def">fset: </span><span><strong class="def-name"><var class="var">i</var></strong> <var class="def-var-arguments">a g</var><a class="copiable-link" href=\'#index-i\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc"><span class="category-def">cmde: </span><span><strong class="def-name">truc</strong><a class="copiable-link" href=\'#index-truc\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span class="category-def">Command: </span><span><strong class="def-name">log trap</strong><a class="copiable-link" href=\'#index-log-trap\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span class="category-def">Command: </span><span><strong class="def-name">log trap1</strong><a class="copiable-link" href=\'#index-log-trap1\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span class="category-def">Command: </span><span><strong class="def-name">log trap2</strong><a class="copiable-link" href=\'#index-log-trap2\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-id-ule"><span class="category-def">cmde: </span><span><strong class="def-name"><b class="b">id ule</b></strong> <var class="def-var-arguments">truc</var><a class="copiable-link" href=\'#index-id-ule\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span class="category-def">cmde2: </span><span><strong class="def-name"><b class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; ule</b></strong> <var class="def-var-arguments">truc</var><a class="copiable-link" href=\'#index-id-i-ule\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-machin"><span class="category-def">: </span><span><strong class="def-name">machin</strong><a class="copiable-link" href=\'#index-machin\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-bidule-machin"><span class="category-def">: </span><span><strong class="def-name">bidule machin</strong><a class="copiable-link" href=\'#index-bidule-machin\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-machin-1"><span class="category-def">truc: </span><span><strong class="def-name">machin</strong><a class="copiable-link" href=\'#index-machin-1\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-followed"><span class="category-def">truc: </span><span><strong class="def-name">followed</strong> <var class="def-var-arguments">by a comment</var><a class="copiable-link" href=\'#index-followed\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-after"><span class="category-def">truc: </span><span><strong class="def-name">after</strong> <var class="def-var-arguments">a deff item</var><a class="copiable-link" href=\'#index-after\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-deffnx"><span class="category-def">truc: </span><span><strong class="def-name">deffnx</strong> <var class="def-var-arguments">before end deffn</var><a class="copiable-link" href=\'#index-deffnx\'> &para;</a></span></dt>
<dd><p>Various deff lines
</p></dd></dl>
';
@@ -2483,7 +2110,7 @@ $result_converted{'xml'}->{'def'} = '
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="4">truc</indexterm><defcategory bracketed="on">cmde</defcategory> <deffunction>truc</deffunction> <defparam bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="5">log trap</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log trap</deffunction> <defparam bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="6">log trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam> </definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="7">log trap2</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log trap2</deffunction> <defparam bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="7">log trap2</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" trailingspaces=" ">log trap2</deffunction> <defparam bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="8"><b>id ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="9"><b>id <samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id <samp>i</samp> ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn" number="10">machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction>machin</deffunction></definitionterm></deffnx>
@@ -2499,29 +2126,152 @@ $result_converted{'xml'}->{'def'} = '
';
+$result_converted{'latex_text'}->{'def'} = '
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{d{-}{-}effn\\_name \\EmbracOn{}\\textnormal{\\textsl{a--rguments...}}\\EmbracOff{}}& [c--ategory]
+\\end{tabularx}
+
+\\index[fn]{d--effn\\_name@\\texttt{d{-}{-}effn\\_name}}%
+\\begin{quote}
+\\unskip{\\parskip=0pt\\noindent}%
+d--effn
+\\end{quote}
+
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{de{-}{-}ffn\\_name \\EmbracOn{}\\textnormal{\\textsl{ar--guments more args even more so}}\\EmbracOff{}}& [cate--gory]
+\\end{tabularx}
+
+\\index[fn]{de--ffn\\_name@\\texttt{de{-}{-}ffn\\_name}}%
+\\begin{quote}
+\\unskip{\\parskip=0pt\\noindent}%
+def--fn
+\\end{quote}
+
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{\\Texinfocommandstyletextvar{i} \\EmbracOn{}\\textnormal{\\textsl{a g}}\\EmbracOff{}}& [fset]
+\\end{tabularx}
+
+\\index[fn]{i@\\texttt{\\Texinfocommandstyletextvar{i}}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{truc \\EmbracOn{}\\textnormal{\\textsl{}}\\EmbracOff{}}& [cmde]
+\\end{tabularx}
+
+\\index[fn]{truc@\\texttt{truc}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{log trap \\EmbracOn{}\\textnormal{\\textsl{}}\\EmbracOff{}}& [Command]
+\\end{tabularx}
+
+\\index[fn]{log trap@\\texttt{log trap}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{log trap1 \\EmbracOn{}\\textnormal{\\textsl{}}\\EmbracOff{}}& [Command]
+\\end{tabularx}
+
+\\index[fn]{log trap1@\\texttt{log trap1}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{log trap2 \\EmbracOn{}\\textnormal{\\textsl{}}\\EmbracOff{}}& [Command]
+\\end{tabularx}
+
+\\index[fn]{log trap2@\\texttt{log trap2}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{\\textbf{id ule} \\EmbracOn{}\\textnormal{\\textsl{truc}}\\EmbracOff{}}& [cmde]
+\\end{tabularx}
+
+\\index[fn]{id ule@\\texttt{\\textbf{id ule}}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{\\textbf{id `\\texttt{i}\'\\ ule} \\EmbracOn{}\\textnormal{\\textsl{truc}}\\EmbracOff{}}& [cmde2]
+\\end{tabularx}
+
+\\index[fn]{id i ule@\\texttt{\\textbf{id `\\texttt{i}\'\\ ule}}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{machin}& []
+\\end{tabularx}
+
+\\index[fn]{machin@\\texttt{machin}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{bidule machin}& []
+\\end{tabularx}
+
+\\index[fn]{bidule machin@\\texttt{bidule machin}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{machin}& [truc]
+\\end{tabularx}
+
+\\index[fn]{machin@\\texttt{machin}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{followed \\EmbracOn{}\\textnormal{\\textsl{by a comment}}\\EmbracOff{}}& [truc]
+\\end{tabularx}
+
+\\index[fn]{followed@\\texttt{followed}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{after \\EmbracOn{}\\textnormal{\\textsl{a deff item}}\\EmbracOff{}}& [truc]
+\\end{tabularx}
+
+\\index[fn]{after@\\texttt{after}}%
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
+\\texttt{deffnx \\EmbracOn{}\\textnormal{\\textsl{before end deffn}}\\EmbracOff{}}& [truc]
+\\end{tabularx}
+
+\\index[fn]{deffnx@\\texttt{deffnx}}%
+\\begin{quote}
+\\unskip{\\parskip=0pt\\noindent}%
+Various deff lines
+\\end{quote}
+';
+
+
$result_converted{'docbook'}->{'def'} = '
-<synopsis><indexterm role="fn"><primary>d--effn_name</primary></indexterm><phrase role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> <function>d--effn_name</function> <replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--effn_name</primary></indexterm><phrase role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> <function>d--effn_name</function> <emphasis role="arg">a--rguments...</emphasis></synopsis>
<blockquote><para>d&#8211;effn
</para></blockquote>
-<synopsis><indexterm role="fn"><primary>de--ffn_name</primary></indexterm><phrase role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> <function>de--ffn_name</function> <replaceable>ar--guments</replaceable> <replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
-</replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable> <replaceable>so</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>de--ffn_name</primary></indexterm><phrase role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> <function>de--ffn_name</function> <emphasis role="arg">ar--guments</emphasis> <emphasis role="arg">more</emphasis> <emphasis role="arg">args</emphasis> <emphasis role="arg">
+</emphasis> <emphasis role="arg">even</emphasis> <emphasis role="arg">more</emphasis> <emphasis role="arg">so</emphasis></synopsis>
<blockquote><para>def&#8211;fn
</para></blockquote>
-<synopsis><indexterm role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase role="category"><emphasis role="bold">fset</emphasis>:</phrase> <function><replaceable>i</replaceable></function> <replaceable>a</replaceable> <replaceable>g</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase role="category"><emphasis role="bold">cmde</emphasis>:</phrase> <function>truc</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase role="category"><emphasis role="bold">Command</emphasis>:</phrase> <function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase role="category"><emphasis role="bold">Command</emphasis>:</phrase> <function>log trap1</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase role="category"><emphasis role="bold">Command</emphasis>:</phrase> <function>log trap2</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id ule</emphasis></primary></indexterm><phrase role="category"><emphasis role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary><emphasis role="bold">id &#8216;<literal>i</literal>&#8217; ule</emphasis></primary></indexterm><phrase role="category"><emphasis role="bold">cmde2</emphasis>:</phrase> <function><emphasis role="bold">id &#8216;i&#8217; ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase role="category"><emphasis role="bold">fset</emphasis>:</phrase> <function><replaceable>i</replaceable></function> <emphasis role="arg">a</emphasis> <emphasis role="arg">g</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase role="category"><emphasis role="bold">cmde</emphasis>:</phrase> <function>truc</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase role="category"><emphasis role="bold">Command</emphasis>:</phrase> <function>log trap</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase role="category"><emphasis role="bold">Command</emphasis>:</phrase> <function>log trap1</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase role="category"><emphasis role="bold">Command</emphasis>:</phrase> <function>log trap2</function> <emphasis role="arg"></emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id ule</emphasis></primary></indexterm><phrase role="category"><emphasis role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id ule</emphasis></function> <emphasis role="arg">truc</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary><emphasis role="bold">id &#8216;<literal>i</literal>&#8217; ule</emphasis></primary></indexterm><phrase role="category"><emphasis role="bold">cmde2</emphasis>:</phrase> <function><emphasis role="bold">id &#8216;i&#8217; ule</emphasis></function> <emphasis role="arg">truc</emphasis></synopsis>
<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase role="category"><emphasis role="bold"></emphasis>:</phrase> <function>machin</function></synopsis>
<synopsis><indexterm role="fn"><primary>bidule machin</primary></indexterm><phrase role="category"><emphasis role="bold"></emphasis>:</phrase> <function>bidule machin</function></synopsis>
<synopsis><indexterm role="fn"><primary>machin</primary></indexterm><phrase role="category"><emphasis role="bold">truc</emphasis>:</phrase> <function>machin</function></synopsis>
-<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase role="category"><emphasis role="bold">truc</emphasis>:</phrase> <function>followed</function> <replaceable>by</replaceable> <replaceable>a</replaceable> <replaceable>comment</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>followed</primary></indexterm><phrase role="category"><emphasis role="bold">truc</emphasis>:</phrase> <function>followed</function> <emphasis role="arg">by</emphasis> <emphasis role="arg">a</emphasis> <emphasis role="arg">comment</emphasis></synopsis>
<!-- comment -->
-<synopsis><indexterm role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis role="bold">truc</emphasis>:</phrase> <function>after</function> <replaceable>a</replaceable> <replaceable>deff</replaceable> <replaceable>item</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>after</primary></indexterm><phrase role="category"><emphasis role="bold">truc</emphasis>:</phrase> <function>after</function> <emphasis role="arg">a</emphasis> <emphasis role="arg">deff</emphasis> <emphasis role="arg">item</emphasis></synopsis>
<!-- comment -->
-<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase role="category"><emphasis role="bold">truc</emphasis>:</phrase> <function>deffnx</function> <replaceable>before</replaceable> <replaceable>end</replaceable> <replaceable>deffn</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>deffnx</primary></indexterm><phrase role="category"><emphasis role="bold">truc</emphasis>:</phrase> <function>deffnx</function> <emphasis role="arg">before</emphasis> <emphasis role="arg">end</emphasis> <emphasis role="arg">deffn</emphasis></synopsis>
<blockquote><para>Various deff lines
</para></blockquote>';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/delcomment.pl b/macros/texinfo/texinfo/tp/t/results/coverage/delcomment.pl
index 249cab61a2..9fdae42f9b 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/delcomment.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/delcomment.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -12,152 +12,126 @@ $result_trees{'delcomment'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => '\\input texinfo
+ 'contents' => [
+ {
+ 'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
+ }
+ ],
+ 'type' => 'preamble_before_beginning'
}
],
- 'parent' => {},
- 'type' => 'preamble'
- }
- ],
- 'parent' => {},
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'args' => [
+ 'type' => 'preamble_before_setfilename'
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'delcomment.info'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'delcomment.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'delcomment.info'
- },
- 'line_nr' => {
- 'file_name' => 'delcomment.texi',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'delcomment.info'
+ },
+ 'source_info' => {
+ 'file_name' => 'delcomment.texi',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' this tests both the del comment and a file without
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'text' => ' this tests both the del comment and a file without
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' this tests both the del comment and a file without
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' this tests both the del comment and a file without
'
- ]
- },
- 'parent' => {}
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' element.
+ ]
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'text' => ' element.
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' element.
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' element.
'
- ]
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ ]
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'parent' => {},
- 'text' => '
+ 'type' => 'empty_line'
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'preamble_before_content'
+ },
{
- 'parent' => {},
- 'text' => 'This line is the only output.
+ 'contents' => [
+ {
+ 'text' => 'This line is the only output.
'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'type' => 'before_node_section'
},
{
'args' => [
{
- 'parent' => {},
'text' => '
',
'type' => 'misc_arg'
}
],
- 'cmdname' => 'bye',
- 'parent' => {}
+ 'cmdname' => 'bye'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'delcomment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'delcomment'}{'contents'}[0]{'contents'}[0];
-$result_trees{'delcomment'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'delcomment'}{'contents'}[0];
-$result_trees{'delcomment'}{'contents'}[0]{'parent'} = $result_trees{'delcomment'};
-$result_trees{'delcomment'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'delcomment'}{'contents'}[1]{'args'}[0];
-$result_trees{'delcomment'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'delcomment'}{'contents'}[1];
-$result_trees{'delcomment'}{'contents'}[1]{'parent'} = $result_trees{'delcomment'};
-$result_trees{'delcomment'}{'contents'}[2]{'parent'} = $result_trees{'delcomment'};
-$result_trees{'delcomment'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'delcomment'}{'contents'}[3];
-$result_trees{'delcomment'}{'contents'}[3]{'parent'} = $result_trees{'delcomment'};
-$result_trees{'delcomment'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'delcomment'}{'contents'}[4];
-$result_trees{'delcomment'}{'contents'}[4]{'parent'} = $result_trees{'delcomment'};
-$result_trees{'delcomment'}{'contents'}[5]{'parent'} = $result_trees{'delcomment'};
-$result_trees{'delcomment'}{'contents'}[6]{'parent'} = $result_trees{'delcomment'};
-$result_trees{'delcomment'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'delcomment'}{'contents'}[7];
-$result_trees{'delcomment'}{'contents'}[7]{'parent'} = $result_trees{'delcomment'};
-$result_trees{'delcomment'}{'contents'}[8]{'parent'} = $result_trees{'delcomment'};
-$result_trees{'delcomment'}{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'delcomment'}{'contents'}[9];
-$result_trees{'delcomment'}{'contents'}[9]{'parent'} = $result_trees{'delcomment'};
$result_texis{'delcomment'} = '\\input texinfo
@setfilename delcomment.info
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/displaymath.pl b/macros/texinfo/texinfo/tp/t/results/coverage/displaymath.pl
index b6fb854203..bf5fdf468a 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/displaymath.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/displaymath.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,627 +10,464 @@ $result_trees{'displaymath'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'Simple
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'cmdname' => 'displaymath',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => '--'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'x^i'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
- },
- {
- 'parent' => {},
- 'text' => '\\over'
- },
- {
'contents' => [
{
- 'parent' => {},
- 'text' => '\\tan y'
+ 'text' => 'Simple
+'
}
],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
- },
- {
- 'parent' => {},
- 'text' => '
-'
+ 'type' => 'paragraph'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'displaymath'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'displaymath',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'displaymath'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Math with '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '-command
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'cmdname' => 'displaymath',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'args' => [
+ 'cmdname' => 'displaymath',
+ 'contents' => [
+ {
+ 'text' => '--'
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'math code'
+ 'text' => 'x^i'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' a < b \\sum'
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ },
+ {
+ 'text' => '\\over'
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'i'
+ 'text' => '\\tan y'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'sub',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' q'
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ },
{
- 'contents' => [
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => '2'
+ 'contents' => [
+ {
+ 'text' => 'displaymath'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'displaymath'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'sup',
- 'contents' => [],
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 2,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'Math with '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => '-command
'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'displaymath'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'displaymath',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'displaymath'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Complex
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'cmdname' => 'displaymath',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => ' \\underline'
- },
- {
+ 'cmdname' => 'displaymath',
'contents' => [
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'math \\hbox'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' code '
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
+ 'text' => 'math code'
}
],
- 'parent' => {},
'type' => 'brace_command_arg'
}
],
'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' a < b \\sum'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sub',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' q'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '2'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sup',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'displaymath'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'displaymath'
},
- 'parent' => {}
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
}
],
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 7,
'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
+ }
},
{
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => '\\',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => 'i \\sum_'
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'i'
+ 'text' => 'Complex
+'
}
],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
+ 'type' => 'paragraph'
},
{
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'displaymath',
'contents' => [
{
- 'parent' => {},
- 'text' => '\\underline'
+ 'text' => ' \\underline'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'f'
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'math \\hbox'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' code '
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
}
],
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 13,
'macro' => ''
},
- 'parent' => {},
'type' => 'bracketed'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
- },
- {
- 'parent' => {},
- 'text' => '
-'
- },
- {
- 'args' => [
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '\\'
+ },
+ {
+ 'text' => 'i \\sum_'
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'displaymath'
+ 'text' => 'i'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => '\\underline'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'f'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ },
+ {
+ 'text' => '
'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'displaymath'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'displaymath'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'displaymath',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'displaymath'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 12,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'With a comment
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'cmdname' => 'displaymath',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'args' => [
+ 'contents' => [
{
- 'parent' => {},
- 'text' => ' comment in displaymath
-',
- 'type' => 'misc_arg'
+ 'text' => 'With a comment
+'
}
],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment in displaymath
-'
- ]
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => 'a/2
-'
+ 'type' => 'paragraph'
},
{
'args' => [
{
- 'contents' => [
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'displaymath',
+ 'contents' => [
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'displaymath'
+ 'text' => ' comment in displaymath
+',
+ 'type' => 'misc_arg'
}
],
+ 'cmdname' => 'c',
'extra' => {
- 'spaces_after_argument' => '
+ 'misc_args' => [
+ ' comment in displaymath
+'
+ ]
+ }
+ },
+ {
+ 'text' => 'a/2
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'displaymath'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'displaymath'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'displaymath',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'displaymath'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 20,
+ 'line_nr' => 17,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 17,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'displaymath'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[0];
-$result_trees{'displaymath'}{'contents'}[0]{'parent'} = $result_trees{'displaymath'};
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'displaymath'}{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'displaymath'}{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[1]{'contents'}[2];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'displaymath'}{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'displaymath'}{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[1]{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'displaymath'}{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'displaymath'}{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[1]{'contents'}[6]{'args'}[0];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[1]{'contents'}[6];
-$result_trees{'displaymath'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'displaymath'}{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'displaymath'}{'contents'}[1]{'contents'}[6];
-$result_trees{'displaymath'}{'contents'}[1]{'parent'} = $result_trees{'displaymath'};
-$result_trees{'displaymath'}{'contents'}[2]{'parent'} = $result_trees{'displaymath'};
-$result_trees{'displaymath'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[3];
-$result_trees{'displaymath'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'displaymath'}{'contents'}[3];
-$result_trees{'displaymath'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'displaymath'}{'contents'}[3];
-$result_trees{'displaymath'}{'contents'}[3]{'parent'} = $result_trees{'displaymath'};
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'} = $result_trees{'displaymath'}{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[4]{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'displaymath'}{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'displaymath'}{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[4]{'contents'}[3]{'args'}[0];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[4]{'contents'}[3];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'displaymath'}{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'displaymath'}{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[4]{'contents'}[5]{'args'}[0];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[4]{'contents'}[5];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[5]{'parent'} = $result_trees{'displaymath'}{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[6]{'parent'} = $result_trees{'displaymath'}{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[4]{'contents'}[7]{'args'}[0];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[4]{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[4]{'contents'}[7]{'parent'} = $result_trees{'displaymath'}{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'displaymath'}{'contents'}[4]{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[4]{'parent'} = $result_trees{'displaymath'};
-$result_trees{'displaymath'}{'contents'}[5]{'parent'} = $result_trees{'displaymath'};
-$result_trees{'displaymath'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[6];
-$result_trees{'displaymath'}{'contents'}[6]{'parent'} = $result_trees{'displaymath'};
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[0]{'extra'}{'command'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[2]{'contents'}[0];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[2];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[4]{'parent'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[5]{'parent'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[6];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[6]{'parent'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[7]{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[7]{'parent'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[8]{'parent'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[9]{'args'}[0];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[9];
-$result_trees{'displaymath'}{'contents'}[7]{'contents'}[9]{'parent'} = $result_trees{'displaymath'}{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'displaymath'}{'contents'}[7]{'contents'}[9];
-$result_trees{'displaymath'}{'contents'}[7]{'parent'} = $result_trees{'displaymath'};
-$result_trees{'displaymath'}{'contents'}[8]{'parent'} = $result_trees{'displaymath'};
-$result_trees{'displaymath'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[9];
-$result_trees{'displaymath'}{'contents'}[9]{'parent'} = $result_trees{'displaymath'};
-$result_trees{'displaymath'}{'contents'}[10]{'contents'}[0]{'extra'}{'command'} = $result_trees{'displaymath'}{'contents'}[10];
-$result_trees{'displaymath'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[10];
-$result_trees{'displaymath'}{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[10]{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'displaymath'}{'contents'}[10];
-$result_trees{'displaymath'}{'contents'}[10]{'contents'}[2]{'parent'} = $result_trees{'displaymath'}{'contents'}[10];
-$result_trees{'displaymath'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[10]{'contents'}[3]{'args'}[0];
-$result_trees{'displaymath'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'displaymath'}{'contents'}[10]{'contents'}[3];
-$result_trees{'displaymath'}{'contents'}[10]{'contents'}[3]{'parent'} = $result_trees{'displaymath'}{'contents'}[10];
-$result_trees{'displaymath'}{'contents'}[10]{'extra'}{'end_command'} = $result_trees{'displaymath'}{'contents'}[10]{'contents'}[3];
-$result_trees{'displaymath'}{'contents'}[10]{'parent'} = $result_trees{'displaymath'};
$result_texis{'displaymath'} = 'Simple
@displaymath
@@ -693,10 +530,10 @@ $result_converted{'html_text'}->{'displaymath'} = '<p>Simple
</p><div class="displaymath"><em>--{x^i}\\over{\\tan y}
</em></div>
<p>Math with @-command
-</p><div class="displaymath"><em><code>math code</code> a &lt; b \\sum<sub>i</sub> q<sup>2</sup>
+</p><div class="displaymath"><em><code class="code">math code</code> a &lt; b \\sum<sub class="sub">i</sub> q<sup class="sup">2</sup>
</em></div>
<p>Complex
-</p><div class="displaymath"><em> \\underline{<code>math \\hbox{ code }</code>} \\i \\sum_{i}{\\underline{f}}
+</p><div class="displaymath"><em> \\underline{<code class="code">math \\hbox{ code }</code>} \\i \\sum_{i}{\\underline{f}}
</em></div>
<p>With a comment
</p><div class="displaymath"><em>a/2
@@ -726,6 +563,28 @@ a/2
';
+$result_converted{'latex_text'}->{'displaymath'} = 'Simple
+\\[
+--{x^i}\\over{\\tan y}
+\\]
+
+Math with @-command
+\\[
+\\mathtt{math code} a < b \\sum_{i} q^{2}
+\\]
+
+Complex
+\\[
+ \\underline{\\mathtt{math \\hbox{ code }}} \\backslash{}i \\sum_{i}{\\underline{f}}
+\\]
+
+With a comment
+\\[
+a/2
+\\]
+';
+
+
$result_converted{'docbook'}->{'displaymath'} = '<para>Simple
</para><informalequation><mathphrase>--{x^i}\\over{\\tan y}
</mathphrase></informalequation>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/empty_w.pl b/macros/texinfo/texinfo/tp/t/results/coverage/empty_w.pl
index de3a2b38e3..943ec39a03 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/empty_w.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/empty_w.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,67 +10,53 @@ $result_trees{'empty_w'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'w',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'w',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'a b'
+ 'contents' => [
+ {
+ 'text' => 'a b'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'w',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.'
}
],
- 'cmdname' => 'w',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '.'
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'empty_w'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_w'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_w'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_w'}{'contents'}[0];
-$result_trees{'empty_w'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'empty_w'}{'contents'}[0];
-$result_trees{'empty_w'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_w'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'empty_w'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'empty_w'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_w'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'empty_w'}{'contents'}[0];
-$result_trees{'empty_w'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'empty_w'}{'contents'}[0];
-$result_trees{'empty_w'}{'contents'}[0]{'parent'} = $result_trees{'empty_w'};
$result_texis{'empty_w'} = '@w{} @w{a b}.';
@@ -94,6 +80,9 @@ $result_converted{'html_text'}->{'empty_w'} = '<p><!-- /@w --> a&nbsp;b<!-- /@w
$result_converted{'xml'}->{'empty_w'} = '<para><w></w> <w>a b</w>.</para>';
+$result_converted{'latex_text'}->{'empty_w'} = '\\hbox{} \\hbox{a b}.';
+
+
$result_converted{'docbook'}->{'empty_w'} = '<para><!-- /@w --> a b<!-- /@w -->.</para>';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl b/macros/texinfo/texinfo/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
new file mode 100644
index 0000000000..35333eaf3f
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
@@ -0,0 +1,134 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'end_bad_end_argument_and_superfluous_arg'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'In quotation
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => ': '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'in c'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => ': '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'end_bad_end_argument_and_superfluous_arg'} = '@quotation
+In quotation
+@end : @code{in c}
+';
+
+
+$result_texts{'end_bad_end_argument_and_superfluous_arg'} = 'In quotation
+';
+
+$result_errors{'end_bad_end_argument_and_superfluous_arg'} = [
+ {
+ 'error_line' => 'warning: @code should not appear in @end
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@code should not appear in @end',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'bad argument to @end: : @code{in c}
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'bad argument to @end: : @code{in c}',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'no matching `@end quotation\'
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'no matching `@end quotation\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'end_bad_end_argument_and_superfluous_arg'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/exdent_and_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage/exdent_and_commands.pl
index 11c7e186a2..7814885203 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/exdent_and_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/exdent_and_commands.pl
@@ -1,388 +1,293 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'exdent_and_commands'} = {
'contents' => [
{
- 'cmdname' => 'quotation',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'quotation1
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ 'cmdname' => 'quotation',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in exdented protected eol '
- },
- {
- 'cmdname' => '
-',
- 'parent' => {}
+ 'text' => 'quotation1
+'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
+ 'type' => 'paragraph'
+ },
{
- 'parent' => {},
- 'text' => 'following
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'in exdented protected eol '
+ },
+ {
+ 'cmdname' => '
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ }
+ ],
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'exdent',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in exdented a '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '* '
- },
- {
- 'cmdname' => '*',
- 'parent' => {}
- },
+ 'text' => 'following
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => ' and following'
+ 'contents' => [
+ {
+ 'text' => 'in exdented a '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => '* '
+ },
+ {
+ 'cmdname' => '*'
+ },
+ {
+ 'text' => ' and following'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'exdent',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ },
{
- 'parent' => {},
- 'text' => 'after exdented
+ 'contents' => [
+ {
+ 'text' => 'after exdented
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ }
+ ],
+ 'type' => 'paragraph'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'example',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'example
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'args' => [
+ 'cmdname' => 'example',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in exdented protected eol '
- },
- {
- 'cmdname' => '
-',
- 'parent' => {}
+ 'text' => 'example
+'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
+ 'type' => 'preformatted'
+ },
{
- 'parent' => {},
- 'text' => 'following
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'in exdented protected eol '
+ },
+ {
+ 'cmdname' => '
'
- }
- ],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'args' => [
+ }
+ ],
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'exdent',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in exdented a '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '* '
- },
- {
- 'cmdname' => '*',
- 'parent' => {}
- },
+ 'text' => 'following
+'
+ }
+ ],
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => ' and following'
+ 'contents' => [
+ {
+ 'text' => 'in exdented a '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => '* '
+ },
+ {
+ 'cmdname' => '*'
+ },
+ {
+ 'text' => ' and following'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'exdent',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
{
- 'parent' => {},
- 'text' => 'after exdented
+ 'contents' => [
+ {
+ 'text' => 'after exdented
'
- }
- ],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'args' => [
+ }
+ ],
+ 'type' => 'preformatted'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'example'
+ 'contents' => [
+ {
+ 'text' => 'example'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'example'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'example',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'example'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 15,
+ 'line_nr' => 9,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_commands'}{'contents'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[1];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[3];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[5];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[6];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[6];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'};
-$result_trees{'exdent_and_commands'}{'contents'}[1]{'parent'} = $result_trees{'exdent_and_commands'};
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_commands'}{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[3];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[6]{'args'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[6];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'exdent_and_commands'}{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'exdent_and_commands'}{'contents'}[2]{'contents'}[6];
-$result_trees{'exdent_and_commands'}{'contents'}[2]{'parent'} = $result_trees{'exdent_and_commands'};
$result_texis{'exdent_and_commands'} = '@quotation
quotation1
@@ -440,21 +345,21 @@ in exdented a @*
';
-$result_converted{'html_text'}->{'exdent_and_commands'} = '<blockquote>
+$result_converted{'html_text'}->{'exdent_and_commands'} = '<blockquote class="quotation">
<p>quotation1
-</p><p>in exdented protected eol &nbsp;
+</p><p class="exdent">in exdented protected eol &nbsp;
</p><p>following
-</p><p>in exdented a @* <br> and following
+</p><p class="exdent">in exdented a @* <br> and following
</p><p>after exdented
</p></blockquote>
<div class="example">
-<pre class="example">example
-</pre><pre class="example">in exdented protected eol &nbsp;
-</pre><pre class="example">following
-</pre><pre class="example">in exdented a @*
+<pre class="example-preformatted">example
+</pre><pre class="exdent">in exdented protected eol &nbsp;
+</pre><pre class="example-preformatted">following
+</pre><pre class="exdent">in exdented a @*
and following
-</pre><pre class="example">after exdented
+</pre><pre class="example-preformatted">after exdented
</pre></div>
';
@@ -475,17 +380,53 @@ $result_converted{'xml'}->{'exdent_and_commands'} = '<quotation endspaces=" ">
';
+$result_converted{'latex_text'}->{'exdent_and_commands'} = '\\begin{quote}
+quotation1
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+in exdented protected eol \\ {}
+\\\\
+following
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+in exdented a @* \\leavevmode{}\\\\ and following
+\\\\
+after exdented
+\\end{quote}
+
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily example
+\\end{Texinfopreformatted}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+in exdented protected eol \\ {}
+\\\\
+\\begin{Texinfopreformatted}%
+\\ttfamily following
+\\end{Texinfopreformatted}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+in exdented a @* \\leavevmode{}\\\\ and following
+\\\\
+\\begin{Texinfopreformatted}%
+\\ttfamily after exdented
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+';
+
+
$result_converted{'docbook'}->{'exdent_and_commands'} = '<blockquote><para>quotation1
-</para><simpara>in exdented protected eol &#160;</simpara>
+</para><simpara role="exdent">in exdented protected eol &#160;</simpara>
<para>following
-</para><simpara>in exdented a @*
+</para><simpara role="exdent">in exdented a @*
and following</simpara>
<para>after exdented
</para></blockquote>
<screen>example
-</screen><simpara>in exdented protected eol &#160;</simpara>
+</screen><simpara role="exdent">in exdented protected eol &#160;</simpara>
<screen>following
-</screen><simpara>in exdented a @*
+</screen><simpara role="exdent">in exdented a @*
and following</simpara>
<screen>after exdented
</screen>';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl b/macros/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl
index 61ff293788..b736e10237 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl
@@ -1,550 +1,364 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'exdent_and_formats'} = {
'contents' => [
{
- 'cmdname' => 'example',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'example',
'contents' => [
{
- 'parent' => {},
- 'text' => ' Example Hoho. '
+ 'contents' => [
+ {
+ 'text' => ' Example Hoho. '
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'TeX',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' . '
+ },
+ {
+ 'cmdname' => '*'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => '.
+'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'preformatted'
},
{
'args' => [
{
- 'contents' => [],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'contents' => [
+ {
+ 'text' => 'Other line'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'cmdname' => 'TeX',
- 'contents' => [],
- 'line_nr' => {
+ 'cmdname' => 'exdent',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 4,
'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' . '
+ }
},
{
- 'cmdname' => '*',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '.
-'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'args' => [
- {
'contents' => [
{
- 'parent' => {},
- 'text' => 'Other line'
+ 'text' => 'not exdented
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'not exdented
-'
- }
- ],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'args' => [
+ 'type' => 'preformatted'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'example'
+ 'contents' => [
+ {
+ 'text' => 'example'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'example'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'example',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'example'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'example',
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'exdented and dash --- in example'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 10,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
+ 'cmdname' => 'example',
'contents' => [
{
- 'parent' => {},
- 'text' => 'Not exdented
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'exdented and dash --- in example'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
- }
- ],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'args' => [
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'exdent',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'exdented'
+ 'text' => 'Not exdented
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'exdented'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'exdent',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
+ },
{
- 'parent' => {},
- 'text' => 'Not exdented
+ 'contents' => [
+ {
+ 'text' => 'Not exdented
'
- }
- ],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'args' => [
+ }
+ ],
+ 'type' => 'preformatted'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'example'
+ 'contents' => [
+ {
+ 'text' => 'example'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'example'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'example',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'example'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 9,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Para1.
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'qsddsqkdsqkkmljsqjsqodmmdsqdsmqj dqs sdq sqd sdq dsq sdq sqd sqd sdq sdq
-'
- },
- {
- 'parent' => {},
- 'text' => 'qsd dsq sdq dsq dssdq sdq sdq sdq dsq sdq dsq dsq sdq dsq sdqsd q
+ 'text' => 'Para1.
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
'args' => [
{
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'qsddsqkdsqkkmljsqjsqodmmdsqdsmqj dqs sdq sqd sdq dsq sdq sqd sqd sdq sdq
+'
+ },
+ {
+ 'text' => 'qsd dsq sdq dsq dssdq sdq sdq sdq dsq sdq dsq dsq sdq dsq sdqsd q
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 21,
+ 'line_nr' => 18,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 18,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Para2.
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Para3.
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Last para.
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation1
-'
- },
- {
- 'parent' => {},
- 'text' => 'quotation2
+ 'text' => 'Para2.
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'quotation'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 32,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 29,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation para 1
+ 'text' => 'Para3.
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -552,141 +366,258 @@ $result_trees{'exdent_and_formats'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation para 2
+ 'text' => 'Last para.
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
'args' => [
{
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'quotation1
+'
+ },
+ {
+ 'text' => 'quotation2
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 32,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 38,
+ 'line_nr' => 29,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 34,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'example',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Example Hoho.
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'cmdname' => 'example',
+ 'cmdname' => 'quotation',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
+ 'contents' => [
+ {
+ 'text' => 'quotation para 1
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'Nested Other line
+ 'text' => 'quotation para 2
'
}
],
- 'parent' => {},
- 'type' => 'preformatted'
+ 'type' => 'paragraph'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'exdented nested other line'
+ 'text' => 'quotation'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
- 'cmdname' => 'exdent',
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_before_argument' => ' '
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 44,
+ 'line_nr' => 38,
'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 34,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {}
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Example Hoho.
+'
+ }
+ ],
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Nested Other line
+'
+ }
+ ],
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'exdented nested other line'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'exdent',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 44,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'example'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'example'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 45,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 42,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
'text' => 'example'
}
],
@@ -694,1006 +625,660 @@ $result_trees{'exdent_and_formats'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'example',
'spaces_before_argument' => ' ',
'text_arg' => 'example'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 45,
+ 'line_nr' => 46,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 42,
+ 'line_nr' => 40,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'example'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'example',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'example'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 46,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 40,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'args' => [
+ 'cmdname' => 'quotation',
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'exdented quotation line and dash --- in quotation'
+ 'contents' => [
+ {
+ 'text' => 'exdented quotation line and dash --- in quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'exdent',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 49,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 49,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 50,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 48,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Not exdented followed by exdented
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ 'cmdname' => 'quotation',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'exdented quotation line'
+ 'text' => 'Not exdented followed by exdented
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'exdented quotation line'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'exdent',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 54,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 54,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 55,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 55,
+ 'line_nr' => 52,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 52,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'exdented quotation line'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 58,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
+ 'cmdname' => 'quotation',
'contents' => [
{
- 'parent' => {},
- 'text' => 'Followed by not exdented
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'exdented quotation line'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'exdent',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 58,
+ 'macro' => ''
+ }
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'Followed by not exdented
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 60,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 60,
+ 'line_nr' => 57,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 57,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 63,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'cmdname' => 'quotation',
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'azeaz az az az az'
+ 'contents' => [
+ {
+ 'text' => 'exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'exdent',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 64,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 63,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'contents' => [
+ {
+ 'text' => 'azeaz az az az az'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'exdent',
'extra' => {
- 'spaces_after_argument' => '
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 64,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 65,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 65,
+ 'line_nr' => 62,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 62,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 68,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'cmdname' => 'quotation',
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'az az az az'
+ 'contents' => [
+ {
+ 'text' => 'exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'exdent',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 69,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 68,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'contents' => [
+ {
+ 'text' => 'az az az az'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'exdent',
'extra' => {
- 'spaces_after_argument' => '
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 69,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 70,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 70,
+ 'line_nr' => 67,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 67,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'quotation line oidfjslsd aez a aze azaz aeae za eaz az zelef aaa
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ 'cmdname' => 'quotation',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'ezkfjklezf'
+ 'text' => 'quotation line oidfjslsd aez a aze azaz aeae za eaz az zelef aaa
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'ezkfjklezf'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'exdent',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 74,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 74,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 75,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 75,
+ 'line_nr' => 72,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 72,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'very loooooooooooooooooooooooooooooooooong exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 78,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'cmdname' => 'quotation',
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'az az az az'
+ 'contents' => [
+ {
+ 'text' => 'very loooooooooooooooooooooooooooooooooong exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'exdent',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'exdent',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 79,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 78,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'contents' => [
+ {
+ 'text' => 'az az az az'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'exdent',
'extra' => {
- 'spaces_after_argument' => '
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 79,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 80,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 80,
+ 'line_nr' => 77,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 77,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[4];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[4];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[3]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[4];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[5]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[5];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[3]{'contents'}[5];
-$result_trees{'exdent_and_formats'}{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[4]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[5];
-$result_trees{'exdent_and_formats'}{'contents'}[5]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[6]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[7];
-$result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[7];
-$result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[7];
-$result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[7];
-$result_trees{'exdent_and_formats'}{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[7]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[7]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[8]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[9];
-$result_trees{'exdent_and_formats'}{'contents'}[9]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[10]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[11];
-$result_trees{'exdent_and_formats'}{'contents'}[11]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[12]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[13];
-$result_trees{'exdent_and_formats'}{'contents'}[13]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[14]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[15];
-$result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[15];
-$result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[15];
-$result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[15];
-$result_trees{'exdent_and_formats'}{'contents'}[15]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[15]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[15]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[16]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[17];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[17];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[17];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[17];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[17];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[4]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[4];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[4]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[17];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[17]{'contents'}[4];
-$result_trees{'exdent_and_formats'}{'contents'}[17]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[18]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[19];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[3]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[19];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[19]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[19]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[20]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[21];
-$result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[21];
-$result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[1]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[21];
-$result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[21];
-$result_trees{'exdent_and_formats'}{'contents'}[21]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[21]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[21]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[22]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[23];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[23];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[23];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[23];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[3]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[23];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[23]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[23]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[24]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[25];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[25];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[1]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[25];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[25];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[3]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[25];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[25]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[25]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[26]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[27];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[27];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[1]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[27];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[27];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[3]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[27];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[27]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[27]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[28]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[29];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[29];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[1]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[29];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[29];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[3]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[29];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[29]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[29]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[30]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[31];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[31];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[31];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[31];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[3]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[31];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[31]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[31]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[32]{'parent'} = $result_trees{'exdent_and_formats'};
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[0]{'extra'}{'command'} = $result_trees{'exdent_and_formats'}{'contents'}[33];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[33];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[1]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[1]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[33];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[2]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[2];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[2]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[33];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[3]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[3]{'parent'} = $result_trees{'exdent_and_formats'}{'contents'}[33];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'extra'}{'end_command'} = $result_trees{'exdent_and_formats'}{'contents'}[33]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[33]{'parent'} = $result_trees{'exdent_and_formats'};
$result_texis{'exdent_and_formats'} = '@example
Example Hoho. @TeX{} . @* @@.
@@ -1873,7 +1458,7 @@ exdented
Nested Other line
exdented nested other line
-exdented quotation line and dash -- in quotation
+exdented quotation line and dash — in quotation
Not exdented followed by exdented
exdented quotation line
@@ -1896,24 +1481,24 @@ az az az az
$result_converted{'html_text'}->{'exdent_and_formats'} = '<div class="example">
-<pre class="example"> Example Hoho. TeX .
+<pre class="example-preformatted"> Example Hoho. TeX .
@.
-</pre><pre class="example">Other line
-</pre><pre class="example">not exdented
+</pre><pre class="exdent">Other line
+</pre><pre class="example-preformatted">not exdented
</pre></div>
<div class="example">
-<pre class="example">exdented and dash --- in example
-</pre><pre class="example">Not exdented
-</pre><pre class="example">exdented
-</pre><pre class="example">Not exdented
+<pre class="exdent">exdented and dash --- in example
+</pre><pre class="example-preformatted">Not exdented
+</pre><pre class="exdent">exdented
+</pre><pre class="example-preformatted">Not exdented
</pre></div>
<p>Para1.
</p>
-<blockquote>
+<blockquote class="quotation">
<p>qsddsqkdsqkkmljsqjsqodmmdsqdsmqj dqs sdq sqd sdq dsq sdq sqd sqd sdq sdq
qsd dsq sdq dsq dssdq sdq sdq sdq dsq sdq dsq dsq sdq dsq sdqsd q
</p></blockquote>
@@ -1924,57 +1509,57 @@ qsd dsq sdq dsq dssdq sdq sdq sdq dsq sdq dsq dsq sdq dsq sdqsd q
</p>
<p>Last para.
</p>
-<blockquote>
+<blockquote class="quotation">
<p>quotation1
quotation2
</p></blockquote>
-<blockquote>
+<blockquote class="quotation">
<p>quotation para 1
</p>
<p>quotation para 2
</p></blockquote>
<div class="example">
-<pre class="example">Example Hoho.
+<pre class="example-preformatted">Example Hoho.
</pre><div class="example">
-<pre class="example">Nested Other line
-</pre><pre class="example">exdented nested other line
+<pre class="example-preformatted">Nested Other line
+</pre><pre class="exdent">exdented nested other line
</pre></div>
</div>
-<blockquote>
-<p>exdented quotation line and dash &mdash; in quotation
+<blockquote class="quotation">
+<p class="exdent">exdented quotation line and dash &mdash; in quotation
</p></blockquote>
-<blockquote>
+<blockquote class="quotation">
<p>Not exdented followed by exdented
-</p><p>exdented quotation line
+</p><p class="exdent">exdented quotation line
</p></blockquote>
-<blockquote>
-<p>exdented quotation line
+<blockquote class="quotation">
+<p class="exdent">exdented quotation line
</p><p>Followed by not exdented
</p></blockquote>
-<blockquote>
-<p>exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az
-</p><p>azeaz az az az az
+<blockquote class="quotation">
+<p class="exdent">exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az
+</p><p class="exdent">azeaz az az az az
</p></blockquote>
-<blockquote>
-<p>exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line
-</p><p>az az az az
+<blockquote class="quotation">
+<p class="exdent">exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line
+</p><p class="exdent">az az az az
</p></blockquote>
-<blockquote>
+<blockquote class="quotation">
<p>quotation line oidfjslsd aez a aze azaz aeae za eaz az zelef aaa
-</p><p>ezkfjklezf
+</p><p class="exdent">ezkfjklezf
</p></blockquote>
-<blockquote>
-<p>very loooooooooooooooooooooooooooooooooong exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line
-</p><p>az az az az
+<blockquote class="quotation">
+<p class="exdent">very loooooooooooooooooooooooooooooooooong exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line
+</p><p class="exdent">az az az az
</p></blockquote>
';
@@ -2062,16 +1647,153 @@ quotation2
';
+$result_converted{'latex_text'}->{'exdent_and_formats'} = '\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily \\ Example Hoho.\\ \\TeX{}\\ .\\ \\leavevmode{}\\\\\\ @.
+
+\\end{Texinfopreformatted}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+Other line
+\\\\
+\\begin{Texinfopreformatted}%
+\\ttfamily not exdented
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+
+
+\\begin{Texinfoindented}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+exdented and dash --- in example
+\\\\
+\\begin{Texinfopreformatted}%
+\\ttfamily Not exdented
+\\end{Texinfopreformatted}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+exdented
+\\\\
+\\begin{Texinfopreformatted}%
+\\ttfamily Not exdented
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+
+Para1.
+
+\\begin{quote}
+qsddsqkdsqkkmljsqjsqodmmdsqdsmqj dqs sdq sqd sdq dsq sdq sqd sqd sdq sdq
+qsd dsq sdq dsq dssdq sdq sdq sdq dsq sdq dsq dsq sdq dsq sdqsd q
+\\end{quote}
+
+Para2.
+
+Para3.
+
+Last para.
+
+\\begin{quote}
+quotation1
+quotation2
+\\end{quote}
+
+\\begin{quote}
+quotation para 1
+
+quotation para 2
+\\end{quote}
+
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily Example Hoho.
+\\end{Texinfopreformatted}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily Nested Other line
+\\end{Texinfopreformatted}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+exdented nested other line
+\\\\
+\\end{Texinfoindented}
+\\end{Texinfoindented}
+
+\\begin{quote}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+exdented quotation line and dash --- in quotation
+\\\\
+\\end{quote}
+
+\\begin{quote}
+Not exdented followed by exdented
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+exdented quotation line
+\\\\
+\\end{quote}
+
+\\begin{quote}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+exdented quotation line
+\\\\
+Followed by not exdented
+\\end{quote}
+
+\\begin{quote}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az
+\\\\
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+azeaz az az az az
+\\\\
+\\end{quote}
+
+\\begin{quote}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line
+\\\\
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+az az az az
+\\\\
+\\end{quote}
+
+\\begin{quote}
+quotation line oidfjslsd aez a aze azaz aeae za eaz az zelef aaa
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+ezkfjklezf
+\\\\
+\\end{quote}
+
+\\begin{quote}
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+very loooooooooooooooooooooooooooooooooong exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line
+\\\\
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+az az az az
+\\\\
+\\end{quote}
+';
+
+
$result_converted{'docbook'}->{'exdent_and_formats'} = '<screen> Example Hoho. &tex; .
@.
-</screen><simpara>Other line</simpara>
+</screen><simpara role="exdent">Other line</simpara>
<screen>not exdented
</screen>
-<simpara>exdented and dash --- in example</simpara>
+<simpara role="exdent">exdented and dash --- in example</simpara>
<screen>Not exdented
-</screen><simpara>exdented</simpara>
+</screen><simpara role="exdent">exdented</simpara>
<screen>Not exdented
</screen>
<para>Para1.
@@ -2094,27 +1816,27 @@ quotation2
</para></blockquote>
<screen>Example Hoho.
</screen><screen>Nested Other line
-</screen><simpara>exdented nested other line</simpara>
+</screen><simpara role="exdent">exdented nested other line</simpara>
-<blockquote><simpara>exdented quotation line and dash &#8212; in quotation</simpara>
+<blockquote><simpara role="exdent">exdented quotation line and dash &#8212; in quotation</simpara>
</blockquote>
<blockquote><para>Not exdented followed by exdented
-</para><simpara>exdented quotation line</simpara>
+</para><simpara role="exdent">exdented quotation line</simpara>
</blockquote>
-<blockquote><simpara>exdented quotation line</simpara>
+<blockquote><simpara role="exdent">exdented quotation line</simpara>
<para>Followed by not exdented
</para></blockquote>
-<blockquote><simpara>exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az</simpara>
-<simpara>azeaz az az az az</simpara>
+<blockquote><simpara role="exdent">exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az</simpara>
+<simpara role="exdent">azeaz az az az az</simpara>
</blockquote>
-<blockquote><simpara>exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line</simpara>
-<simpara>az az az az</simpara>
+<blockquote><simpara role="exdent">exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line</simpara>
+<simpara role="exdent">az az az az</simpara>
</blockquote>
<blockquote><para>quotation line oidfjslsd aez a aze azaz aeae za eaz az zelef aaa
-</para><simpara>ezkfjklezf</simpara>
+</para><simpara role="exdent">ezkfjklezf</simpara>
</blockquote>
-<blockquote><simpara>very loooooooooooooooooooooooooooooooooong exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line</simpara>
-<simpara>az az az az</simpara>
+<blockquote><simpara role="exdent">very loooooooooooooooooooooooooooooooooong exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line</simpara>
+<simpara role="exdent">az az az az</simpara>
</blockquote>';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright.pl b/macros/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright.pl
index ea7156c1c7..31cd9e790a 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright.pl
@@ -1,239 +1,182 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'flushleft_flushright'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'flushleft',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'flushleft',
'contents' => [
{
- 'parent' => {},
- 'text' => 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
+ 'contents' => [
+ {
+ 'text' => 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
'
+ },
+ {
+ 'text' => 'ldskf dsflj
+'
+ },
+ {
+ 'text' => ' lklsdlv l lll. Bbb.
+'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
- 'text' => 'ldskf dsflj
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'lhds
'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
- 'text' => ' lklsdlv l lll. Bbb.
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'flushleft'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'flushleft'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'lhds
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'flushleft'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'flushleft',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'flushleft'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'flushright',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
+ 'cmdname' => 'flushright',
'contents' => [
{
- 'parent' => {},
- 'text' => 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
+ 'contents' => [
+ {
+ 'text' => 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
'
- },
- {
- 'parent' => {},
- 'text' => 'ldskf dsflj
+ },
+ {
+ 'text' => 'ldskf dsflj
+'
+ },
+ {
+ 'text' => ' lklsdlv l lll. Bbb.
'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
- 'text' => ' lklsdlv l lll. Bbb.
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'parent' => {},
- 'text' => 'lhds
+ 'contents' => [
+ {
+ 'text' => 'lhds
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ }
+ ],
+ 'type' => 'paragraph'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'flushright'
+ 'contents' => [
+ {
+ 'text' => 'flushright'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'flushright'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'flushright',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'flushright'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 10,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 10,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'flushleft_flushright'}{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright'};
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'flushleft_flushright'}{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[3];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[4];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'flushleft_flushright'}{'contents'}[1]{'contents'}[4];
-$result_trees{'flushleft_flushright'}{'contents'}[1]{'parent'} = $result_trees{'flushleft_flushright'};
-$result_trees{'flushleft_flushright'}{'contents'}[2]{'parent'} = $result_trees{'flushleft_flushright'};
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'flushleft_flushright'}{'contents'}[3];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[3];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[4];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'flushleft_flushright'}{'contents'}[3];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'flushleft_flushright'}{'contents'}[3]{'contents'}[4];
-$result_trees{'flushleft_flushright'}{'contents'}[3]{'parent'} = $result_trees{'flushleft_flushright'};
$result_texis{'flushleft_flushright'} = '
@flushleft
@@ -290,18 +233,18 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbb
$result_converted{'html_text'}->{'flushleft_flushright'} = '
-<p align="left">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
+<div class="flushleft"><p class="flushleft-paragraph">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
ldskf dsflj
lklsdlv l lll. Bbb.
</p>
-<p align="left">lhds
-</p>
-<p align="right">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
+<p class="flushleft-paragraph">lhds
+</p></div>
+<div class="flushright"><p class="flushright-paragraph">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
ldskf dsflj
lklsdlv l lll. Bbb.
</p>
-<p align="right">lhds
-</p>';
+<p class="flushright-paragraph">lhds
+</p></div>';
$result_converted{'xml'}->{'flushleft_flushright'} = '
@@ -323,6 +266,29 @@ ldskf dsflj
';
+$result_converted{'latex_text'}->{'flushleft_flushright'} = '
+\\begin{flushleft}
+\\begin{Texinfopreformatted}%
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
+ldskf dsflj
+ lklsdlv l lll. Bbb.
+
+lhds
+\\end{Texinfopreformatted}
+\\end{flushleft}
+
+\\begin{flushright}
+\\begin{Texinfopreformatted}%
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
+ldskf dsflj
+ lklsdlv l lll. Bbb.
+
+lhds
+\\end{Texinfopreformatted}
+\\end{flushright}
+';
+
+
$result_converted{'docbook'}->{'flushleft_flushright'} = '
<para>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
ldskf dsflj
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl b/macros/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
index 6dd4857d02..f8d133a9c4 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
@@ -1,247 +1,191 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'flushleft_flushright_in_quotation'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'cmdname' => 'flushleft',
- 'contents' => [
+ 'args' => [
{
'extra' => {
- 'command' => {}
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
- },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'f l
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ 'cmdname' => 'flushleft',
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'spaces_before_paragraph'
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'flushleft'
+ 'text' => 'f l
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'flushleft'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'flushleft'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'flushleft',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'flushleft'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'flushright',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
+ 'type' => 'empty_line'
},
{
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'flushright',
'contents' => [
{
- 'parent' => {},
- 'text' => 'f r
+ 'text' => ' ',
+ 'type' => 'spaces_before_paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'f r
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'flushright'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'flushright'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'flushright'
+ 'text' => 'quotation'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'flushright',
'spaces_before_argument' => ' ',
- 'text_arg' => 'flushright'
+ 'text_arg' => 'quotation'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 2,
'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'quotation'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 10,
- 'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'};
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[2];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[4];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'contents'}[4];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[1]{'parent'} = $result_trees{'flushleft_flushright_in_quotation'};
$result_texis{'flushleft_flushright_in_quotation'} = '
@quotation
@@ -276,11 +220,11 @@ $result_converted{'plaintext'}->{'flushleft_flushright_in_quotation'} = ' f
$result_converted{'html_text'}->{'flushleft_flushright_in_quotation'} = '
-<blockquote>
-<p align="left">f l
-</p>
-<p align="right">f r
-</p></blockquote>
+<blockquote class="quotation">
+<div class="flushleft"><p class="flushleft-paragraph">f l
+</p></div>
+<div class="flushright"><p class="flushright-paragraph">f r
+</p></div></blockquote>
';
@@ -297,6 +241,23 @@ $result_converted{'xml'}->{'flushleft_flushright_in_quotation'} = '
';
+$result_converted{'latex_text'}->{'flushleft_flushright_in_quotation'} = '
+\\begin{quote}
+\\begin{flushleft}
+\\begin{Texinfopreformatted}%
+ f l
+\\end{Texinfopreformatted}
+\\end{flushleft}
+
+\\begin{flushright}
+\\begin{Texinfopreformatted}%
+ f r
+\\end{Texinfopreformatted}
+\\end{flushright}
+\\end{quote}
+';
+
+
$result_converted{'docbook'}->{'flushleft_flushright_in_quotation'} = '
<blockquote><para>f l
</para>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/flushright_example_nested.pl b/macros/texinfo/texinfo/tp/t/results/coverage/flushright_example_nested.pl
index e0bedd785a..8fcd1be720 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/flushright_example_nested.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/flushright_example_nested.pl
@@ -1,308 +1,237 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'flushright_example_nested'} = {
'contents' => [
{
- 'cmdname' => 'example',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'cmdname' => 'flushright',
- 'contents' => [
+ 'args' => [
{
'extra' => {
- 'command' => {}
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'example',
+ 'contents' => [
{
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'flushright',
'contents' => [
{
- 'parent' => {},
- 'text' => 'in --- flushright
+ 'contents' => [
+ {
+ 'text' => 'in --- flushright
'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'preformatted'
},
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'flushright'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'flushright'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'preformatted'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'flushright'
+ 'text' => 'example'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'flushright',
'spaces_before_argument' => ' ',
- 'text_arg' => 'flushright'
+ 'text_arg' => 'example'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 6,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'example'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'example',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'example'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'flushright',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'cmdname' => 'example',
+ 'cmdname' => 'flushright',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'in --- example
+ 'extra' => {
+ 'spaces_after_argument' => '
'
- },
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'example',
+ 'contents' => [
{
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'in --- example
+'
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'empty_line'
+ },
+ {
+ 'text' => 'flush then example
+'
+ }
+ ],
+ 'type' => 'preformatted'
},
{
- 'parent' => {},
- 'text' => 'flush then example
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'example'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'example'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'preformatted'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'example'
+ 'text' => 'flushright'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'example',
'spaces_before_argument' => ' ',
- 'text_arg' => 'example'
+ 'text_arg' => 'flushright'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 14,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'flushright'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'flushright',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'flushright'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 14,
- 'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'flushright_example_nested'}{'contents'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'};
-$result_trees{'flushright_example_nested'}{'contents'}[1]{'parent'} = $result_trees{'flushright_example_nested'};
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'flushright_example_nested'}{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'flushright_example_nested'}{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'flushright_example_nested'}{'contents'}[2]{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[2]{'parent'} = $result_trees{'flushright_example_nested'};
$result_texis{'flushright_example_nested'} = '@example
@flushright
@@ -346,16 +275,16 @@ $result_converted{'plaintext'}->{'flushright_example_nested'} = '
$result_converted{'html_text'}->{'flushright_example_nested'} = '<div class="example">
-<pre class="example">in --- flushright
+<div class="flushright"><pre class="example-preformatted">in --- flushright
-</pre></div>
+</pre></div></div>
-<div class="example">
-<pre class="example">in --- example
+<div class="flushright"><div class="example">
+<pre class="example-preformatted">in --- example
flush then example
</pre></div>
-';
+</div>';
$result_converted{'xml'}->{'flushright_example_nested'} = '<example endspaces=" ">
@@ -375,6 +304,31 @@ flush then example
';
+$result_converted{'latex_text'}->{'flushright_example_nested'} = '\\begin{Texinfoindented}
+\\begin{flushright}
+\\begin{Texinfopreformatted}%
+\\begin{Texinfopreformatted}%
+\\ttfamily in {-}{-}{-} flushright
+
+\\end{Texinfopreformatted}
+\\end{Texinfopreformatted}
+\\end{flushright}
+\\end{Texinfoindented}
+
+\\begin{flushright}
+\\begin{Texinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily in {-}{-}{-} example
+
+flush then example
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+\\end{Texinfopreformatted}
+\\end{flushright}
+';
+
+
$result_converted{'docbook'}->{'flushright_example_nested'} = '<screen>in --- flushright
</screen>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/flushright_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage/flushright_not_closed.pl
index a08ea67f07..653792673d 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/flushright_not_closed.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/flushright_not_closed.pl
@@ -1,58 +1,53 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'flushright_not_closed'} = {
'contents' => [
{
- 'cmdname' => 'flushright',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'flushright',
'contents' => [
{
- 'parent' => {},
- 'text' => 'text flushed right
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'text flushed right
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
}
],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'flushright_not_closed'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'flushright_not_closed'}{'contents'}[0];
-$result_trees{'flushright_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushright_not_closed'}{'contents'}[0];
-$result_trees{'flushright_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'flushright_not_closed'}{'contents'}[0];
-$result_trees{'flushright_not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'flushright_not_closed'}{'contents'}[0]{'contents'}[2];
-$result_trees{'flushright_not_closed'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'flushright_not_closed'}{'contents'}[0];
-$result_trees{'flushright_not_closed'}{'contents'}[0]{'parent'} = $result_trees{'flushright_not_closed'};
$result_texis{'flushright_not_closed'} = '@flushright
@@ -66,7 +61,7 @@ text flushed right
$result_errors{'flushright_not_closed'} = [
{
- 'error_line' => ':3: no matching `@end flushright\'
+ 'error_line' => 'no matching `@end flushright\'
',
'file_name' => '',
'line_nr' => 3,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/formats_only_title_comments.pl b/macros/texinfo/texinfo/tp/t/results/coverage/formats_only_title_comments.pl
index c9311e95cf..e429a6aeec 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/formats_only_title_comments.pl
@@ -1,645 +1,507 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'formats_only_title_comments'} = {
'contents' => [
{
- 'args' => [
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument_inserted'
- }
- ],
- 'cmdname' => 'itemize',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'parent' => {},
- 'text' => ' comment itemize
-',
- 'type' => 'misc_arg'
+ 'cmdname' => 'bullet',
+ 'type' => 'command_as_argument_inserted'
}
],
- 'cmdname' => 'c',
'extra' => {
- 'misc_args' => [
- ' comment itemize
+ 'spaces_after_argument' => '
'
- ]
},
- 'parent' => {}
- },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first itemize
+ 'args' => [
+ {
+ 'text' => ' comment itemize
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment itemize
+'
+ ]
+ }
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'before first itemize
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'args' => [
+ 'type' => 'before_item'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'itemize'
+ 'contents' => [
+ {
+ 'text' => 'itemize'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'itemize'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'itemize',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'itemize'
+ 'command_as_argument' => {}
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ }
+ },
{
- 'contents' => [],
- 'extra' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' comment on enumerate line
+ 'text' => '
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
'extra' => {
- 'misc_args' => [
- ' comment on enumerate line
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment on enumerate line
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment on enumerate line
'
- ]
+ ]
+ }
+ }
},
- 'parent' => {}
+ 'type' => 'block_line_arg'
}
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
- {
+ ],
+ 'cmdname' => 'enumerate',
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'parent' => {},
- 'text' => ' comment enumerate
+ 'args' => [
+ {
+ 'text' => ' comment enumerate
',
- 'type' => 'misc_arg'
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment enumerate
+'
+ ]
+ }
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'before first enumerate
+'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment enumerate
-'
- ]
- },
- 'parent' => {}
+ 'type' => 'before_item'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'before first enumerate
+ 'contents' => [
+ {
+ 'text' => 'enumerate'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'enumerate'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'before_item'
+ 'extra' => {
+ 'enumerate_specification' => '1',
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'enumerate'
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'enumerate',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'enumerate'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {},
- 'enumerate_specification' => '1',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'cmdname' => 'emph',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'command_as_argument'
+ 'type' => 'block_line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
- {
+ 'cmdname' => 'table',
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'parent' => {},
- 'text' => ' comment table
+ 'args' => [
+ {
+ 'text' => ' comment table
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment table
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment table
'
- ]
- },
- 'parent' => {}
- },
- {
- 'contents' => [
+ ]
+ }
+ },
{
- 'parent' => {},
- 'text' => 'before first table
+ 'contents' => [
+ {
+ 'text' => 'before first table
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'args' => [
+ 'type' => 'before_item'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'table'
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'table'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'table',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'table'
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 11,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'cmdname' => 'asis',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 16,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
- ],
- 'extra' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'parent' => {},
- 'text' => ' comment on vtable line
-',
- 'type' => 'misc_arg'
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
- 'cmdname' => 'c',
'extra' => {
- 'misc_args' => [
- ' comment on vtable line
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment on vtable line
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment on vtable line
'
- ]
+ ]
+ }
+ },
+ 'spaces_after_argument' => ' '
},
- 'parent' => {}
- },
- 'spaces_after_argument' => ' '
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
- {
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'vtable',
'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first vtable
+ 'contents' => [
+ {
+ 'text' => 'before first vtable
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'args' => [
+ 'type' => 'before_item'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'vtable'
+ 'contents' => [
+ {
+ 'text' => 'vtable'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'vtable'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'vtable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'vtable'
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 16,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 16,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '0.5 0.5'
+ 'contents' => [
+ {
+ 'text' => '0.5 0.5'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'misc_args' => [
+ '0.5',
+ '0.5'
+ ],
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.5',
- '0.5'
- ],
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 20,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
- {
+ 'cmdname' => 'multitable',
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'parent' => {},
- 'text' => ' comment multitable
+ 'args' => [
+ {
+ 'text' => ' comment multitable
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment multitable
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment multitable
'
- ]
- },
- 'parent' => {}
- },
- {
- 'contents' => [
+ ]
+ }
+ },
{
- 'parent' => {},
- 'text' => 'before first multitable
+ 'contents' => [
+ {
+ 'text' => 'before first multitable
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'args' => [
+ 'type' => 'before_item'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'multitable'
+ 'contents' => [
+ {
+ 'text' => 'multitable'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'multitable'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'multitable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'multitable'
+ 'columnfractions' => {},
+ 'max_columns' => 2,
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 23,
+ 'line_nr' => 20,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'columnfractions' => {},
- 'end_command' => {},
- 'max_columns' => 2,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 20,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'formats_only_title_comments'}{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'};
-$result_trees{'formats_only_title_comments'}{'contents'}[1]{'parent'} = $result_trees{'formats_only_title_comments'};
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[2];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'parent'} = $result_trees{'formats_only_title_comments'};
-$result_trees{'formats_only_title_comments'}{'contents'}[3]{'parent'} = $result_trees{'formats_only_title_comments'};
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[4];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[4];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[4];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[4]{'parent'} = $result_trees{'formats_only_title_comments'};
-$result_trees{'formats_only_title_comments'}{'contents'}[5]{'parent'} = $result_trees{'formats_only_title_comments'};
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'extra'}{'comment_at_end'};
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[6];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[6];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[6];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'parent'} = $result_trees{'formats_only_title_comments'};
-$result_trees{'formats_only_title_comments'}{'contents'}[7]{'parent'} = $result_trees{'formats_only_title_comments'};
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'formats_only_title_comments'}{'contents'}[8];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'extra'}{'columnfractions'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'formats_only_title_comments'}{'contents'}[8]{'contents'}[1];
-$result_trees{'formats_only_title_comments'}{'contents'}[8]{'parent'} = $result_trees{'formats_only_title_comments'};
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'} = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
$result_texis{'formats_only_title_comments'} = '@itemize
@c comment itemize
@@ -680,7 +542,7 @@ before first multitable
$result_errors{'formats_only_title_comments'} = [
{
- 'error_line' => ':1: warning: @itemize has text but no @item
+ 'error_line' => 'warning: @itemize has text but no @item
',
'file_name' => '',
'line_nr' => 1,
@@ -689,7 +551,7 @@ $result_errors{'formats_only_title_comments'} = [
'type' => 'warning'
},
{
- 'error_line' => ':6: warning: @enumerate has text but no @item
+ 'error_line' => 'warning: @enumerate has text but no @item
',
'file_name' => '',
'line_nr' => 6,
@@ -698,7 +560,7 @@ $result_errors{'formats_only_title_comments'} = [
'type' => 'warning'
},
{
- 'error_line' => ':11: warning: @table has text but no @item
+ 'error_line' => 'warning: @table has text but no @item
',
'file_name' => '',
'line_nr' => 11,
@@ -707,7 +569,7 @@ $result_errors{'formats_only_title_comments'} = [
'type' => 'warning'
},
{
- 'error_line' => ':16: warning: @vtable has text but no @item
+ 'error_line' => 'warning: @vtable has text but no @item
',
'file_name' => '',
'line_nr' => 16,
@@ -716,7 +578,7 @@ $result_errors{'formats_only_title_comments'} = [
'type' => 'warning'
},
{
- 'error_line' => ':20: warning: @multitable has text but no @item
+ 'error_line' => 'warning: @multitable has text but no @item
',
'file_name' => '',
'line_nr' => 20,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/formats_only_titles.pl b/macros/texinfo/texinfo/tp/t/results/coverage/formats_only_titles.pl
index 8147816fc8..b187399110 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/formats_only_titles.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/formats_only_titles.pl
@@ -1,526 +1,413 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'formats_only_titles'} = {
'contents' => [
{
- 'args' => [
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument_inserted'
- }
- ],
- 'cmdname' => 'itemize',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'before first itemize
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'itemize'
+ 'cmdname' => 'bullet',
+ 'type' => 'command_as_argument_inserted'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'itemize',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'itemize'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'enumerate',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
+ 'cmdname' => 'itemize',
'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first enumerate
+ 'contents' => [
+ {
+ 'text' => 'before first itemize
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'args' => [
+ 'type' => 'before_item'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'enumerate'
+ 'contents' => [
+ {
+ 'text' => 'itemize'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'itemize'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'enumerate',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'enumerate'
+ 'command_as_argument' => {}
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {},
- 'enumerate_specification' => '1'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'cmdname' => 'emph',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {},
- 'type' => 'command_as_argument'
+ 'type' => 'block_line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
- {
+ 'cmdname' => 'enumerate',
'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first table
+ 'contents' => [
+ {
+ 'text' => 'before first enumerate
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'args' => [
+ 'type' => 'before_item'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'table'
+ 'contents' => [
+ {
+ 'text' => 'enumerate'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'enumerate'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'table',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'table'
+ 'enumerate_specification' => '1'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 5,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'cmdname' => 'asis',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {},
- 'type' => 'command_as_argument'
+ 'type' => 'block_line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
- {
+ 'cmdname' => 'table',
'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first vtable
+ 'contents' => [
+ {
+ 'text' => 'before first table
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'table'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'before_item'
+ 'extra' => {
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'vtable'
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'vtable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'vtable'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 15,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
+ 'cmdname' => 'vtable',
'contents' => [
{
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'before first vtable
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'before_item'
+ },
+ {
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => '0.5 0.5'
+ 'text' => 'vtable'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
- 'cmdname' => 'columnfractions',
+ 'cmdname' => 'end',
'extra' => {
- 'misc_args' => [
- '0.5',
- '0.5'
- ],
- 'spaces_before_argument' => ' '
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'vtable'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'extra' => {
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first multitable
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '0.5 0.5'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.5',
+ '0.5'
+ ],
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'multitable'
+ 'contents' => [
+ {
+ 'text' => 'before first multitable
+'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'before_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'multitable'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'multitable'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'multitable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'multitable'
+ 'columnfractions' => {},
+ 'max_columns' => 2,
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'columnfractions' => {},
- 'end_command' => {},
- 'max_columns' => 2,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 17,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'formats_only_titles'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'formats_only_titles'}{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_titles'}{'contents'}[0]{'args'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'};
-$result_trees{'formats_only_titles'}{'contents'}[1]{'parent'} = $result_trees{'formats_only_titles'};
-$result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'formats_only_titles'}{'contents'}[2];
-$result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[2];
-$result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[1];
-$result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[2];
-$result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[2];
-$result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[2];
-$result_trees{'formats_only_titles'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'formats_only_titles'}{'contents'}[2]{'contents'}[2];
-$result_trees{'formats_only_titles'}{'contents'}[2]{'parent'} = $result_trees{'formats_only_titles'};
-$result_trees{'formats_only_titles'}{'contents'}[3]{'parent'} = $result_trees{'formats_only_titles'};
-$result_trees{'formats_only_titles'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[4]{'args'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[4];
-$result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[4];
-$result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[1];
-$result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[4];
-$result_trees{'formats_only_titles'}{'contents'}[4]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_titles'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[1];
-$result_trees{'formats_only_titles'}{'contents'}[4]{'parent'} = $result_trees{'formats_only_titles'};
-$result_trees{'formats_only_titles'}{'contents'}[5]{'parent'} = $result_trees{'formats_only_titles'};
-$result_trees{'formats_only_titles'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[6]{'args'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[6];
-$result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[6];
-$result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[1]{'args'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[1];
-$result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[6];
-$result_trees{'formats_only_titles'}{'contents'}[6]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_titles'}{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[1];
-$result_trees{'formats_only_titles'}{'contents'}[6]{'parent'} = $result_trees{'formats_only_titles'};
-$result_trees{'formats_only_titles'}{'contents'}[7]{'parent'} = $result_trees{'formats_only_titles'};
-$result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[8];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[8];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1]{'args'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'formats_only_titles'}{'contents'}[8];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'extra'}{'columnfractions'} = $result_trees{'formats_only_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'formats_only_titles'}{'contents'}[8]{'contents'}[1];
-$result_trees{'formats_only_titles'}{'contents'}[8]{'parent'} = $result_trees{'formats_only_titles'};
+$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'} = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'} = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
$result_texis{'formats_only_titles'} = '@itemize
before first itemize
@@ -557,7 +444,7 @@ before first multitable
$result_errors{'formats_only_titles'} = [
{
- 'error_line' => ':1: warning: @itemize has text but no @item
+ 'error_line' => 'warning: @itemize has text but no @item
',
'file_name' => '',
'line_nr' => 1,
@@ -566,7 +453,7 @@ $result_errors{'formats_only_titles'} = [
'type' => 'warning'
},
{
- 'error_line' => ':5: warning: @enumerate has text but no @item
+ 'error_line' => 'warning: @enumerate has text but no @item
',
'file_name' => '',
'line_nr' => 5,
@@ -575,7 +462,7 @@ $result_errors{'formats_only_titles'} = [
'type' => 'warning'
},
{
- 'error_line' => ':9: warning: @table has text but no @item
+ 'error_line' => 'warning: @table has text but no @item
',
'file_name' => '',
'line_nr' => 9,
@@ -584,7 +471,7 @@ $result_errors{'formats_only_titles'} = [
'type' => 'warning'
},
{
- 'error_line' => ':13: warning: @vtable has text but no @item
+ 'error_line' => 'warning: @vtable has text but no @item
',
'file_name' => '',
'line_nr' => 13,
@@ -593,7 +480,7 @@ $result_errors{'formats_only_titles'} = [
'type' => 'warning'
},
{
- 'error_line' => ':17: warning: @multitable has text but no @item
+ 'error_line' => 'warning: @multitable has text but no @item
',
'file_name' => '',
'line_nr' => 17,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/formats_titles.pl b/macros/texinfo/texinfo/tp/t/results/coverage/formats_titles.pl
index 774e7c2143..0e01e7b675 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/formats_titles.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/formats_titles.pl
@@ -1,762 +1,613 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'formats_titles'} = {
'contents' => [
{
- 'args' => [
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument_inserted'
- }
- ],
- 'cmdname' => 'itemize',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first itemize
-'
+ 'cmdname' => 'bullet',
+ 'type' => 'command_as_argument_inserted'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'cmdname' => 'item',
+ 'cmdname' => 'itemize',
'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'item
+ 'contents' => [
+ {
+ 'text' => 'before first itemize
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'extra' => {
- 'item_number' => 1,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'type' => 'before_item'
+ },
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'itemize'
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'item
+'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
'extra' => {
- 'spaces_after_argument' => '
+ 'item_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'itemize'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'itemize'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'itemize',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'itemize'
+ 'command_as_argument' => {}
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'enumerate',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'enumerate',
'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first enumerate
+ 'contents' => [
+ {
+ 'text' => 'before first enumerate
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'cmdname' => 'item',
- 'contents' => [
+ 'type' => 'before_item'
+ },
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'enum
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'enum
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'item_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'enumerate'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'enumerate'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'item_number' => 1,
- 'spaces_before_argument' => ' '
+ 'enumerate_specification' => '1'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'enumerate'
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'enumerate',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'enumerate'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {},
- 'enumerate_specification' => '1'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'cmdname' => 'emph',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
- {
+ 'cmdname' => 'table',
'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first table
+ 'contents' => [
+ {
+ 'text' => 'before first table
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'contents' => [
+ 'type' => 'before_item'
+ },
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'tab'
+ 'contents' => [
+ {
+ 'text' => 'tab'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'item',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
}
],
- 'parent' => {},
- 'type' => 'table_term'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'args' => [
+ 'type' => 'table_entry'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'table'
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'table'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'table',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'table'
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 11,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'cmdname' => 'asis',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 16,
- 'macro' => ''
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {},
- 'type' => 'command_as_argument'
+ 'type' => 'block_line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
- {
+ 'cmdname' => 'vtable',
'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first vtable
+ 'contents' => [
+ {
+ 'text' => 'before first vtable
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'contents' => [
+ 'type' => 'before_item'
+ },
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'vtab'
+ 'contents' => [
+ {
+ 'text' => 'vtab'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'item',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_number' => 1,
+ 'in_code' => 1,
+ 'index_at_command' => 'item',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'vr',
+ 'index_type_command' => 'vtable'
+ },
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'extra' => {
- 'index_entry' => {
- 'command' => {},
- 'content' => [],
- 'content_normalized' => [],
- 'in_code' => 1,
- 'index_at_command' => 'item',
- 'index_name' => 'vr',
- 'index_type_command' => 'vtable',
- 'key' => 'vtab',
- 'number' => 1
- },
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 18,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
}
],
- 'parent' => {},
- 'type' => 'table_term'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'args' => [
+ 'type' => 'table_entry'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'vtable'
+ 'contents' => [
+ {
+ 'text' => 'vtable'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'vtable'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'vtable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'vtable'
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 16,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 16,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '0.5 0.5'
+ 'contents' => [
+ {
+ 'text' => '0.5 0.5'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'misc_args' => [
+ '0.5',
+ '0.5'
+ ],
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.5',
- '0.5'
- ],
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 21,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
- {
+ 'cmdname' => 'multitable',
'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'before first multitable
+ 'contents' => [
+ {
+ 'text' => 'before first multitable
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
- 'contents' => [
+ 'type' => 'before_item'
+ },
{
'contents' => [
{
- 'cmdname' => 'item',
'contents' => [
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'item multit '
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'item multit '
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'extra' => {
- 'cell_number' => 1,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 23,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => 'tab',
- 'contents' => [
+ 'extra' => {
+ 'cell_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ },
{
+ 'cmdname' => 'tab',
'contents' => [
{
- 'parent' => {},
- 'text' => 'tab multit
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'tab multit
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'cell_number' => 2
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'cell_number' => 2,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 23,
- 'macro' => ''
+ 'row_number' => 1
},
- 'parent' => {}
+ 'type' => 'row'
}
],
- 'extra' => {
- 'row_number' => 1
- },
- 'parent' => {},
- 'type' => 'row'
- }
- ],
- 'parent' => {},
- 'type' => 'multitable_body'
- },
- {
- 'args' => [
+ 'type' => 'multitable_body'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'multitable'
+ 'contents' => [
+ {
+ 'text' => 'multitable'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'multitable'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 24,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'multitable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'multitable'
+ 'columnfractions' => {},
+ 'max_columns' => 2,
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 24,
+ 'line_nr' => 21,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'columnfractions' => {},
- 'end_command' => {},
- 'max_columns' => 2,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 21,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'formats_titles'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'formats_titles'}{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'formats_titles'}{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'formats_titles'}{'contents'}[0]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3];
-$result_trees{'formats_titles'}{'contents'}[0]{'parent'} = $result_trees{'formats_titles'};
-$result_trees{'formats_titles'}{'contents'}[1]{'parent'} = $result_trees{'formats_titles'};
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'formats_titles'}{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[2]{'contents'}[1];
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'formats_titles'}{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[2]{'contents'}[2]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[2]{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'formats_titles'}{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[2]{'contents'}[3];
-$result_trees{'formats_titles'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'formats_titles'}{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'formats_titles'}{'contents'}[2]{'contents'}[3];
-$result_trees{'formats_titles'}{'contents'}[2]{'parent'} = $result_trees{'formats_titles'};
-$result_trees{'formats_titles'}{'contents'}[3]{'parent'} = $result_trees{'formats_titles'};
-$result_trees{'formats_titles'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4]{'contents'}[1];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4]{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'formats_titles'}{'contents'}[4];
-$result_trees{'formats_titles'}{'contents'}[4]{'extra'}{'command_as_argument'} = $result_trees{'formats_titles'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'formats_titles'}{'contents'}[4]{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[4]{'parent'} = $result_trees{'formats_titles'};
-$result_trees{'formats_titles'}{'contents'}[5]{'parent'} = $result_trees{'formats_titles'};
-$result_trees{'formats_titles'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[2]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'formats_titles'}{'contents'}[6];
-$result_trees{'formats_titles'}{'contents'}[6]{'extra'}{'command_as_argument'} = $result_trees{'formats_titles'}{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[6]{'parent'} = $result_trees{'formats_titles'};
-$result_trees{'formats_titles'}{'contents'}[7]{'parent'} = $result_trees{'formats_titles'};
-$result_trees{'formats_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2]{'args'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'formats_titles'}{'contents'}[8];
-$result_trees{'formats_titles'}{'contents'}[8]{'extra'}{'columnfractions'} = $result_trees{'formats_titles'}{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'formats_titles'}{'contents'}[8]{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[8]{'parent'} = $result_trees{'formats_titles'};
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'} = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
$result_texis{'formats_titles'} = '@itemize
before first itemize
@@ -803,7 +654,7 @@ item multit tab multit
$result_errors{'formats_titles'} = [
{
- 'error_line' => ':18: warning: entry for index `vr\' outside of any node
+ 'error_line' => 'warning: entry for index `vr\' outside of any node
',
'file_name' => '',
'line_nr' => 18,
@@ -817,4 +668,11 @@ $result_errors{'formats_titles'} = [
$result_floats{'formats_titles'} = {};
+$result_indices_sort_strings{'formats_titles'} = {
+ 'vr' => [
+ 'vtab'
+ ]
+};
+
+
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/group_beginning_and_end_on_line.pl b/macros/texinfo/texinfo/tp/t/results/coverage/group_beginning_and_end_on_line.pl
index 04482410aa..b0841e86fb 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/group_beginning_and_end_on_line.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/group_beginning_and_end_on_line.pl
@@ -1,79 +1,69 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'group_beginning_and_end_on_line'} = {
'contents' => [
{
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'within '
- }
- ],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'group',
'contents' => [
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'group'
+ 'text' => 'within '
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'group',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'group'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'group'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'args'}[0];
-$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'group_beginning_and_end_on_line'}{'contents'}[0];
-$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'group_beginning_and_end_on_line'}{'contents'}[0];
-$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'parent'} = $result_trees{'group_beginning_and_end_on_line'};
$result_texis{'group_beginning_and_end_on_line'} = '@group within @end group
';
@@ -83,7 +73,7 @@ $result_texts{'group_beginning_and_end_on_line'} = '';
$result_errors{'group_beginning_and_end_on_line'} = [
{
- 'error_line' => ':1: warning: @end should only appear at the beginning of a line
+ 'error_line' => 'warning: @end should only appear at the beginning of a line
',
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/group_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage/group_not_closed.pl
index e1f63d7de8..7b48f5be02 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/group_not_closed.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/group_not_closed.pl
@@ -1,58 +1,53 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'group_not_closed'} = {
'contents' => [
{
- 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'group',
'contents' => [
{
- 'parent' => {},
- 'text' => 'text in group
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'text in group
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
}
],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'group_not_closed'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'group_not_closed'}{'contents'}[0];
-$result_trees{'group_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'group_not_closed'}{'contents'}[0];
-$result_trees{'group_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'group_not_closed'}{'contents'}[0];
-$result_trees{'group_not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'group_not_closed'}{'contents'}[0]{'contents'}[2];
-$result_trees{'group_not_closed'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'group_not_closed'}{'contents'}[0];
-$result_trees{'group_not_closed'}{'contents'}[0]{'parent'} = $result_trees{'group_not_closed'};
$result_texis{'group_not_closed'} = '@group
@@ -66,7 +61,7 @@ text in group
$result_errors{'group_not_closed'} = [
{
- 'error_line' => ':3: no matching `@end group\'
+ 'error_line' => 'no matching `@end group\'
',
'file_name' => '',
'line_nr' => 3,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/hyphenation.pl b/macros/texinfo/texinfo/tp/t/results/coverage/hyphenation.pl
index 7548417901..72402cafd8 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/hyphenation.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/hyphenation.pl
@@ -1,61 +1,56 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'hyphenation'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'some-where '
+ 'contents' => [
+ {
+ 'text' => 'some-where'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'hyphenation',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ 'cmdname' => 'hyphenation',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_spaces_after_close_brace'
- },
- {
- 'parent' => {},
- 'text' => '
+ 'type' => 'spaces_after_close_brace'
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'hyphenation'}{'contents'}[0]{'parent'} = $result_trees{'hyphenation'};
-$result_trees{'hyphenation'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'hyphenation'}{'contents'}[1]{'args'}[0];
-$result_trees{'hyphenation'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'hyphenation'}{'contents'}[1];
-$result_trees{'hyphenation'}{'contents'}[1]{'parent'} = $result_trees{'hyphenation'};
-$result_trees{'hyphenation'}{'contents'}[2]{'parent'} = $result_trees{'hyphenation'};
-$result_trees{'hyphenation'}{'contents'}[3]{'parent'} = $result_trees{'hyphenation'};
$result_texis{'hyphenation'} = '
@hyphenation{some-where }
@@ -88,6 +83,11 @@ $result_converted{'xml'}->{'hyphenation'} = '
';
+$result_converted{'latex_text'}->{'hyphenation'} = '
+\\hyphenation{some-where}
+';
+
+
$result_converted{'docbook'}->{'hyphenation'} = '
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/indentedblock.pl b/macros/texinfo/texinfo/tp/t/results/coverage/indentedblock.pl
index ca3003f466..470c54acaa 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/indentedblock.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/indentedblock.pl
@@ -1,114 +1,92 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'indentedblock'} = {
'contents' => [
{
- 'cmdname' => 'indentedblock',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'indented block
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
+ 'cmdname' => 'indentedblock',
'contents' => [
{
- 'parent' => {},
- 'text' => 'Text
+ 'text' => ' ',
+ 'type' => 'spaces_before_paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'indented block
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'indentedblock'
+ 'text' => 'Text
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'indentedblock'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'indentedblock'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'indentedblock',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'indentedblock'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'indentedblock'}{'contents'}[0];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'indentedblock'}{'contents'}[0];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'indentedblock'}{'contents'}[0];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'indentedblock'}{'contents'}[0]{'contents'}[2];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'indentedblock'}{'contents'}[0];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'indentedblock'}{'contents'}[0];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'indentedblock'}{'contents'}[0]{'contents'}[4];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'indentedblock'}{'contents'}[0];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'indentedblock'}{'contents'}[0]{'contents'}[5]{'args'}[0];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'indentedblock'}{'contents'}[0]{'contents'}[5];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'indentedblock'}{'contents'}[0];
-$result_trees{'indentedblock'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'indentedblock'}{'contents'}[0]{'contents'}[5];
-$result_trees{'indentedblock'}{'contents'}[0]{'parent'} = $result_trees{'indentedblock'};
$result_texis{'indentedblock'} = '@indentedblock
indented block
@@ -152,6 +130,14 @@ $result_converted{'xml'}->{'indentedblock'} = '<indentedblock endspaces=" ">
';
+$result_converted{'latex_text'}->{'indentedblock'} = '\\begin{quote}
+ indented block
+
+Text
+\\end{quote}
+';
+
+
$result_converted{'docbook'}->{'indentedblock'} = '<para>indented block
</para>
<para>Text
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/indicateurl_end_lines.pl b/macros/texinfo/texinfo/tp/t/results/coverage/indicateurl_end_lines.pl
index e7d9d05bde..77bc9f0b1c 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/indicateurl_end_lines.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/indicateurl_end_lines.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,110 +10,85 @@ $result_trees{'indicateurl_end_lines'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'http://begin
+ 'contents' => [
+ {
+ 'text' => 'http://begin
'
- },
- {
- 'parent' => {},
- 'text' => 'continue on other line'
+ },
+ {
+ 'text' => 'continue on other line'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'indicateurl',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'indicateurl',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'http://begin2
+ 'contents' => [
+ {
+ 'text' => 'http://begin2
'
- },
- {
- 'parent' => {},
- 'text' => '
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'indicateurl',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'indicateurl',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'contents' => [
+ 'type' => 'paragraph'
+ },
{
- 'parent' => {},
- 'text' => 'cut by blank line
+ 'contents' => [
+ {
+ 'text' => 'cut by blank line
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'indicateurl_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'indicateurl_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'indicateurl_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'indicateurl_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'indicateurl_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'indicateurl_end_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'indicateurl_end_lines'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'indicateurl_end_lines'}{'contents'}[0];
-$result_trees{'indicateurl_end_lines'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'indicateurl_end_lines'}{'contents'}[0];
-$result_trees{'indicateurl_end_lines'}{'contents'}[0]{'parent'} = $result_trees{'indicateurl_end_lines'};
-$result_trees{'indicateurl_end_lines'}{'contents'}[1]{'parent'} = $result_trees{'indicateurl_end_lines'};
-$result_trees{'indicateurl_end_lines'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'indicateurl_end_lines'}{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'indicateurl_end_lines'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'indicateurl_end_lines'}{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'indicateurl_end_lines'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'indicateurl_end_lines'}{'contents'}[2]{'contents'}[0];
-$result_trees{'indicateurl_end_lines'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'indicateurl_end_lines'}{'contents'}[2];
-$result_trees{'indicateurl_end_lines'}{'contents'}[2]{'parent'} = $result_trees{'indicateurl_end_lines'};
-$result_trees{'indicateurl_end_lines'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'indicateurl_end_lines'}{'contents'}[3];
-$result_trees{'indicateurl_end_lines'}{'contents'}[3]{'parent'} = $result_trees{'indicateurl_end_lines'};
$result_texis{'indicateurl_end_lines'} = '@indicateurl{http://begin
continue on other line}
@@ -134,7 +109,7 @@ cut by blank line
$result_errors{'indicateurl_end_lines'} = [
{
- 'error_line' => ':4: @indicateurl missing closing brace
+ 'error_line' => '@indicateurl missing closing brace
',
'file_name' => '',
'line_nr' => 4,
@@ -143,7 +118,7 @@ $result_errors{'indicateurl_end_lines'} = [
'type' => 'error'
},
{
- 'error_line' => ':6: misplaced }
+ 'error_line' => 'misplaced }
',
'file_name' => '',
'line_nr' => 6,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/insertcopying.pl b/macros/texinfo/texinfo/tp/t/results/coverage/insertcopying.pl
index ec8404069f..fe1a79206b 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/insertcopying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/insertcopying.pl
@@ -1,214 +1,167 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'insertcopying'} = {
'contents' => [
{
- 'cmdname' => 'copying',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'License.
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
+ 'cmdname' => 'copying',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'License.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
'contents' => [
{
- 'parent' => {},
- 'text' => 'You are not allowed.
+ 'contents' => [
+ {
+ 'text' => 'You are not allowed.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'copying'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'copying'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 7,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'args' => [
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'copying'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'text' => 'License:
'
- },
- 'parent' => {},
- 'type' => 'line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'copying',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'copying'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'paragraph'
+ },
{
- 'parent' => {},
- 'text' => 'License:
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'parent' => {},
- 'text' => '
+ 'args' => [
+ {
+ 'text' => '
',
- 'type' => 'misc_arg'
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'insertcopying',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'insertcopying',
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'insertcopying'}{'contents'}[0];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[1];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[4];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'insertcopying'}{'contents'}[0];
-$result_trees{'insertcopying'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[4];
-$result_trees{'insertcopying'}{'contents'}[0]{'parent'} = $result_trees{'insertcopying'};
-$result_trees{'insertcopying'}{'contents'}[1]{'parent'} = $result_trees{'insertcopying'};
-$result_trees{'insertcopying'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'insertcopying'}{'contents'}[2];
-$result_trees{'insertcopying'}{'contents'}[2]{'parent'} = $result_trees{'insertcopying'};
-$result_trees{'insertcopying'}{'contents'}[3]{'parent'} = $result_trees{'insertcopying'};
-$result_trees{'insertcopying'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'insertcopying'}{'contents'}[4];
-$result_trees{'insertcopying'}{'contents'}[4]{'parent'} = $result_trees{'insertcopying'};
$result_texis{'insertcopying'} = '@copying
License.
@@ -249,7 +202,7 @@ $result_converted{'html_text'}->{'insertcopying'} = '
</p>
<p>License.
</p>
-<blockquote>
+<blockquote class="quotation">
<p>You are not allowed.
</p></blockquote>
';
@@ -269,15 +222,34 @@ $result_converted{'xml'}->{'insertcopying'} = '<copying endspaces=" ">
';
-$result_converted{'docbook'}->{'insertcopying'} = '<bookinfo><legalnotice><para>License.
+$result_converted{'latex_text'}->{'insertcopying'} = '
+License:
+
+License.
+
+\\begin{quote}
+You are not allowed.
+\\end{quote}
+';
+
+
+$result_converted{'docbook_doc'}->{'insertcopying'} = '<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY tex "TeX">
+ <!ENTITY latex "LaTeX">
+]>
+<book lang="en">
+<bookinfo><legalnotice><para>License.
</para>
<blockquote><para>You are not allowed.
</para></blockquote></legalnotice></bookinfo>
+
<para>License:
</para>
<para>License.
</para>
<blockquote><para>You are not allowed.
-</para></blockquote>';
+</para></blockquote></book>
+';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/invalid_U.pl b/macros/texinfo/texinfo/tp/t/results/coverage/invalid_U.pl
index 1150ea0980..06ea0c3f78 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/invalid_U.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/invalid_U.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,300 +10,223 @@ $result_trees{'invalid_U'} = {
{
'contents' => [
{
- 'cmdname' => 'U',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'contents' => [
{
- 'contents' => [],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'U',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => 'U',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'z'
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'U',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => 'U',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'abc'
+ 'contents' => [
+ {
+ 'text' => 'z'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'U',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => 'U',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '9999999999999'
+ 'contents' => [
+ {
+ 'text' => 'abc'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'U',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => 'U',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '110000'
+ 'contents' => [
+ {
+ 'text' => '9999999999999'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'U',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => 'U',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => '10FFFF'
+ 'contents' => [
+ {
+ 'text' => '110000'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'U',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ 'cmdname' => 'U',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '10FFFF'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'U',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
'
- },
- {
- 'args' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '0023'
+ 'contents' => [
+ {
+ 'text' => '0023'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => ' ',
- 'spaces_before_argument' => ' '
- },
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'U',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => 'U',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'FFFD'
+ 'contents' => [
+ {
+ 'text' => 'FFFD'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'U',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => 'U',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'wxyz'
+ 'contents' => [
+ {
+ 'text' => 'wxyz'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => ' ',
- 'spaces_before_argument' => ' '
- },
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'U',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'U',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'args'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'args'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'args'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'args'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[13]{'args'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[13];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[13]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[14]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[15]{'args'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[15];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[15]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[16]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[17]{'args'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[17];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[17]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'contents'}[18]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
-$result_trees{'invalid_U'}{'contents'}[0]{'parent'} = $result_trees{'invalid_U'};
-$result_texis{'invalid_U'} = '@U@U{} @U{z} @U{abc} @U{9999999999999} @U{110000} @U{10FFFF}
+$result_texis{'invalid_U'} = '@U @U{} @U{z} @U{abc} @U{9999999999999} @U{110000} @U{10FFFF}
@U{ 0023 } @U{FFFD} @U{ wxyz }
';
@@ -314,7 +237,7 @@ $result_texts{'invalid_U'} = ' z abc 9999999999999 110000 10FFFF
$result_errors{'invalid_U'} = [
{
- 'error_line' => ':1: @U expected braces
+ 'error_line' => '@U expected braces
',
'file_name' => '',
'line_nr' => 1,
@@ -323,7 +246,7 @@ $result_errors{'invalid_U'} = [
'type' => 'error'
},
{
- 'error_line' => ':1: warning: no argument specified for @U
+ 'error_line' => 'warning: no argument specified for @U
',
'file_name' => '',
'line_nr' => 1,
@@ -332,7 +255,7 @@ $result_errors{'invalid_U'} = [
'type' => 'warning'
},
{
- 'error_line' => ':1: non-hex digits in argument for @U: z
+ 'error_line' => 'non-hex digits in argument for @U: z
',
'file_name' => '',
'line_nr' => 1,
@@ -341,7 +264,7 @@ $result_errors{'invalid_U'} = [
'type' => 'error'
},
{
- 'error_line' => ':1: warning: fewer than four hex digits in argument for @U: abc
+ 'error_line' => 'warning: fewer than four hex digits in argument for @U: abc
',
'file_name' => '',
'line_nr' => 1,
@@ -350,7 +273,7 @@ $result_errors{'invalid_U'} = [
'type' => 'warning'
},
{
- 'error_line' => ':1: argument for @U exceeds Unicode maximum 0x10FFFF: 9999999999999
+ 'error_line' => 'argument for @U exceeds Unicode maximum 0x10FFFF: 9999999999999
',
'file_name' => '',
'line_nr' => 1,
@@ -359,7 +282,7 @@ $result_errors{'invalid_U'} = [
'type' => 'error'
},
{
- 'error_line' => ':1: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
+ 'error_line' => 'argument for @U exceeds Unicode maximum 0x10FFFF: 110000
',
'file_name' => '',
'line_nr' => 1,
@@ -368,7 +291,7 @@ $result_errors{'invalid_U'} = [
'type' => 'error'
},
{
- 'error_line' => ':2: non-hex digits in argument for @U: wxyz
+ 'error_line' => 'non-hex digits in argument for @U: wxyz
',
'file_name' => '',
'line_nr' => 2,
@@ -397,13 +320,18 @@ $result_converted{'xml'}->{'invalid_U'} = '<para><U></U> <U>z</U> <U>abc</U> <U>
</para>';
+$result_converted{'latex_text'}->{'invalid_U'} = ' U+z ઼ U+9999999999999 U+110000 U+10FFFF
+\\# � U+wxyz
+';
+
+
$result_converted{'docbook'}->{'invalid_U'} = '<para> &#xz; &#xabc; &#x9999999999999; &#x110000; &#x10FFFF;
&#x0023; &#xFFFD; &#xwxyz;
</para>';
$result_converted_errors{'docbook'}->{'invalid_U'} = [
{
- 'error_line' => ':1: warning: no argument specified for @U
+ 'error_line' => 'warning: no argument specified for @U
',
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/item_container.pl b/macros/texinfo/texinfo/tp/t/results/coverage/item_container.pl
index 0b2e8bce64..a8282fbf8d 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/item_container.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/item_container.pl
@@ -1,355 +1,287 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'item_container'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '+'
+ 'contents' => [
+ {
+ 'text' => '+'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
- {
- 'cmdname' => 'item',
+ 'cmdname' => 'itemize',
'contents' => [
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'i--tem +
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'i--tem +
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'item_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'itemize'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'itemize'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'item_number' => 1,
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 2,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'itemize'
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'itemize',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'itemize'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
+ 'cmdname' => 'itemize',
'contents' => [
{
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'cmdname' => 'item',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'text' => ' ',
+ 'type' => 'spaces_before_paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'b--ullet
'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
- {
- 'cmdname' => 'item',
- 'contents' => [
- {
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'item_number' => 1
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'b--ullet
+ 'contents' => [
+ {
+ 'text' => 'itemize'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'itemize'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'item_number' => 1
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 6,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'itemize'
+ 'cmdname' => 'bullet',
+ 'type' => 'command_as_argument_inserted'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'itemize',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'itemize'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument_inserted'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'cmdname' => 'item',
+ 'cmdname' => 'itemize',
'contents' => [
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'no itemize argument
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'no itemize argument
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'extra' => {
- 'item_number' => 1,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
+ 'extra' => {
+ 'item_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'itemize'
+ 'contents' => [
+ {
+ 'text' => 'itemize'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'itemize'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'itemize',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'itemize'
+ 'command_as_argument' => {}
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'item_container'}{'contents'}[0]{'parent'} = $result_trees{'item_container'};
-$result_trees{'item_container'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[1]{'args'}[0];
-$result_trees{'item_container'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[1];
-$result_trees{'item_container'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[1]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[1];
-$result_trees{'item_container'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'item_container'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[1]{'contents'}[1];
-$result_trees{'item_container'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'item_container'}{'contents'}[1];
-$result_trees{'item_container'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'item_container'}{'contents'}[1]{'contents'}[1];
-$result_trees{'item_container'}{'contents'}[1]{'parent'} = $result_trees{'item_container'};
-$result_trees{'item_container'}{'contents'}[2]{'parent'} = $result_trees{'item_container'};
-$result_trees{'item_container'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[3]{'args'}[0];
-$result_trees{'item_container'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[3];
-$result_trees{'item_container'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'item_container'}{'contents'}[3]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[3]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'item_container'}{'contents'}[3]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[3]{'contents'}[0]{'contents'}[2];
-$result_trees{'item_container'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'item_container'}{'contents'}[3]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[3];
-$result_trees{'item_container'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'item_container'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[3]{'contents'}[1];
-$result_trees{'item_container'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'item_container'}{'contents'}[3];
-$result_trees{'item_container'}{'contents'}[3]{'extra'}{'command_as_argument'} = $result_trees{'item_container'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'item_container'}{'contents'}[3]{'contents'}[1];
-$result_trees{'item_container'}{'contents'}[3]{'parent'} = $result_trees{'item_container'};
-$result_trees{'item_container'}{'contents'}[4]{'parent'} = $result_trees{'item_container'};
-$result_trees{'item_container'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[5];
-$result_trees{'item_container'}{'contents'}[5]{'contents'}[0]{'extra'}{'command'} = $result_trees{'item_container'}{'contents'}[5];
-$result_trees{'item_container'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[5];
-$result_trees{'item_container'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[5]{'contents'}[1];
-$result_trees{'item_container'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'item_container'}{'contents'}[5];
-$result_trees{'item_container'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'item_container'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'item_container'}{'contents'}[5]{'contents'}[2];
-$result_trees{'item_container'}{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'item_container'}{'contents'}[5];
-$result_trees{'item_container'}{'contents'}[5]{'extra'}{'command_as_argument'} = $result_trees{'item_container'}{'contents'}[5]{'args'}[0];
-$result_trees{'item_container'}{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'item_container'}{'contents'}[5]{'contents'}[2];
-$result_trees{'item_container'}{'contents'}[5]{'parent'} = $result_trees{'item_container'};
+$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'} = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'} = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
$result_texis{'item_container'} = '
@itemize +
@@ -382,32 +314,32 @@ $result_floats{'item_container'} = {};
-$result_converted{'plaintext'}->{'item_container'} = ' + i-tem +
+$result_converted{'plaintext'}->{'item_container'} = ' + i–tem +
- * b-ullet
+ • b–ullet
- * no itemize argument
+ • no itemize argument
';
$result_converted{'html_text'}->{'item_container'} = '
-<ul class="no-bullet">
-<li>+ i&ndash;tem +
+<ul class="itemize" style="list-style-type: \'+\'">
+<li>i&ndash;tem +
</li></ul>
-<ul>
-<li> b&ndash;ullet
+<ul class="itemize mark-bullet">
+<li>b&ndash;ullet
</li></ul>
-<ul>
-<li> no itemize argument
+<ul class="itemize mark-bullet">
+<li>no itemize argument
</li></ul>
';
$result_converted{'xml'}->{'item_container'} = '
<itemize spaces=" " endspaces=" "><itemprepend>+</itemprepend>
-<listitem spaces=" "><prepend>+</prepend><para>i&textndash;tem +
+<listitem><prepend>+</prepend> <para>i&textndash;tem +
</para></listitem></itemize>
<itemize commandarg="bullet" spaces=" " endspaces=" "><itemprepend><formattingcommand command="bullet"/></itemprepend>
@@ -415,12 +347,27 @@ $result_converted{'xml'}->{'item_container'} = '
<para>b&textndash;ullet
</para></listitem></itemize>
-<itemize commandarg="bullet" endspaces=" "><itemprepend>&bullet;</itemprepend>
-<listitem spaces=" "><prepend>&bullet;</prepend><para>no itemize argument
+<itemize commandarg="bullet" endspaces=" "><itemprepend><formattingcommand command="bullet" automatic="on"/></itemprepend>
+<listitem><prepend>&bullet;</prepend> <para>no itemize argument
</para></listitem></itemize>
';
+$result_converted{'latex_text'}->{'item_container'} = '
+\\begin{itemize}[label=+]
+\\item i--tem +
+\\end{itemize}
+
+\\begin{itemize}[label=\\textbullet{}]
+\\item b--ullet
+\\end{itemize}
+
+\\begin{itemize}
+\\item no itemize argument
+\\end{itemize}
+';
+
+
$result_converted{'docbook'}->{'item_container'} = '
<itemizedlist><listitem><para>+ i&#8211;tem +
</para></listitem></itemizedlist>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl b/macros/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl
index 316631aae1..63b3c219e4 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,56 +10,389 @@ $result_trees{'lettered_accent_and_spaces'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'space_command_arg'
+ 'cmdname' => 'ringaccent',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ringaccent',
+ 'extra' => {
+ 'spaces' => '
+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => 'ringaccent',
+ 'extra' => {
+ 'spaces' => '
+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => 'ringaccent',
+ 'extra' => {
+ 'spaces' => '
+ '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '^',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '^',
+ 'extra' => {
+ 'spaces' => '
+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'ringaccent',
- 'contents' => [],
- 'extra' => {
- 'spaces' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '^',
+ 'extra' => {
+ 'spaces' => '
+ '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a
'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => '^',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0];
-$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
-$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
-$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'parent'} = $result_trees{'lettered_accent_and_spaces'};
$result_texis{'lettered_accent_and_spaces'} = '@ringaccent a
+
+@ringaccent
+{a}
+
+@ringaccent
+a
+
+@ringaccent
+ a
+
+@^ a
+
+@^
+a
+
+@^
+ a
+
+@^ {a
+}
+
';
$result_texts{'lettered_accent_and_spaces'} = 'a*
+
+a*
+
+a*
+
+a*
+
+a^
+
+a^
+
+a^
+
+a
+^
+
';
-$result_errors{'lettered_accent_and_spaces'} = [];
+$result_errors{'lettered_accent_and_spaces'} = [
+ {
+ 'error_line' => 'warning: command `@ringaccent\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'command `@ringaccent\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@ringaccent\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => '',
+ 'text' => 'command `@ringaccent\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@ringaccent\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => '',
+ 'text' => 'command `@ringaccent\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@^\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => '',
+ 'text' => 'command `@^\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@^\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => '',
+ 'text' => 'command `@^\' must not be followed by new line',
+ 'type' => 'warning'
+ }
+];
$result_floats{'lettered_accent_and_spaces'} = {};
@@ -67,18 +400,106 @@ $result_floats{'lettered_accent_and_spaces'} = {};
$result_converted{'plaintext'}->{'lettered_accent_and_spaces'} = 'å
+
+ å
+
+ å
+
+ å
+
+ â
+
+ â
+
+ â
+
+ a ̂
+
';
$result_converted{'html_text'}->{'lettered_accent_and_spaces'} = '<p>&aring;
-</p>';
+</p>
+<p>&aring;
+</p>
+<p>&aring;
+</p>
+<p>&aring;
+</p>
+<p>&acirc;
+</p>
+<p>&acirc;
+</p>
+<p>&acirc;
+</p>
+<p>&a
+circ;
+</p>
+';
+
+
+$result_converted{'xml'}->{'lettered_accent_and_spaces'} = '<para><accent type="ring" spaces=" " bracketed="off">a</accent>
+</para>
+<para><accent type="ring" spaces="
+">a</accent>
+</para>
+<para><accent type="ring" spaces="
+" bracketed="off">a</accent>
+</para>
+<para><accent type="ring" spaces="
+ " bracketed="off">a</accent>
+</para>
+<para><accent type="circ" spaces=" " bracketed="off">a</accent>
+</para>
+<para><accent type="circ" spaces="
+" bracketed="off">a</accent>
+</para>
+<para><accent type="circ" spaces="
+ " bracketed="off">a</accent>
+</para>
+<para><accent type="circ" spaces=" ">a
+</accent>
+</para>
+';
+
+
+$result_converted{'latex_text'}->{'lettered_accent_and_spaces'} = '\\r{a}
+\\r{a}
-$result_converted{'xml'}->{'lettered_accent_and_spaces'} = '<para><accent type="ring" spaces=" ">a</accent>
-</para>';
+\\r{a}
+
+\\r{a}
+
+\\^{a}
+
+\\^{a}
+
+\\^{a}
+
+\\^{a
+}
+
+';
$result_converted{'docbook'}->{'lettered_accent_and_spaces'} = '<para>&#229;
-</para>';
+</para>
+<para>&#229;
+</para>
+<para>&#229;
+</para>
+<para>&#229;
+</para>
+<para>&#226;
+</para>
+<para>&#226;
+</para>
+<para>&#226;
+</para>
+<para>a
+&#770;
+</para>
+';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/math.pl b/macros/texinfo/texinfo/tp/t/results/coverage/math.pl
index 2ed4ae2c91..805ca3aae1 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/math.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/math.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,527 +10,383 @@ $result_trees{'math'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'Simple math
+ 'contents' => [
+ {
+ 'text' => 'Simple math
'
- },
- {
- 'args' => [
+ },
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '--'
- },
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'x^i'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
- },
- {
- 'parent' => {},
- 'text' => '\\over'
- },
- {
- 'contents' => [
+ 'text' => '--'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'x^i'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ },
{
- 'parent' => {},
- 'text' => '\\tan y'
+ 'text' => '\\over'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => '\\tan y'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
}
],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
+ 'type' => 'brace_command_context'
}
],
- 'parent' => {},
- 'type' => 'brace_command_context'
+ 'cmdname' => 'math',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'math',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Math with '
+ 'type' => 'empty_line'
},
{
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '-command
+ 'contents' => [
+ {
+ 'text' => 'Math with '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => '-command
'
- },
- {
- 'args' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'math code'
+ 'contents' => [
+ {
+ 'text' => 'math code'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' a < b \\sum'
- },
- {
- 'args' => [
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' a < b \\sum'
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'sub',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' q'
- },
- {
- 'args' => [
+ 'cmdname' => 'sub',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' q'
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => '2'
+ 'contents' => [
+ {
+ 'text' => '2'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'sup',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'sup',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'brace_command_context'
}
],
- 'parent' => {},
- 'type' => 'brace_command_context'
+ 'cmdname' => 'math',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'math',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Complex
-'
+ 'type' => 'empty_line'
},
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '\\underline'
- },
+ 'text' => 'Complex
+'
+ },
+ {
+ 'args' => [
{
'contents' => [
{
- 'args' => [
+ 'text' => '\\underline'
+ },
+ {
+ 'contents' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'math \\hbox'
- },
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => ' code '
+ 'text' => 'math \\hbox'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' code '
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
}
],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 8,
'macro' => ''
},
- 'parent' => {}
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => '\\',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => 'i \\sum_'
- },
- {
- 'contents' => [
+ 'type' => 'bracketed'
+ },
{
- 'parent' => {},
- 'text' => 'i'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
- },
- {
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'parent' => {},
- 'text' => '\\underline'
+ 'cmdname' => '\\'
+ },
+ {
+ 'text' => 'i \\sum_'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'f'
+ 'text' => 'i'
}
],
- 'line_nr' => {
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => '\\underline'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'f'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ }
+ ],
+ 'source_info' => {
'file_name' => '',
'line_nr' => 8,
'macro' => ''
},
- 'parent' => {},
'type' => 'bracketed'
}
],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
+ 'type' => 'brace_command_context'
}
],
- 'parent' => {},
- 'type' => 'brace_command_context'
+ 'cmdname' => 'math',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'math',
- 'contents' => [],
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'cmdname' => '@',
- 'parent' => {}
+ 'type' => 'empty_line'
},
{
- 'parent' => {},
- 'text' => '\\ outside of math
+ 'contents' => [
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => '\\ outside of math
'
+ },
+ {
+ 'cmdname' => '\\'
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
- 'cmdname' => '\\',
- 'parent' => {}
- },
- {
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'The 3'
+ 'type' => 'empty_line'
},
{
- 'args' => [
+ 'contents' => [
+ {
+ 'text' => 'The 3'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'rd'
+ 'contents' => [
+ {
+ 'text' => 'rd'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'sup',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => 'is the I'
- },
- {
- 'args' => [
+ 'cmdname' => 'sup',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'is the I'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'sub',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.
+'
}
],
- 'cmdname' => 'sub',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
- 'text' => '.
-'
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'math'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[0];
-$result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1];
-$result_trees{'math'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[0];
-$result_trees{'math'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'math'}{'contents'}[0];
-$result_trees{'math'}{'contents'}[0]{'parent'} = $result_trees{'math'};
-$result_trees{'math'}{'contents'}[1]{'parent'} = $result_trees{'math'};
-$result_trees{'math'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[2];
-$result_trees{'math'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[2];
-$result_trees{'math'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'math'}{'contents'}[2];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3];
-$result_trees{'math'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'math'}{'contents'}[2];
-$result_trees{'math'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'math'}{'contents'}[2];
-$result_trees{'math'}{'contents'}[2]{'parent'} = $result_trees{'math'};
-$result_trees{'math'}{'contents'}[3]{'parent'} = $result_trees{'math'};
-$result_trees{'math'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[4];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[5];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[1];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[4]{'contents'}[1];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[4];
-$result_trees{'math'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'math'}{'contents'}[4];
-$result_trees{'math'}{'contents'}[4]{'parent'} = $result_trees{'math'};
-$result_trees{'math'}{'contents'}[5]{'parent'} = $result_trees{'math'};
-$result_trees{'math'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[6];
-$result_trees{'math'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[6];
-$result_trees{'math'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'math'}{'contents'}[6];
-$result_trees{'math'}{'contents'}[6]{'contents'}[3]{'parent'} = $result_trees{'math'}{'contents'}[6];
-$result_trees{'math'}{'contents'}[6]{'parent'} = $result_trees{'math'};
-$result_trees{'math'}{'contents'}[7]{'parent'} = $result_trees{'math'};
-$result_trees{'math'}{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[8];
-$result_trees{'math'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[8]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[8]{'contents'}[1];
-$result_trees{'math'}{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[8];
-$result_trees{'math'}{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'math'}{'contents'}[8];
-$result_trees{'math'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math'}{'contents'}[8]{'contents'}[3]{'args'}[0];
-$result_trees{'math'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[8]{'contents'}[3];
-$result_trees{'math'}{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'math'}{'contents'}[8];
-$result_trees{'math'}{'contents'}[8]{'contents'}[4]{'parent'} = $result_trees{'math'}{'contents'}[8];
-$result_trees{'math'}{'contents'}[8]{'parent'} = $result_trees{'math'};
-$result_trees{'math'}{'contents'}[9]{'parent'} = $result_trees{'math'};
$result_texis{'math'} = 'Simple math
@math{--{x^i}\\over{\\tan y}}
@@ -567,7 +423,7 @@ The 3rdis the Ir.
$result_errors{'math'} = [
{
- 'error_line' => ':11: warning: @\\ should only appear in math context
+ 'error_line' => 'warning: @\\ should only appear in math context
',
'file_name' => '',
'line_nr' => 11,
@@ -584,9 +440,9 @@ $result_floats{'math'} = {};
$result_converted{'plaintext'}->{'math'} = 'Simple math --{x^i}\\over{\\tan y}
- Math with @-command \'math code\' a < b \\sum_{i} q^{2}
+ Math with @-command ‘math code’ a < b \\sum_{i} q^{2}
- Complex \\underline{\'math \\hbox{ code }\'} \\i \\sum_{i}{\\underline{f}}
+ Complex \\underline{‘math \\hbox{ code }’} \\i \\sum_{i}{\\underline{f}}
@\\ outside of math \\
@@ -596,18 +452,18 @@ $result_converted{'plaintext'}->{'math'} = 'Simple math --{x^i}\\over{\\tan y}
$result_converted{'html_text'}->{'math'} = '<p>Simple math
-<em class=\'math\'>--{x^i}\\over{\\tan y}</em>
+<em class="math">--{x^i}\\over{\\tan y}</em>
</p>
<p>Math with @-command
-<em class=\'math\'><code>math code</code> a &lt; b \\sum<sub>i</sub> q<sup>2</sup></em>
+<em class="math"><code class="code">math code</code> a &lt; b \\sum<sub class="sub">i</sub> q<sup class="sup">2</sup></em>
</p>
<p>Complex
-<em class=\'math\'>\\underline{<code>math \\hbox{ code }</code>} \\i \\sum_{i}{\\underline{f}}</em>
+<em class="math">\\underline{<code class="code">math \\hbox{ code }</code>} \\i \\sum_{i}{\\underline{f}}</em>
</p>
<p>@\\ outside of math
\\
</p>
-<p>The 3<sup>rd</sup>is the I<sub>r</sub>.
+<p>The 3<sup class="sup">rd</sup>is the I<sub class="sub">r</sub>.
</p>
';
@@ -629,6 +485,23 @@ $result_converted{'xml'}->{'math'} = '<para>Simple math
';
+$result_converted{'latex_text'}->{'math'} = 'Simple math
+$--{x^i}\\over{\\tan y}$
+
+Math with @-command
+$\\mathtt{math code} a < b \\sum_{i} q^{2}$
+
+Complex
+$\\underline{\\mathtt{math \\hbox{ code }}} \\backslash{}i \\sum_{i}{\\underline{f}}$
+
+@\\textbackslash{} outside of math
+\\textbackslash{}
+
+The 3\\textsuperscript{rd}is the I\\textsubscript{r}.
+
+';
+
+
$result_converted{'docbook'}->{'math'} = '<para>Simple math
<inlineequation><mathphrase>--{x^i}\\over{\\tan y}</mathphrase></inlineequation>
</para>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/multitable.pl b/macros/texinfo/texinfo/tp/t/results/coverage/multitable.pl
index a611ee2ba0..ce9bc3012e 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/multitable.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/multitable.pl
@@ -1,639 +1,535 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'multitable'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '0.6 0.4'
+ 'contents' => [
+ {
+ 'text' => '0.6 0.4'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'misc_args' => [
+ '0.6',
+ '0.4'
+ ],
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.6',
- '0.4'
- ],
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
- {
+ 'cmdname' => 'multitable',
'contents' => [
{
'contents' => [
{
- 'cmdname' => 'headitem',
'contents' => [
{
+ 'cmdname' => 'headitem',
'contents' => [
{
- 'parent' => {},
- 'text' => 'mu--ltitable headitem '
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'mu--ltitable headitem '
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'extra' => {
- 'cell_number' => 1,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => 'tab',
- 'contents' => [
+ 'extra' => {
+ 'cell_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
{
+ 'cmdname' => 'tab',
'contents' => [
{
- 'parent' => {},
- 'text' => 'another tab
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'another tab
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'cell_number' => 2
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'cell_number' => 2,
- 'spaces_before_argument' => ' '
+ 'row_number' => 1
},
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'row'
}
],
- 'extra' => {
- 'row_number' => 1
- },
- 'parent' => {},
- 'type' => 'row'
- }
- ],
- 'parent' => {},
- 'type' => 'multitable_head'
- },
- {
- 'contents' => [
+ 'type' => 'multitable_head'
+ },
{
'contents' => [
{
- 'cmdname' => 'item',
'contents' => [
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'mu--ltitable item '
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'mu--ltitable item '
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'extra' => {
- 'cell_number' => 1,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => 'tab',
- 'contents' => [
+ 'extra' => {
+ 'cell_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
{
+ 'cmdname' => 'tab',
'contents' => [
{
- 'parent' => {},
- 'text' => 'multitable tab
-'
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
},
{
- 'args' => [
+ 'contents' => [
+ {
+ 'text' => 'multitable tab
+'
+ },
{
- 'parent' => {},
- 'text' => ' comment in multitable
+ 'args' => [
+ {
+ 'text' => ' comment in multitable
',
- 'type' => 'misc_arg'
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment in multitable
+'
+ ]
+ }
}
],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment in multitable
-'
- ]
- },
- 'parent' => {}
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'cell_number' => 2
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'cell_number' => 2,
- 'spaces_before_argument' => ' '
+ 'row_number' => 2
},
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'row_number' => 2
- },
- 'parent' => {},
- 'type' => 'row'
- },
- {
- 'contents' => [
+ 'type' => 'row'
+ },
{
- 'cmdname' => 'item',
'contents' => [
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'mu--ltitable item 2 '
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'mu--ltitable item 2 '
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'extra' => {
- 'cell_number' => 1,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => 'tab',
- 'contents' => [
+ 'extra' => {
+ 'cell_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
{
+ 'cmdname' => 'tab',
'contents' => [
{
- 'parent' => {},
- 'text' => 'multitable tab 2
-'
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
},
{
- 'args' => [
+ 'contents' => [
+ {
+ 'text' => 'multitable tab 2
+'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'index entry within multitable'
+ 'contents' => [
+ {
+ 'text' => 'index entry within multitable'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'cindex',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_number' => 1,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ },
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'index_entry_command'
}
],
- 'cmdname' => 'cindex',
- 'extra' => {
- 'index_entry' => {
- 'command' => {},
- 'content' => [],
- 'content_normalized' => [],
- 'in_code' => 0,
- 'index_at_command' => 'cindex',
- 'index_name' => 'cp',
- 'index_type_command' => 'cindex',
- 'key' => 'index entry within multitable',
- 'number' => 1
- },
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'index_entry_command'
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'cell_number' => 2
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'cell_number' => 2,
- 'spaces_before_argument' => ' '
+ 'row_number' => 3
},
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'row_number' => 3
- },
- 'parent' => {},
- 'type' => 'row'
- },
- {
- 'contents' => [
+ 'type' => 'row'
+ },
{
- 'cmdname' => 'item',
'contents' => [
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'lone mu--ltitable item
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'lone mu--ltitable item
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'cell_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'cell_number' => 1,
- 'spaces_before_argument' => ' '
+ 'row_number' => 4
},
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'row'
}
],
- 'extra' => {
- 'row_number' => 4
- },
- 'parent' => {},
- 'type' => 'row'
- }
- ],
- 'parent' => {},
- 'type' => 'multitable_body'
- },
- {
- 'args' => [
+ 'type' => 'multitable_body'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'multitable'
+ 'contents' => [
+ {
+ 'text' => 'multitable'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'multitable'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'multitable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'multitable'
+ 'columnfractions' => {},
+ 'max_columns' => 2,
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 2,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'columnfractions' => {},
- 'end_command' => {},
- 'max_columns' => 2,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'truc'
- }
- ],
- 'parent' => {},
- 'type' => 'bracketed'
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'type' => 'bracketed'
+ },
{
- 'parent' => {},
- 'text' => 'bidule'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
+ 'type' => 'bracketed'
}
],
- 'parent' => {},
- 'type' => 'bracketed'
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
- {
+ 'cmdname' => 'multitable',
'contents' => [
{
'contents' => [
{
- 'cmdname' => 'item',
'contents' => [
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'truc '
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc '
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'extra' => {
- 'cell_number' => 1,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => 'tab',
- 'contents' => [
+ 'extra' => {
+ 'cell_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
+ },
{
+ 'cmdname' => 'tab',
'contents' => [
{
- 'parent' => {},
- 'text' => 'bidule
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'bidule
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'cell_number' => 2
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'cell_number' => 2,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
+ 'row_number' => 1
},
- 'parent' => {}
+ 'type' => 'row'
}
],
- 'extra' => {
- 'row_number' => 1
- },
- 'parent' => {},
- 'type' => 'row'
- }
- ],
- 'parent' => {},
- 'type' => 'multitable_body'
- },
- {
- 'args' => [
+ 'type' => 'multitable_body'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'multitable'
+ 'contents' => [
+ {
+ 'text' => 'multitable'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'multitable'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'multitable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'multitable'
+ 'max_columns' => 2,
+ 'prototypes' => [
+ {
+ 'contents' => [
+ {}
+ ],
+ 'type' => 'bracketed_multitable_prototype'
+ },
+ {
+ 'contents' => [
+ {}
+ ],
+ 'type' => 'bracketed_multitable_prototype'
+ }
+ ],
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {},
- 'max_columns' => 2,
- 'prototypes' => [
- {
- 'contents' => [
- {}
- ],
- 'type' => 'bracketed_multitable_prototype'
- },
- {
- 'contents' => [
- {}
- ],
- 'type' => 'bracketed_multitable_prototype'
- }
- ],
- 'prototypes_line' => [
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {}
- ],
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'multitable'}{'contents'}[0]{'parent'} = $result_trees{'multitable'};
-$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[2];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'multitable'}{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'extra'}{'columnfractions'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[2];
-$result_trees{'multitable'}{'contents'}[1]{'parent'} = $result_trees{'multitable'};
-$result_trees{'multitable'}{'contents'}[2]{'parent'} = $result_trees{'multitable'};
-$result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[3];
-$result_trees{'multitable'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes_line'}[0] = $result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes_line'}[2] = $result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'multitable'}{'contents'}[3]{'parent'} = $result_trees{'multitable'};
+$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'extra'}{'columnfractions'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_texis{'multitable'} = '
@multitable @columnfractions 0.6 0.4
@@ -662,7 +558,7 @@ truc bidule
$result_errors{'multitable'} = [
{
- 'error_line' => ':7: warning: entry for index `cp\' outside of any node
+ 'error_line' => 'warning: entry for index `cp\' outside of any node
',
'file_name' => '',
'line_nr' => 7,
@@ -676,48 +572,73 @@ $result_errors{'multitable'} = [
$result_floats{'multitable'} = {};
+$result_indices_sort_strings{'multitable'} = {
+ 'cp' => [
+ 'index entry within multitable'
+ ]
+};
+
-$result_converted{'plaintext'}->{'multitable'} = 'mu-ltitable headitem another tab
+
+$result_converted{'plaintext'}->{'multitable'} = 'mu–ltitable headitem another tab
--------------------------------------------------------------------------
-mu-ltitable item multitable tab
-mu-ltitable item 2 multitable tab 2
-lone mu-ltitable item
+mu–ltitable item multitable tab
+mu–ltitable item 2 multitable tab 2
+lone mu–ltitable item
truc bidule
';
$result_converted{'html_text'}->{'multitable'} = '
-<table>
+<table class="multitable">
<thead><tr><th width="60%">mu&ndash;ltitable headitem</th><th width="40%">another tab</th></tr></thead>
-<tr><td width="60%">mu&ndash;ltitable item</td><td width="40%">multitable tab</td></tr>
+<tbody><tr><td width="60%">mu&ndash;ltitable item</td><td width="40%">multitable tab</td></tr>
<tr><td width="60%">mu&ndash;ltitable item 2</td><td width="40%">multitable tab 2
-<span id="index-index-entry-within-multitable"></span></td></tr>
+<a class="index-entry-id" id="index-index-entry-within-multitable"></a></td></tr>
<tr><td width="60%">lone mu&ndash;ltitable item</td></tr>
+</tbody>
</table>
-<table>
-<tr><td>truc</td><td>bidule</td></tr>
+<table class="multitable">
+<tbody><tr><td>truc</td><td>bidule</td></tr>
+</tbody>
</table>
';
$result_converted{'xml'}->{'multitable'} = '
-<multitable spaces=" " endspaces=" "><columnfractions line="0.6 0.4"><columnfraction value="0.6"></columnfraction><columnfraction value="0.4"></columnfraction></columnfractions>
-<thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable headitem </para></entry><entry command="tab" spaces=" "><para>another tab
-</para></entry></row></thead><tbody><row><entry command="item" spaces=" "><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces=" "><para>multitable tab
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.6 0.4"><columnfraction value="0.6"></columnfraction><columnfraction value="0.4"></columnfraction></columnfractions>
+<thead><row><entry command="headitem"> <para>mu&textndash;ltitable headitem </para></entry><entry command="tab"> <para>another tab
+</para></entry></row></thead><tbody><row><entry command="item"> <para>mu&textndash;ltitable item </para></entry><entry command="tab"> <para>multitable tab
<!-- c comment in multitable -->
-</para></entry></row><row><entry command="item" spaces=" "><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab" spaces=" "><para>multitable tab 2
+</para></entry></row><row><entry command="item"> <para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"> <para>multitable tab 2
<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index entry within multitable</indexterm></cindex>
-</para></entry></row><row><entry command="item" spaces=" "><para>lone mu&textndash;ltitable item
+</para></entry></row><row><entry command="item"> <para>lone mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype bracketed="on">truc</columnprototype> <columnprototype bracketed="on">bidule</columnprototype></columnprototypes>
-<tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry command="tab" spaces=" "><para>bidule
+<tbody><row><entry command="item"> <para>truc </para></entry><entry command="tab"> <para>bidule
</para></entry></row></tbody></multitable>
';
+$result_converted{'latex_text'}->{'multitable'} = '
+\\begin{tabular}{m{0.6\\textwidth} m{0.4\\textwidth}}%
+mu--ltitable headitem &another tab\\\\
+mu--ltitable item &multitable tab\\\\
+mu--ltitable item 2 &multitable tab 2
+\\index[cp]{index entry within multitable@index entry within multitable}%
+\\\\
+lone mu--ltitable item&\\\\
+\\end{tabular}%
+
+\\begin{tabular}{m{0.4\\textwidth} m{0.6\\textwidth}}%
+truc &bidule\\\\
+\\end{tabular}%
+';
+
+
$result_converted{'docbook'}->{'multitable'} = '
<informaltable><tgroup cols="2"><colspec colwidth="60*"></colspec><colspec colwidth="40*"></colspec><thead><row><entry><para>mu&#8211;ltitable headitem </para></entry><entry><para>another tab
</para></entry></row></thead><tbody><row><entry><para>mu&#8211;ltitable item </para></entry><entry><para>multitable tab
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/nested_block_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage/nested_block_commands.pl
index a3dd3188c1..7642fc2e30 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/nested_block_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/nested_block_commands.pl
@@ -1,313 +1,313 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'nested_block_commands'} = {
'contents' => [
{
- 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'In group
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'cmdname' => 'quotation',
+ 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'contents' => [
+ {
+ 'text' => 'In group
+'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
'contents' => [
{
- 'parent' => {},
- 'text' => 'in quotation
+ 'contents' => [
+ {
+ 'text' => 'in quotation
'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 6,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'cmdname' => 'quotation',
+ 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
'contents' => [
{
- 'parent' => {},
- 'text' => 'in quotation
+ 'contents' => [
+ {
+ 'text' => 'in quotation
'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 12,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
+ 'cmdname' => 'group',
'contents' => [
{
- 'parent' => {},
- 'text' => 'In group
+ 'contents' => [
+ {
+ 'text' => 'In group
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ ],
+ 'type' => 'paragraph'
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'in quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ }
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in quotation
+ 'text' => 'after quotation
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
@@ -315,952 +315,808 @@ $result_trees{'nested_block_commands'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 20,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'after quotation
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 20,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 14,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
+ 'cmdname' => 'group',
'contents' => [
{
- 'parent' => {},
- 'text' => 'In group sp b
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in quotation
+ 'text' => 'In group sp b
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
'args' => [
{
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'in quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 25,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 27,
+ 'line_nr' => 28,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 25,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 28,
+ 'line_nr' => 22,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 22,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'In group sp b a
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
+ 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in quotation
+ 'text' => 'In group sp b a
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
'args' => [
{
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'in quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 36,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 34,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 36,
+ 'line_nr' => 37,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 34,
+ 'line_nr' => 30,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 37,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 30,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
+ 'cmdname' => 'group',
'contents' => [
{
- 'parent' => {},
- 'text' => 'In group sp a
+ 'contents' => [
+ {
+ 'text' => 'In group sp a
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'quotation',
- 'contents' => [
+ }
+ ],
+ 'type' => 'paragraph'
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
'contents' => [
{
- 'parent' => {},
- 'text' => 'in quotation
+ 'contents' => [
+ {
+ 'text' => 'in quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 44,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 42,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 44,
+ 'line_nr' => 45,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 42,
+ 'line_nr' => 39,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 45,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 39,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'cmdname' => 'quotation',
+ 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
'contents' => [
{
- 'parent' => {},
- 'text' => 'in quotation sp b
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'in quotation sp b
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 51,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 48,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 51,
+ 'line_nr' => 52,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 52,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 47,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'cmdname' => 'quotation',
+ 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'text' => '
',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => '
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'in quotation sp b a
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'parent' => {},
- 'text' => 'in quotation sp b a
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 59,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 55,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 59,
+ 'line_nr' => 60,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 60,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 54,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'cmdname' => 'quotation',
+ 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'in quotation sp a
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'in quotation sp a
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 66,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 63,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 66,
+ 'line_nr' => 67,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 63,
+ 'line_nr' => 62,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 67,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 62,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'cmdname' => 'quotation',
+ 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'in quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 72,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 70,
+ 'macro' => ''
+ }
+ },
+ {
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in quotation
+ 'text' => 'After quotation sp b
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
@@ -1268,195 +1124,153 @@ $result_trees{'nested_block_commands'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 72,
+ 'line_nr' => 75,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 70,
+ 'line_nr' => 69,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'After quotation sp b
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 75,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 69,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'cmdname' => 'quotation',
+ 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'in quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 80,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 78,
+ 'macro' => ''
+ }
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in quotation
+ 'text' => 'After quotation sp a
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 80,
+ 'line_nr' => 83,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 78,
+ 'line_nr' => 77,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'After quotation sp a
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -1464,426 +1278,127 @@ $result_trees{'nested_block_commands'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 83,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 77,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'group',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'cmdname' => 'quotation',
+ 'cmdname' => 'group',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'in quotation
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 88,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 86,
+ 'macro' => ''
+ }
+ },
+ {
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'in quotation
+ 'text' => 'After quotation sp b a
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'text' => 'group'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'text_arg' => 'group'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 88,
+ 'line_nr' => 92,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 86,
+ 'line_nr' => 85,
'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'After quotation sp b a
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'group'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'group',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'group'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 92,
- 'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 85,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[2]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[4]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[4]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[4]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[5]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[6];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[4]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[4]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[6];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[6]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[6]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[7]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[8];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[4]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[5]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[5];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[5]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[8];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[8]{'contents'}[5];
-$result_trees{'nested_block_commands'}{'contents'}[8]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[9]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[10];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[4]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[4]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[10];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[10]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[10]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[11]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[12];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[3]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[12];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[12]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[12]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[13]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[14];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[14];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[14]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[14]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[15]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[16];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[3]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[16];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[16]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[16]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[17]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[18];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[4]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[4]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[18];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[18]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[18]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[19]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[20];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[4]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[4]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[20];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[20]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[20]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[21]{'parent'} = $result_trees{'nested_block_commands'};
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[22];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[1]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[2]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[3]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[4]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[5]{'args'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[5];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[5]{'parent'} = $result_trees{'nested_block_commands'}{'contents'}[22];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'extra'}{'end_command'} = $result_trees{'nested_block_commands'}{'contents'}[22]{'contents'}[5];
-$result_trees{'nested_block_commands'}{'contents'}[22]{'parent'} = $result_trees{'nested_block_commands'};
$result_texis{'nested_block_commands'} = '@group
In group
@@ -2073,75 +1588,75 @@ $result_converted{'plaintext'}->{'nested_block_commands'} = 'In group
';
-$result_converted{'html_text'}->{'nested_block_commands'} = '<p>In group
-</p><blockquote>
+$result_converted{'html_text'}->{'nested_block_commands'} = '<div class="group"><p>In group
+</p><blockquote class="quotation">
<p>in quotation
</p></blockquote>
-
-<blockquote>
+</div>
+<div class="group"><blockquote class="quotation">
<p>in quotation
</p></blockquote>
-
-<p>In group
-</p><blockquote>
+</div>
+<div class="group"><p>In group
+</p><blockquote class="quotation">
<p>in quotation
</p></blockquote>
<p>after quotation
-</p>
-
+</p></div>
+<div class="group">
<p>In group sp b
-</p><blockquote>
+</p><blockquote class="quotation">
<p>in quotation
</p></blockquote>
-
-
+</div>
+<div class="group">
<p>In group sp b a
</p>
-<blockquote>
+<blockquote class="quotation">
<p>in quotation
</p></blockquote>
-
-<p>In group sp a
+</div>
+<div class="group"><p>In group sp a
</p>
-<blockquote>
+<blockquote class="quotation">
<p>in quotation
</p></blockquote>
-
-<blockquote>
+</div>
+<div class="group"><blockquote class="quotation">
<p>in quotation sp b
</p></blockquote>
-
-<blockquote>
+</div>
+<div class="group"><blockquote class="quotation">
<p>in quotation sp b a
</p>
</blockquote>
-
-<blockquote>
+</div>
+<div class="group"><blockquote class="quotation">
<p>in quotation sp a
</p>
</blockquote>
-
-<blockquote>
+</div>
+<div class="group"><blockquote class="quotation">
<p>in quotation
</p></blockquote>
<p>After quotation sp b
-</p>
-<blockquote>
+</p></div>
+<div class="group"><blockquote class="quotation">
<p>in quotation
</p></blockquote>
<p>After quotation sp a
</p>
-
-<blockquote>
+</div>
+<div class="group"><blockquote class="quotation">
<p>in quotation
</p></blockquote>
<p>After quotation sp b a
</p>
-';
+</div>';
$result_converted{'xml'}->{'nested_block_commands'} = '<group endspaces=" ">
@@ -2239,6 +1754,77 @@ $result_converted{'xml'}->{'nested_block_commands'} = '<group endspaces=" ">
';
+$result_converted{'latex_text'}->{'nested_block_commands'} = 'In group
+\\begin{quote}
+in quotation
+\\end{quote}
+
+\\begin{quote}
+in quotation
+\\end{quote}
+
+In group
+\\begin{quote}
+in quotation
+\\end{quote}
+after quotation
+
+
+In group sp b
+\\begin{quote}
+in quotation
+\\end{quote}
+
+
+In group sp b a
+
+\\begin{quote}
+in quotation
+\\end{quote}
+
+In group sp a
+
+\\begin{quote}
+in quotation
+\\end{quote}
+
+\\begin{quote}
+
+in quotation sp b
+\\end{quote}
+
+\\begin{quote}
+
+in quotation sp b a
+
+\\end{quote}
+
+\\begin{quote}
+in quotation sp a
+
+\\end{quote}
+
+\\begin{quote}
+in quotation
+\\end{quote}
+
+After quotation sp b
+
+\\begin{quote}
+in quotation
+\\end{quote}
+After quotation sp a
+
+
+\\begin{quote}
+in quotation
+\\end{quote}
+
+After quotation sp b a
+
+';
+
+
$result_converted{'docbook'}->{'nested_block_commands'} = '<para>In group
</para><blockquote><para>in quotation
</para></blockquote>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/not_i_j_in_dotless.pl b/macros/texinfo/texinfo/tp/t/results/coverage/not_i_j_in_dotless.pl
index 05b7522af5..8859733760 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/not_i_j_in_dotless.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/not_i_j_in_dotless.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,96 +10,76 @@ $result_trees{'not_i_j_in_dotless'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'space_command_arg'
- }
- ],
- 'cmdname' => 'dotless',
- 'contents' => [],
- 'extra' => {
- 'spaces' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' bc, '
- },
- {
- 'args' => [
+ 'cmdname' => 'dotless',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' bc, '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'q'
+ 'contents' => [
+ {
+ 'text' => 'q'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'dotless',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'dotless',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.'
}
],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '.'
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[0];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'};
$result_texis{'not_i_j_in_dotless'} = '@dotless a bc, @^{@dotless{q}}.';
@@ -108,7 +88,7 @@ $result_texts{'not_i_j_in_dotless'} = 'a bc, q^.';
$result_errors{'not_i_j_in_dotless'} = [
{
- 'error_line' => ':1: @dotless expects `i\' or `j\' as argument, not `a\'
+ 'error_line' => '@dotless expects `i\' or `j\' as argument, not `a\'
',
'file_name' => '',
'line_nr' => 1,
@@ -117,7 +97,7 @@ $result_errors{'not_i_j_in_dotless'} = [
'type' => 'error'
},
{
- 'error_line' => ':1: @dotless expects `i\' or `j\' as argument, not `q\'
+ 'error_line' => '@dotless expects `i\' or `j\' as argument, not `q\'
',
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/preformatted.pl b/macros/texinfo/texinfo/tp/t/results/coverage/preformatted.pl
index 160c263879..a73d17779b 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/preformatted.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/preformatted.pl
@@ -1,338 +1,267 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'preformatted'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'example',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'e--xample some
-'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
+ 'args' => [
{
- 'parent' => {},
- 'text' => ' text
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'preformatted'
- },
- {
- 'args' => [
+ 'cmdname' => 'example',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'example'
+ 'text' => 'e--xample some
+'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'text' => ' text
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'example'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'example'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'example',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'example'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 2,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'format',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'args' => [
{
- 'contents' => [
- {
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'block_line_arg'
}
],
- 'cmdname' => 'vtable',
+ 'cmdname' => 'format',
'contents' => [
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'vtable',
'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'item in table in format'
+ 'contents' => [
+ {
+ 'text' => 'item in table in format'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'item',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_number' => 1,
+ 'in_code' => 1,
+ 'index_at_command' => 'item',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'vr',
+ 'index_type_command' => 'vtable'
+ },
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'extra' => {
- 'index_entry' => {
- 'command' => {},
- 'content' => [],
- 'content_normalized' => [],
- 'in_code' => 1,
- 'index_at_command' => 'item',
- 'index_name' => 'vr',
- 'index_type_command' => 'vtable',
- 'key' => 'item in table in format',
- 'number' => 1
- },
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 10,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'text' => 'in table in format
+'
+ }
+ ],
+ 'type' => 'preformatted'
+ }
+ ],
+ 'type' => 'table_item'
}
],
- 'parent' => {},
- 'type' => 'table_term'
+ 'type' => 'table_entry'
},
{
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'parent' => {},
- 'text' => 'in table in format
-'
+ 'text' => 'vtable'
}
],
- 'parent' => {},
- 'type' => 'preformatted'
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'table_item'
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'vtable'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'table_entry'
+ 'extra' => {
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'vtable'
+ 'text' => 'format'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'vtable',
'spaces_before_argument' => ' ',
- 'text_arg' => 'vtable'
+ 'text_arg' => 'format'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 14,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'format'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'format',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'format'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 8,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'preformatted'}{'contents'}[0]{'parent'} = $result_trees{'preformatted'};
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'preformatted'}{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[1]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'preformatted'}{'contents'}[1]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'preformatted'}{'contents'}[1]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'preformatted'}{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[1]{'contents'}[2];
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'preformatted'}{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'preformatted'}{'contents'}[1]{'contents'}[2];
-$result_trees{'preformatted'}{'contents'}[1]{'parent'} = $result_trees{'preformatted'};
-$result_trees{'preformatted'}{'contents'}[2]{'parent'} = $result_trees{'preformatted'};
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'preformatted'}{'contents'}[3];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'preformatted'}{'contents'}[3];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[2];
-$result_trees{'preformatted'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'preformatted'}{'contents'}[3];
-$result_trees{'preformatted'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[2];
-$result_trees{'preformatted'}{'contents'}[3]{'parent'} = $result_trees{'preformatted'};
+$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'} = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_texis{'preformatted'} = '
@example
@@ -363,7 +292,7 @@ in table in format
$result_errors{'preformatted'} = [
{
- 'error_line' => ':10: warning: entry for index `vr\' outside of any node
+ 'error_line' => 'warning: entry for index `vr\' outside of any node
',
'file_name' => '',
'line_nr' => 10,
@@ -377,12 +306,19 @@ $result_errors{'preformatted'} = [
$result_floats{'preformatted'} = {};
+$result_indices_sort_strings{'preformatted'} = {
+ 'vr' => [
+ 'item in table in format'
+ ]
+};
+
+
$result_converted{'plaintext'}->{'preformatted'} = ' e--xample some
text
-\'item in table in format\'
+‘item in table in format’
in table in format
';
@@ -390,15 +326,15 @@ $result_converted{'plaintext'}->{'preformatted'} = ' e--xample some
$result_converted{'html_text'}->{'preformatted'} = '
<div class="example">
-<pre class="example">e--xample some
+<pre class="example-preformatted">e--xample some
text
</pre></div>
<div class="format">
-<dl compact="compact">
-<dt id=\'index-item-in-table-in-format\'><span><code>item in table in format</code><a href=\'#index-item-in-table-in-format\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dd><pre class="format">
+<dl class="vtable">
+<dt id=\'index-item-in-table-in-format\'><span><code class="code">item in table in format</code><a class="copiable-link" href=\'#index-item-in-table-in-format\'> &para;</a></span></dt>
+<dd><pre class="format-preformatted">
in table in format
</pre></dd>
@@ -424,14 +360,36 @@ in table in format
';
+$result_converted{'latex_text'}->{'preformatted'} = '
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily e{-}{-}xample some
+
+\\ text
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+
+\\begin{description}
+\\item[{\\parbox[b]{\\linewidth}{%
+\\texttt{item in table in format}
+\\index[vr]{item in table in format@\\texttt{item in table in format}}%
+}}]
+\\begin{Texinfopreformatted}%
+
+in table in format
+\\end{Texinfopreformatted}
+\\end{description}
+';
+
+
$result_converted{'docbook'}->{'preformatted'} = '
<screen>e--xample some
text
</screen>
<variablelist><varlistentry><term><indexterm role="vr"><primary>item in table in format</primary></indexterm><literal>item in table in format</literal>
-</term><listitem><abstract>
+</term><listitem><literallayout>
in table in format
-</abstract></listitem></varlistentry></variablelist>';
+</literallayout></listitem></varlistentry></variablelist>';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl
index 1867018cf6..6498d35b8c 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,21 +10,18 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
}
],
- 'parent' => {},
- 'type' => 'text_root'
+ 'type' => 'before_node_section'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
'text' => 'node! After punc'
}
],
@@ -32,12 +29,10 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'node',
- 'contents' => [],
'extra' => {
'isindex' => 1,
'node_content' => [
@@ -54,19 +49,17 @@ $result_trees{'punctuation_in_line_commands'} = {
'normalized' => 'node_0021-After-punc',
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 2,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
'text' => 'top! After punc'
}
],
@@ -74,14 +67,12 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'top',
'contents' => [
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -92,13 +83,11 @@ $result_trees{'punctuation_in_line_commands'} = {
'contents' => [
{
'cmdname' => 'asis',
- 'contents' => [],
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 5,
'macro' => ''
},
- 'parent' => {},
'type' => 'command_as_argument'
}
],
@@ -106,7 +95,6 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'block_line_arg'
}
],
@@ -121,7 +109,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'item! After punc'
}
],
@@ -129,7 +116,6 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
@@ -137,19 +123,16 @@ $result_trees{'punctuation_in_line_commands'} = {
'extra' => {
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 6,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'parent' => {},
'type' => 'table_term'
}
],
- 'parent' => {},
'type' => 'table_entry'
},
{
@@ -157,7 +140,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'table'
}
],
@@ -165,38 +147,32 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'table',
'spaces_before_argument' => ' ',
'text_arg' => 'table'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 7,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
'extra' => {
'command_as_argument' => {},
- 'end_command' => {},
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 5,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -206,7 +182,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'quotation arg! After punc'
}
],
@@ -214,7 +189,6 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'block_line_arg'
}
],
@@ -223,12 +197,10 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'In quotation
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
@@ -236,7 +208,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'exdent quotation! After punc'
}
],
@@ -244,7 +215,6 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
@@ -252,19 +222,17 @@ $result_trees{'punctuation_in_line_commands'} = {
'extra' => {
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 11,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
'text' => 'quotation'
}
],
@@ -272,37 +240,31 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
'spaces_before_argument' => ' ',
'text_arg' => 'quotation'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 12,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
'extra' => {
- 'end_command' => {},
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 9,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -312,17 +274,14 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'float type! After punc'
}
],
- 'parent' => {},
'type' => 'block_line_arg'
},
{
'contents' => [
{
- 'parent' => {},
'text' => 'float label! After punc'
}
],
@@ -331,7 +290,6 @@ $result_trees{'punctuation_in_line_commands'} = {
',
'spaces_before_argument' => ' '
},
- 'parent' => {},
'type' => 'block_line_arg'
}
],
@@ -340,12 +298,10 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'In float
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
@@ -355,32 +311,26 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'shortcaption! After punc'
}
],
- 'parent' => {},
'type' => 'paragraph'
}
],
- 'parent' => {},
'type' => 'brace_command_context'
}
],
'cmdname' => 'shortcaption',
- 'contents' => [],
'extra' => {
'float' => {}
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 16,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
'
},
@@ -389,7 +339,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'float'
}
],
@@ -397,26 +346,22 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'float',
'spaces_before_argument' => ' ',
'text_arg' => 'float'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 17,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
'extra' => {
- 'end_command' => {},
'float_section' => {},
'node_content' => [
{}
@@ -431,16 +376,13 @@ $result_trees{'punctuation_in_line_commands'} = {
'normalized' => 'float type! After punc'
}
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 14,
'macro' => ''
- },
- 'number' => 1,
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -450,17 +392,14 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'float type! After punc'
}
],
- 'parent' => {},
'type' => 'block_line_arg'
},
{
'contents' => [
{
- 'parent' => {},
'text' => 'label with caption'
}
],
@@ -469,7 +408,6 @@ $result_trees{'punctuation_in_line_commands'} = {
',
'spaces_before_argument' => ' '
},
- 'parent' => {},
'type' => 'block_line_arg'
}
],
@@ -478,12 +416,10 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'In float with caption.
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
@@ -493,32 +429,26 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'caption! After punc'
}
],
- 'parent' => {},
'type' => 'paragraph'
}
],
- 'parent' => {},
'type' => 'brace_command_context'
}
],
'cmdname' => 'caption',
- 'contents' => [],
'extra' => {
'float' => {}
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 21,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
'
},
@@ -527,7 +457,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'float'
}
],
@@ -535,27 +464,23 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'float',
'spaces_before_argument' => ' ',
'text_arg' => 'float'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 22,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
'extra' => {
'caption' => {},
- 'end_command' => {},
'float_section' => {},
'node_content' => [
{}
@@ -569,16 +494,13 @@ $result_trees{'punctuation_in_line_commands'} = {
'normalized' => 'float type! After punc'
}
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 19,
'macro' => ''
- },
- 'number' => 2,
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -588,7 +510,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'float type! After punc'
}
],
@@ -596,7 +517,6 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
@@ -610,15 +530,13 @@ $result_trees{'punctuation_in_line_commands'} = {
'normalized' => 'float type! After punc'
}
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 24,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -628,7 +546,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'index! After punc'
}
],
@@ -636,36 +553,33 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
'cmdname' => 'cindex',
'extra' => {
'index_entry' => {
- 'command' => {},
- 'content' => [],
'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 1,
'in_code' => 0,
'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {},
'index_name' => 'cp',
- 'index_type_command' => 'cindex',
- 'key' => 'index! After punc',
- 'node' => {},
- 'number' => 1
+ 'index_type_command' => 'cindex'
},
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 26,
'macro' => ''
},
- 'parent' => {},
'type' => 'index_entry_command'
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -675,7 +589,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'heading! After punc'
}
],
@@ -683,7 +596,6 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
@@ -691,16 +603,13 @@ $result_trees{'punctuation_in_line_commands'} = {
'extra' => {
'spaces_before_argument' => ' '
},
- 'level' => 2,
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 28,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -710,30 +619,24 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'titlefont! After punc'
}
],
- 'parent' => {},
'type' => 'brace_command_arg'
}
],
'cmdname' => 'titlefont',
- 'contents' => [],
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 30,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
'
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -743,7 +646,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'center! After punc'
}
],
@@ -751,7 +653,6 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
@@ -759,15 +660,13 @@ $result_trees{'punctuation_in_line_commands'} = {
'extra' => {
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 32,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -777,7 +676,6 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'contents' => [
{
- 'parent' => {},
'text' => 'cp'
}
],
@@ -785,7 +683,6 @@ $result_trees{'punctuation_in_line_commands'} = {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
@@ -796,15 +693,13 @@ $result_trees{'punctuation_in_line_commands'} = {
],
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 34,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -812,22 +707,19 @@ $result_trees{'punctuation_in_line_commands'} = {
{
'args' => [
{
- 'parent' => {},
'text' => '
',
'type' => 'misc_arg'
}
],
'cmdname' => 'contents',
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 36,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
'text' => '
',
'type' => 'empty_line'
@@ -836,132 +728,33 @@ $result_trees{'punctuation_in_line_commands'} = {
'extra' => {
'spaces_before_argument' => ' '
},
- 'level' => 0,
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
'line_nr' => 3,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
'type' => 'document_root'
};
-$result_trees{'punctuation_in_line_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'};
-$result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
$result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'};
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'float'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'float_section'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[0];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'type'}{'content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'float'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[0];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'type'}{'content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[9]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[9];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[9]{'extra'}{'type'}{'content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'node'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[12]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[13]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[13];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[13]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[14]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[15]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[15];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[15]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[16]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[17]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[18]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[18];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[18]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[19]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[20]{'args'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[20];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[20]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[21]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[22];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[22]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[23]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_line_commands'};
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
$result_texis{'punctuation_in_line_commands'} = '
@node node! After punc
@@ -1035,41 +828,40 @@ center! After punc
';
$result_sectioning{'punctuation_in_line_commands'} = {
- 'level' => -1,
- 'section_childs' => [
- {
- 'cmdname' => 'top',
- 'extra' => {
- 'associated_node' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'isindex' => 1,
- 'normalized' => 'node_0021-After-punc',
- 'spaces_before_argument' => ' '
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'isindex' => 1,
+ 'normalized' => 'node_0021-After-punc'
+ }
}
},
- 'spaces_before_argument' => ' '
- },
- 'level' => 0,
- 'section_up' => {}
- }
- ]
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
};
-$result_sectioning{'punctuation_in_line_commands'}{'section_childs'}[0]{'section_up'} = $result_sectioning{'punctuation_in_line_commands'};
+$result_sectioning{'punctuation_in_line_commands'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'} = $result_sectioning{'punctuation_in_line_commands'};
$result_nodes{'punctuation_in_line_commands'} = {
'cmdname' => 'node',
'extra' => {
'associated_section' => {
'cmdname' => 'top',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'level' => 0
+ 'extra' => {},
+ 'structure' => {}
},
'isindex' => 1,
- 'normalized' => 'node_0021-After-punc',
- 'spaces_before_argument' => ' '
+ 'normalized' => 'node_0021-After-punc'
}
};
@@ -1077,8 +869,7 @@ $result_menus{'punctuation_in_line_commands'} = {
'cmdname' => 'node',
'extra' => {
'isindex' => 1,
- 'normalized' => 'node_0021-After-punc',
- 'spaces_before_argument' => ' '
+ 'normalized' => 'node_0021-After-punc'
}
};
@@ -1090,20 +881,10 @@ $result_floats{'punctuation_in_line_commands'} = {
{
'cmdname' => 'float',
'extra' => {
- 'end_command' => {
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'float',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'float'
- }
- },
'float_section' => {
'cmdname' => 'top',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'level' => 0
+ 'extra' => {},
+ 'structure' => {}
},
'normalized' => 'float-label_0021-After-punc',
'shortcaption' => {
@@ -1112,7 +893,6 @@ $result_floats{'punctuation_in_line_commands'} = {
'float' => {}
}
},
- 'spaces_before_argument' => ' ',
'type' => {
'content' => [
{
@@ -1122,7 +902,9 @@ $result_floats{'punctuation_in_line_commands'} = {
'normalized' => 'float type! After punc'
}
},
- 'number' => 1
+ 'structure' => {
+ 'float_number' => 1
+ }
},
{
'cmdname' => 'float',
@@ -1133,17 +915,8 @@ $result_floats{'punctuation_in_line_commands'} = {
'float' => {}
}
},
- 'end_command' => {
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'float',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'float'
- }
- },
'float_section' => {},
'normalized' => 'label-with-caption',
- 'spaces_before_argument' => ' ',
'type' => {
'content' => [
{
@@ -1153,7 +926,9 @@ $result_floats{'punctuation_in_line_commands'} = {
'normalized' => 'float type! After punc'
}
},
- 'number' => 2
+ 'structure' => {
+ 'float_number' => 2
+ }
}
]
};
@@ -1162,6 +937,13 @@ $result_floats{'punctuation_in_line_commands'}{'float type! After punc'}[1]{'ext
$result_floats{'punctuation_in_line_commands'}{'float type! After punc'}[1]{'extra'}{'float_section'} = $result_floats{'punctuation_in_line_commands'}{'float type! After punc'}[0]{'extra'}{'float_section'};
+$result_indices_sort_strings{'punctuation_in_line_commands'} = {
+ 'cp' => [
+ 'index! After punc'
+ ]
+};
+
+
$result_converted{'plaintext'}->{'punctuation_in_line_commands'} = 'top! After punc
***************
@@ -1205,55 +987,51 @@ top! After punc
$result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
-<div class="top" id="node_0021-After-punc">
-<span id="top_0021-After-punc"></span><h1 class="top">top! After punc</h1>
+<div class="top-level-extent" id="node_0021-After-punc">
+<h1 class="top" id="top_0021-After-punc">top! After punc</h1>
-<dl compact="compact">
-<dt><span>item! After punc</span></dt>
+<dl class="table">
+<dt>item! After punc</dt>
</dl>
-<blockquote>
-<p><b>quotation arg! After punc:</b> In quotation
-</p><p>exdent quotation! After punc
+<blockquote class="quotation">
+<p><b class="b">quotation arg! After punc:</b> In quotation
+</p><p class="exdent">exdent quotation! After punc
</p></blockquote>
-<div class="float"><span id="float-label_0021-After-punc"></span>
+<div class="float" id="float-label_0021-After-punc">
<p>In float
</p>
-<div class="float-caption"><p><strong>float type! After punc 1: </strong>shortcaption! After punc</p></div></div>
-<div class="float"><span id="label-with-caption"></span>
+<div class="shortcaption"><p><strong class="strong">float type! After punc 1: </strong>shortcaption! After punc</p></div></div>
+<div class="float" id="label-with-caption">
<p>In float with caption.
</p>
-<div class="float-caption"><p><strong>float type! After punc 2: </strong>caption! After punc</p></div></div>
+<div class="caption"><p><strong class="strong">float type! After punc 2: </strong>caption! After punc</p></div></div>
<dl class="listoffloats">
-<dt><a href="#float-label_0021-After-punc">float type! After punc 1</a></dt><dd><p>shortcaption! After punc</p></dd>
-<dt><a href="#label-with-caption">float type! After punc 2</a></dt><dd><p>caption! After punc</p></dd>
+<dt><a href="#float-label_0021-After-punc">float type! After punc 1</a></dt><dd class="shortcaption-in-listoffloats"><p>shortcaption! After punc</p></dd>
+<dt><a href="#label-with-caption">float type! After punc 2</a></dt><dd class="caption-in-listoffloats"><p>caption! After punc</p></dd>
</dl>
-<span id="index-index_0021-After-punc"></span>
+<a class="index-entry-id" id="index-index_0021-After-punc"></a>
-<span id="heading_0021-After-punc"></span><h3 class="heading">heading! After punc</h3>
+<h3 class="heading" id="heading_0021-After-punc">heading! After punc</h3>
<h1 class="titlefont">titlefont! After punc</h1>
-<div align="center">center! After punc
+<div class="center">center! After punc
</div>
-<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#t_h_cp_letter-I"><b>I</b></a>
- &nbsp;
-</td></tr></table>
-<table class="index-cp" border="0">
-<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
+<div class="printindex cp-printindex">
+<table class="cp-entries-printindex" border="0">
+<tr><td></td><th class="entries-header-printindex">Index Entry</th><td>&nbsp;</td><th class="sections-header-printindex"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th id="t_h_cp_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="#index-index_0021-After-punc">index! After punc</a>:</td><td>&nbsp;</td><td valign="top"><a href="#node_0021-After-punc">node! After punc</a></td></tr>
+<tr><th id="t_i_cp_letter-I">I</th><td></td><td></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-index_0021-After-punc">index! After punc</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a href="#node_0021-After-punc">node! After punc</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
-<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#t_h_cp_letter-I"><b>I</b></a>
- &nbsp;
-</td></tr></table>
+</div>
-<hr></div>
+</div>
';
@@ -1290,7 +1068,7 @@ $result_converted{'xml'}->{'punctuation_in_line_commands'} = '
<center spaces=" ">center! After punc</center>
-<printindex value="cp" line="cp"></printindex>
+<printindex spaces=" " value="cp" line="cp"></printindex>
<contents></contents>
@@ -1298,14 +1076,62 @@ $result_converted{'xml'}->{'punctuation_in_line_commands'} = '
';
-$result_converted{'docbook'}->{'punctuation_in_line_commands'} = '
-<chapter label="" id="node_0021-After-punc">
+$result_converted{'latex_text'}->{'punctuation_in_line_commands'} = '
+\\part*{{top! After punc}}
+\\label{anchor:node_0021-After-punc}%
+
+\\begin{description}
+\\item[{\\parbox[b]{\\linewidth}{%
+item! After punc}}]
+\\end{description}
+
+\\begin{quote}
+\\textbf{quotation arg! After punc:} In quotation
+\\leavevmode{}\\\\
+\\hbox{\\kern -\\leftmargin}%
+exdent quotation! After punc
+\\\\
+\\end{quote}
+
+\\begin{TexinfoFloatfloattypeAfterpunc}
+In float
+\\caption{shortcaption! After punc}
+
+\\label{anchor:float-label_0021-After-punc}%
+\\end{TexinfoFloatfloattypeAfterpunc}
+
+\\begin{TexinfoFloatfloattypeAfterpunc}
+In float with caption.
+\\caption{caption! After punc}
+
+\\label{anchor:label-with-caption}%
+\\end{TexinfoFloatfloattypeAfterpunc}
+
+\\listof{TexinfoFloatfloattypeAfterpunc}{}
+
+\\index[cp]{index"! After punc@index"! After punc}%
+
+\\section*{{heading! After punc}}
+
+{\\huge \\bfseries titlefont! After punc}
+
+\\begin{center}
+center! After punc
+\\end{center}
+
+\\printindex[cp]
+
+
+';
+
+
+$result_converted{'docbook'}->{'punctuation_in_line_commands'} = '<chapter label="" id="node_0021-After-punc">
<title>top! After punc</title>
<variablelist><varlistentry><term>item! After punc
</term></varlistentry></variablelist>
<blockquote><para><emphasis role="bold">quotation arg! After punc:</emphasis> In quotation
-</para><simpara>exdent quotation! After punc</simpara>
+</para><simpara role="exdent">exdent quotation! After punc</simpara>
</blockquote>
<anchor id="float-label_0021-After-punc"/>
<para>In float
@@ -1322,7 +1148,7 @@ $result_converted{'docbook'}->{'punctuation_in_line_commands'} = '
titlefont! After punc
-center! After punc
+<simpara role="center">center! After punc</simpara>
<index role="cp"></index>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl b/macros/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl
index accf00a1de..e28e671845 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl
@@ -1,106 +1,43 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'quotation_author'} = {
'contents' => [
{
- 'cmdname' => 'quotation',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
'args' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'First Author'
- }
- ],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'author',
- 'extra' => {
- 'quotation' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
+ 'cmdname' => 'quotation',
'contents' => [
{
- 'parent' => {},
- 'text' => 'quotation
-'
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'S'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'e'
- }
- ],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => 'cond author'
+ 'text' => 'First Author'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
@@ -109,102 +46,126 @@ $result_trees{'quotation_author'} = {
'quotation' => {},
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
- },
- 'parent' => {}
+ }
},
{
- 'parent' => {},
- 'text' => 'quotation continues.
+ 'contents' => [
+ {
+ 'text' => 'quotation
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'S'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'cond author'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'author',
+ 'extra' => {
+ 'quotation' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'quotation continues.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'quotation'
+ 'contents' => [
+ {
+ 'text' => 'quotation'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'quotation'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'quotation',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'quotation'
+ 'authors' => [
+ {},
+ {}
+ ]
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'authors' => [
- {},
- {}
- ],
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'quotation_author'}{'contents'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[2];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[2]{'extra'}{'quotation'} = $result_trees{'quotation_author'}{'contents'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'quotation'} = $result_trees{'quotation_author'}{'contents'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[5]{'args'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[5];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0];
-$result_trees{'quotation_author'}{'contents'}[0]{'extra'}{'authors'}[0] = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[2];
-$result_trees{'quotation_author'}{'contents'}[0]{'extra'}{'authors'}[1] = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'quotation_author'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[5];
-$result_trees{'quotation_author'}{'contents'}[0]{'parent'} = $result_trees{'quotation_author'};
+$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'quotation'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0];
+$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'quotation'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0];
+$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'extra'}{'authors'}[0] = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'extra'}{'authors'}[1] = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
$result_texis{'quotation_author'} = '@quotation
@@ -218,7 +179,9 @@ quotation continues.
$result_texts{'quotation_author'} = '
+First Author
quotation
+Se~cond author
quotation continues.
';
@@ -232,19 +195,19 @@ $result_floats{'quotation_author'} = {};
$result_converted{'plaintext'}->{'quotation_author'} = ' quotation quotation continues.
- -- _First Author_
- -- _Sẽcond author_
+ — _First Author_
+ — _Sẽcond author_
';
-$result_converted{'html_text'}->{'quotation_author'} = '<blockquote>
+$result_converted{'html_text'}->{'quotation_author'} = '<blockquote class="quotation">
<p>quotation
quotation continues.
</p>
</blockquote>
-<div align="center">&mdash; <em>First Author</em>
-</div><div align="center">&mdash; <em>S&#7869;cond author</em>
+<div class="center">&mdash; <em class="emph">First Author</em>
+</div><div class="center">&mdash; <em class="emph">S&#7869;cond author</em>
</div>';
@@ -259,6 +222,21 @@ quotation continues.
';
+$result_converted{'latex_text'}->{'quotation_author'} = '\\begin{quote}
+
+quotation
+quotation continues.
+
+\\end{quote}
+\\begin{center}
+--- \\emph{First Author}
+\\end{center}
+\\begin{center}
+--- \\emph{S\\~{e}cond author}
+\\end{center}
+';
+
+
$result_converted{'docbook'}->{'quotation_author'} = '<blockquote><attribution>First Author</attribution>
<attribution>S&#7869;cond author</attribution>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/raggedright.pl b/macros/texinfo/texinfo/tp/t/results/coverage/raggedright.pl
index 96c1a5dc54..ecb3af5e3f 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/raggedright.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/raggedright.pl
@@ -1,95 +1,79 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'raggedright'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'raggedright',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'in raggedright
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ 'cmdname' => 'raggedright',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'raggedright'
+ 'text' => 'in raggedright
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'raggedright'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'raggedright'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'raggedright',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'raggedright'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 2,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'raggedright'}{'contents'}[0]{'parent'} = $result_trees{'raggedright'};
-$result_trees{'raggedright'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'raggedright'}{'contents'}[1];
-$result_trees{'raggedright'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raggedright'}{'contents'}[1];
-$result_trees{'raggedright'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raggedright'}{'contents'}[1]{'contents'}[1];
-$result_trees{'raggedright'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raggedright'}{'contents'}[1];
-$result_trees{'raggedright'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'raggedright'}{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'raggedright'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'raggedright'}{'contents'}[1]{'contents'}[2];
-$result_trees{'raggedright'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'raggedright'}{'contents'}[1];
-$result_trees{'raggedright'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'raggedright'}{'contents'}[1]{'contents'}[2];
-$result_trees{'raggedright'}{'contents'}[1]{'parent'} = $result_trees{'raggedright'};
$result_texis{'raggedright'} = '
@raggedright
@@ -114,8 +98,8 @@ $result_converted{'plaintext'}->{'raggedright'} = 'in raggedright
$result_converted{'html_text'}->{'raggedright'} = '
-<p>in raggedright
-</p>';
+<div class="raggedright"><p class="raggedright-paragraph">in raggedright
+</p></div>';
$result_converted{'xml'}->{'raggedright'} = '
@@ -125,6 +109,13 @@ $result_converted{'xml'}->{'raggedright'} = '
';
+$result_converted{'latex_text'}->{'raggedright'} = '
+\\begin{flushleft}
+in raggedright
+\\end{flushleft}
+';
+
+
$result_converted{'docbook'}->{'raggedright'} = '
<para>in raggedright
</para>';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/setfilename_in_paragraph.pl b/macros/texinfo/texinfo/tp/t/results/coverage/setfilename_in_paragraph.pl
index f99e55c7be..3c9b0502bb 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/setfilename_in_paragraph.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/setfilename_in_paragraph.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,51 +10,46 @@ $result_trees{'setfilename_in_paragraph'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'Some text
+ 'contents' => [
+ {
+ 'text' => 'Some text
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ }
+ ],
+ 'type' => 'paragraph'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'filename.info'
+ 'contents' => [
+ {
+ 'text' => 'filename.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'setfilename',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'filename.info'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'filename.info'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'setfilename_in_paragraph'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'setfilename_in_paragraph'}{'contents'}[0];
-$result_trees{'setfilename_in_paragraph'}{'contents'}[0]{'parent'} = $result_trees{'setfilename_in_paragraph'};
-$result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0];
-$result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'setfilename_in_paragraph'}{'contents'}[1];
-$result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'parent'} = $result_trees{'setfilename_in_paragraph'};
$result_texis{'setfilename_in_paragraph'} = 'Some text
@setfilename filename.info
@@ -84,6 +79,10 @@ $result_converted{'xml'}->{'setfilename_in_paragraph'} = '<para>Some text
';
+$result_converted{'latex_text'}->{'setfilename_in_paragraph'} = 'Some text
+';
+
+
$result_converted{'docbook'}->{'setfilename_in_paragraph'} = '<para>Some text
</para>';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/spaces_after_braced_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/spaces_after_braced_command.pl
index 912534f356..8265749054 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/spaces_after_braced_command.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/spaces_after_braced_command.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,102 +10,293 @@ $result_trees{'spaces_after_braced_command'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'b'
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'code',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'v'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'samp',
+ 'extra' => {
+ 'spaces' => '
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'v'
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'AA',
+ 'extra' => {
+ 'spaces' => '
+ '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'samp',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'b
'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'extra' => {
+ 'spaces' => '
+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'TeX',
+ 'extra' => {
+ 'spaces' => '
+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'spaces_after_braced_command'}{'contents'}[0];
-$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'spaces_after_braced_command'}{'contents'}[0];
-$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'parent'} = $result_trees{'spaces_after_braced_command'};
-$result_trees{'spaces_after_braced_command'}{'contents'}[1]{'parent'} = $result_trees{'spaces_after_braced_command'};
-$result_trees{'spaces_after_braced_command'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'spaces_after_braced_command'}{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'spaces_after_braced_command'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'spaces_after_braced_command'}{'contents'}[2]{'contents'}[0];
-$result_trees{'spaces_after_braced_command'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'spaces_after_braced_command'}{'contents'}[2];
-$result_trees{'spaces_after_braced_command'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'spaces_after_braced_command'}{'contents'}[2];
-$result_trees{'spaces_after_braced_command'}{'contents'}[2]{'parent'} = $result_trees{'spaces_after_braced_command'};
-
-$result_texis{'spaces_after_braced_command'} = '@code{b}
-
-@samp{v}
+
+$result_texis{'spaces_after_braced_command'} = '@code {b}
+
+@samp
+{v}
+
+@AA
+ {}
+
+@email
+{a, b
+ }
+
+@TeX
+
+
';
$result_texts{'spaces_after_braced_command'} = 'b
v
+
+AA
+
+b
+
+
+TeX
+
';
-$result_errors{'spaces_after_braced_command'} = [];
+$result_errors{'spaces_after_braced_command'} = [
+ {
+ 'error_line' => 'warning: command `@samp\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'command `@samp\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@AA\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => '',
+ 'text' => 'command `@AA\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@email\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => '',
+ 'text' => 'command `@email\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@TeX\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => '',
+ 'text' => 'command `@TeX\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@TeX\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => '',
+ 'text' => 'command `@TeX\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => '@TeX expected braces
+',
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => '',
+ 'text' => '@TeX expected braces',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'misplaced {
+',
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => '',
+ 'text' => 'misplaced {',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'misplaced }
+',
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => '',
+ 'text' => 'misplaced }',
+ 'type' => 'error'
+ }
+];
$result_floats{'spaces_after_braced_command'} = {};
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
index e655095063..d68352e6b7 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,32 +10,33 @@ $result_trees{'spaces_no_brace_after_braced_command'} = {
{
'contents' => [
{
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => 'b
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => 'b
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'spaces_no_brace_after_braced_command'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'spaces_no_brace_after_braced_command'}{'contents'}[0];
-$result_trees{'spaces_no_brace_after_braced_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'spaces_no_brace_after_braced_command'}{'contents'}[0];
-$result_trees{'spaces_no_brace_after_braced_command'}{'contents'}[0]{'parent'} = $result_trees{'spaces_no_brace_after_braced_command'};
-$result_texis{'spaces_no_brace_after_braced_command'} = '@codeb
+$result_texis{'spaces_no_brace_after_braced_command'} = '@code b
';
@@ -44,7 +45,7 @@ $result_texts{'spaces_no_brace_after_braced_command'} = 'b
$result_errors{'spaces_no_brace_after_braced_command'} = [
{
- 'error_line' => ':1: @code expected braces
+ 'error_line' => '@code expected braces
',
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl
new file mode 100644
index 0000000000..7e428f5028
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl
@@ -0,0 +1,124 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'spaces_unknown_command_after_braced_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'cmdname' => '~',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'text' => ' e
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'spaces_unknown_command_after_braced_command'} = '@code
+
+@~
+ e
+';
+
+
+$result_texts{'spaces_unknown_command_after_braced_command'} = '
+
+~
+ e
+';
+
+$result_errors{'spaces_unknown_command_after_braced_command'} = [
+ {
+ 'error_line' => '@code expected braces
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@code expected braces',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'unknown command `unknown\'
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'unknown command `unknown\'',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => '@~ expected braces
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@~ expected braces',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'unknown command `notexisting\'
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'unknown command `notexisting\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'spaces_unknown_command_after_braced_command'} = {};
+
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/symbol_after_block.pl b/macros/texinfo/texinfo/tp/t/results/coverage/symbol_after_block.pl
index 3ef6d8c082..3bb9b49e53 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/symbol_after_block.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/symbol_after_block.pl
@@ -1,1776 +1,1423 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'symbol_after_block'} = {
'contents' => [
{
- 'cmdname' => 'html',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'In html
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'rawpreformatted'
- },
- {
- 'args' => [
+ 'cmdname' => 'html',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'html. On the line.'
+ 'text' => 'In html
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'html. On the line.'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'html. On the line.'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'html',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'html. On the line.'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'html',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'In html
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'rawpreformatted'
- },
- {
- 'args' => [
+ 'cmdname' => 'html',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'html'
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
+ 'text' => 'In html
+'
+ }
+ ],
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => ' On the line.'
+ 'contents' => [
+ {
+ 'text' => 'html'
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => ' On the line.'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'html@ On the line.'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'html',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'html@ On the line.'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'parent' => {},
- 'text' => 'Verbatim:
+ 'contents' => [
+ {
+ 'text' => 'Verbatim:
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'verbatim',
- 'contents' => [
+ }
+ ],
+ 'type' => 'paragraph'
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'parent' => {},
- 'text' => 'In verbatim
-',
- 'type' => 'raw'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ';
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'verbatim',
+ 'contents' => [
+ {
+ 'text' => 'In verbatim
',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'verbatim',
- 'contents' => [
+ 'type' => 'raw'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'verbatim;'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'verbatim;'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'parent' => {},
- 'text' => 'In verbatim
+ 'args' => [
+ {
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'verbatim',
+ 'contents' => [
+ {
+ 'text' => 'In verbatim
',
- 'type' => 'raw'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 15,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
- {
- 'cmdname' => '@',
- 'parent' => {}
+ 'type' => 'raw'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'verbatim'
+ },
+ {
+ 'cmdname' => '@'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'verbatim@'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
},
{
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'parent' => {},
- 'text' => 'Table:
+ 'contents' => [
+ {
+ 'text' => 'Table:
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'cmdname' => 'emph',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 21,
- 'macro' => ''
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {},
- 'type' => 'command_as_argument'
+ 'type' => 'block_line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
- {
+ 'cmdname' => 'table',
'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'item',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 22,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'l--ine
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'table_item'
}
],
- 'parent' => {},
- 'type' => 'table_term'
+ 'type' => 'table_entry'
},
{
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'l--ine
-'
+ 'text' => 'table+'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'table_item'
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'table+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 24,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'table_entry'
+ 'extra' => {
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'table+'
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 26,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'table',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'table+'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 24,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 21,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'cmdname' => 'emph',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 26,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
- {
+ 'cmdname' => 'table',
'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'item',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 27,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'parent' => {},
- 'type' => 'table_term'
- },
- {
- 'contents' => [
+ 'type' => 'table_term'
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'l--ine
+ 'contents' => [
+ {
+ 'text' => 'l--ine
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'table_item'
}
],
- 'parent' => {},
- 'type' => 'table_item'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'args' => [
+ 'type' => 'table_entry'
+ },
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'table'
- },
+ 'args' => [
{
- 'cmdname' => '@',
- 'parent' => {}
+ 'contents' => [
+ {
+ 'text' => 'table'
+ },
+ {
+ 'cmdname' => '@'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'table@'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 29,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'table',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'table@'
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 29,
+ 'line_nr' => 26,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 26,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ }
+ },
{
- 'parent' => {},
- 'text' => 'Itemize:
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 33,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'cmdname' => 'item',
'contents' => [
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'e--mph item
+ 'text' => 'Itemize:
'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
}
],
- 'extra' => {
- 'item_number' => 1,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 34,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'itemize\'\''
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 33,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'itemize',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'itemize\'\''
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 35,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 33,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
+ 'cmdname' => 'itemize',
'contents' => [
{
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'line_nr' => {
+ 'cmdname' => 'item',
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'e--mph item
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'item_number' => 1
+ },
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 37,
+ 'line_nr' => 34,
'macro' => ''
- },
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
- {
- 'cmdname' => 'item',
- 'contents' => [
+ }
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'e--mph item
+ 'contents' => [
+ {
+ 'text' => 'itemize\'\''
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'itemize\'\''
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 35,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'item_number' => 1,
+ 'command_as_argument' => {},
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 38,
+ 'line_nr' => 33,
'macro' => ''
- },
- 'parent' => {}
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'itemize'
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 37,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'itemize',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'itemize@'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 39,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 37,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Multitable:
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
+ 'cmdname' => 'itemize',
'contents' => [
{
+ 'cmdname' => 'item',
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'e--mph item
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'item_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 38,
+ 'macro' => ''
+ }
+ },
+ {
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => '6 7'
+ 'text' => 'itemize'
+ },
+ {
+ 'cmdname' => '@'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
- 'cmdname' => 'columnfractions',
+ 'cmdname' => 'end',
'extra' => {
- 'misc_args' => [
- '6',
- '7'
- ],
- 'spaces_before_argument' => ' '
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'itemize@'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 43,
+ 'line_nr' => 39,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'extra' => {
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 37,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
{
'contents' => [
{
+ 'text' => 'Multitable:
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
'contents' => [
{
- 'cmdname' => 'headitem',
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'mu--ltitable headitem '
+ 'text' => '6 7'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
'extra' => {
- 'cell_number' => 1,
+ 'misc_args' => [
+ '6',
+ '7'
+ ],
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => ''
- },
- 'parent' => {}
- },
+ }
+ }
+ ],
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'multitable',
+ 'contents' => [
+ {
+ 'contents' => [
{
- 'cmdname' => 'tab',
'contents' => [
{
+ 'cmdname' => 'headitem',
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'mu--ltitable headitem '
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'cell_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 44,
+ 'macro' => ''
+ }
+ },
+ {
+ 'cmdname' => 'tab',
'contents' => [
{
- 'parent' => {},
- 'text' => 'another tab
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'another tab
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'cell_number' => 2
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 44,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'cell_number' => 2,
- 'spaces_before_argument' => ' '
+ 'row_number' => 1
},
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 44,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'row'
}
],
- 'extra' => {
- 'row_number' => 1
- },
- 'parent' => {},
- 'type' => 'row'
- }
- ],
- 'parent' => {},
- 'type' => 'multitable_head'
- },
- {
- 'contents' => [
+ 'type' => 'multitable_head'
+ },
{
'contents' => [
{
- 'cmdname' => 'item',
'contents' => [
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'mu--ltitable item '
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'mu--ltitable item '
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'extra' => {
- 'cell_number' => 1,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 45,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => 'tab',
- 'contents' => [
+ 'extra' => {
+ 'cell_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 45,
+ 'macro' => ''
+ }
+ },
{
+ 'cmdname' => 'tab',
'contents' => [
{
- 'parent' => {},
- 'text' => 'multitable tab
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'multitable tab
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'cell_number' => 2
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 45,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'cell_number' => 2,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 45,
- 'macro' => ''
+ 'row_number' => 2
},
- 'parent' => {}
+ 'type' => 'row'
}
],
- 'extra' => {
- 'row_number' => 2
- },
- 'parent' => {},
- 'type' => 'row'
- }
- ],
- 'parent' => {},
- 'type' => 'multitable_body'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'multitable^'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'multitable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'multitable^'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 46,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'columnfractions' => {},
- 'end_command' => {},
- 'max_columns' => 2,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 43,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
+ 'type' => 'multitable_body'
+ },
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => '6 7'
+ 'text' => 'multitable^'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
- 'cmdname' => 'columnfractions',
+ 'cmdname' => 'end',
'extra' => {
- 'misc_args' => [
- '6',
- '7'
- ],
- 'spaces_before_argument' => ' '
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'multitable^'
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 48,
+ 'line_nr' => 46,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'extra' => {
+ 'columnfractions' => {},
+ 'max_columns' => 2,
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 43,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
{
'contents' => [
{
- 'cmdname' => 'headitem',
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'mu--ltitable headitem '
+ 'text' => '6 7'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
'extra' => {
- 'cell_number' => 1,
+ 'misc_args' => [
+ '6',
+ '7'
+ ],
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 49,
+ 'line_nr' => 48,
'macro' => ''
- },
- 'parent' => {}
- },
+ }
+ }
+ ],
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'multitable',
+ 'contents' => [
+ {
+ 'contents' => [
{
- 'cmdname' => 'tab',
'contents' => [
{
+ 'cmdname' => 'headitem',
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'mu--ltitable headitem '
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'cell_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 49,
+ 'macro' => ''
+ }
+ },
+ {
+ 'cmdname' => 'tab',
'contents' => [
{
- 'parent' => {},
- 'text' => 'another tab
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'another tab
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'cell_number' => 2
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 49,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'cell_number' => 2,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 49,
- 'macro' => ''
+ 'row_number' => 1
},
- 'parent' => {}
+ 'type' => 'row'
}
],
- 'extra' => {
- 'row_number' => 1
- },
- 'parent' => {},
- 'type' => 'row'
- }
- ],
- 'parent' => {},
- 'type' => 'multitable_head'
- },
- {
- 'contents' => [
+ 'type' => 'multitable_head'
+ },
{
'contents' => [
{
- 'cmdname' => 'item',
'contents' => [
{
+ 'cmdname' => 'item',
'contents' => [
{
- 'parent' => {},
- 'text' => 'mu--ltitable item '
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'mu--ltitable item '
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'extra' => {
- 'cell_number' => 1,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 50,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'cmdname' => 'tab',
- 'contents' => [
+ 'extra' => {
+ 'cell_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 50,
+ 'macro' => ''
+ }
+ },
{
+ 'cmdname' => 'tab',
'contents' => [
{
- 'parent' => {},
- 'text' => 'multitable tab
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'multitable tab
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'cell_number' => 2
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 50,
+ 'macro' => ''
+ }
}
],
'extra' => {
- 'cell_number' => 2,
- 'spaces_before_argument' => ' '
+ 'row_number' => 2
},
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 50,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'row'
}
],
- 'extra' => {
- 'row_number' => 2
- },
- 'parent' => {},
- 'type' => 'row'
- }
- ],
- 'parent' => {},
- 'type' => 'multitable_body'
- },
- {
- 'args' => [
+ 'type' => 'multitable_body'
+ },
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'multitable'
- },
+ 'args' => [
{
- 'cmdname' => '{',
- 'parent' => {}
+ 'contents' => [
+ {
+ 'text' => 'multitable'
+ },
+ {
+ 'cmdname' => '{'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'multitable{'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 51,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'multitable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'multitable{'
+ 'columnfractions' => {},
+ 'max_columns' => 2,
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 51,
+ 'line_nr' => 48,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'columnfractions' => {},
- 'end_command' => {},
- 'max_columns' => 2,
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 48,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Flushleft:
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'flushleft',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'flushleft
+ 'text' => 'Flushleft:
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
'args' => [
{
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'flushleft',
+ 'contents' => [
+ {
'contents' => [
{
- 'parent' => {},
- 'text' => 'flushleft!'
+ 'text' => 'flushleft
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'flushleft!'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'flushleft!'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 57,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'flushleft',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'flushleft!'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 57,
+ 'line_nr' => 55,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 55,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'flushleft',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'flushleft
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ 'cmdname' => 'flushleft',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'flushleft'
- },
+ 'text' => 'flushleft
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
{
- 'cmdname' => '@',
- 'parent' => {}
+ 'contents' => [
+ {
+ 'text' => 'flushleft'
+ },
+ {
+ 'cmdname' => '@'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'flushleft@'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 61,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'flushleft',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'flushleft@'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 61,
+ 'line_nr' => 59,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 59,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Copying:
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'copying',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'Copying
+ 'text' => 'Copying:
'
}
],
- 'parent' => {},
'type' => 'paragraph'
},
{
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
'args' => [
{
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'copying',
+ 'contents' => [
+ {
'contents' => [
{
- 'parent' => {},
- 'text' => 'copying*'
+ 'text' => 'Copying
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'copying*'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'copying*'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 67,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'copying',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'copying*'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 67,
+ 'line_nr' => 65,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 65,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'copying',
- 'contents' => [
+ }
+ },
{
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_line'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Copying
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'args' => [
+ 'cmdname' => 'copying',
+ 'contents' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'copying'
- },
+ 'text' => 'Copying
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
{
- 'cmdname' => '@',
- 'parent' => {}
+ 'contents' => [
+ {
+ 'text' => 'copying'
+ },
+ {
+ 'cmdname' => '@'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'copying@'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 71,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'command_argument' => 'copying',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'copying@'
- },
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 71,
+ 'line_nr' => 69,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'end_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 69,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'symbol_after_block'}{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'symbol_after_block'}{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[2]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[3]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[4];
-$result_trees{'symbol_after_block'}{'contents'}[4]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[5]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'symbol_after_block'}{'contents'}[6];
-$result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[6];
-$result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[6];
-$result_trees{'symbol_after_block'}{'contents'}[6]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[7];
-$result_trees{'symbol_after_block'}{'contents'}[7]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[8]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[0]{'extra'}{'command'} = $result_trees{'symbol_after_block'}{'contents'}[9];
-$result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[9];
-$result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[9];
-$result_trees{'symbol_after_block'}{'contents'}[9]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[10];
-$result_trees{'symbol_after_block'}{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[10];
-$result_trees{'symbol_after_block'}{'contents'}[10]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[11]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[12]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[12];
-$result_trees{'symbol_after_block'}{'contents'}[12]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[13]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[14];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'extra'}{'command_as_argument'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[14]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[15]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[16];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'extra'}{'command_as_argument'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[16]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[17]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[18];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[19]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[20];
-$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[20];
-$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[20];
-$result_trees{'symbol_after_block'}{'contents'}[20]{'extra'}{'command_as_argument'} = $result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[20]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[20]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[21]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[22];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[22];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[22];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'extra'}{'command_as_argument'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[22]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[23]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[24];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[25]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[26];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'extra'}{'columnfractions'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[26]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[27]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[28];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'extra'}{'columnfractions'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[28]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[29]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[30];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[31]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[0]{'extra'}{'command'} = $result_trees{'symbol_after_block'}{'contents'}[32];
-$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[32];
-$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[32];
-$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[32];
-$result_trees{'symbol_after_block'}{'contents'}[32]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[32]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[33]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[0]{'extra'}{'command'} = $result_trees{'symbol_after_block'}{'contents'}[34];
-$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[34];
-$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[34];
-$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[34];
-$result_trees{'symbol_after_block'}{'contents'}[34]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[34]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[35]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[36];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[37]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[0]{'extra'}{'command'} = $result_trees{'symbol_after_block'}{'contents'}[38];
-$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[38];
-$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[38];
-$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[38];
-$result_trees{'symbol_after_block'}{'contents'}[38]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[38]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[39]{'parent'} = $result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[0]{'extra'}{'command'} = $result_trees{'symbol_after_block'}{'contents'}[40];
-$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[40];
-$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[40];
-$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[40];
-$result_trees{'symbol_after_block'}{'contents'}[40]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[40]{'parent'} = $result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[12]{'extra'}{'command_as_argument'} = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'} = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[18]{'extra'}{'command_as_argument'} = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'extra'}{'command_as_argument'} = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[24]{'extra'}{'columnfractions'} = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[24]{'args'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'extra'}{'columnfractions'} = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'args'}[0]{'contents'}[0];
$result_texis{'symbol_after_block'} = '@html
In html
@@ -1851,10 +1498,8 @@ $result_texts{'symbol_after_block'} = '
Verbatim:
In verbatim
-;
In verbatim
-@
Table:
@@ -1891,124 +1536,124 @@ Copying:
$result_errors{'symbol_after_block'} = [
{
- 'error_line' => ':3: superfluous argument to @end html: . On the line.
+ 'error_line' => 'bad argument to @end: html. On the line.
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'superfluous argument to @end html: . On the line.',
+ 'text' => 'bad argument to @end: html. On the line.',
'type' => 'error'
},
{
- 'error_line' => ':7: superfluous argument to @end html: @@ On the line.
+ 'error_line' => 'bad argument to @end: html@@ On the line.
',
'file_name' => '',
'line_nr' => 7,
'macro' => '',
- 'text' => 'superfluous argument to @end html: @@ On the line.',
+ 'text' => 'bad argument to @end: html@@ On the line.',
'type' => 'error'
},
{
- 'error_line' => ':13: warning: superfluous argument to @end verbatim: ;
+ 'error_line' => 'bad argument to @end: verbatim;
',
'file_name' => '',
'line_nr' => 13,
'macro' => '',
- 'text' => 'superfluous argument to @end verbatim: ;',
- 'type' => 'warning'
+ 'text' => 'bad argument to @end: verbatim;',
+ 'type' => 'error'
},
{
- 'error_line' => ':17: warning: superfluous argument to @end verbatim: @@
+ 'error_line' => 'bad argument to @end: verbatim@@
',
'file_name' => '',
'line_nr' => 17,
'macro' => '',
- 'text' => 'superfluous argument to @end verbatim: @@',
- 'type' => 'warning'
+ 'text' => 'bad argument to @end: verbatim@@',
+ 'type' => 'error'
},
{
- 'error_line' => ':24: superfluous argument to @end table: +
+ 'error_line' => 'bad argument to @end: table+
',
'file_name' => '',
'line_nr' => 24,
'macro' => '',
- 'text' => 'superfluous argument to @end table: +',
+ 'text' => 'bad argument to @end: table+',
'type' => 'error'
},
{
- 'error_line' => ':29: superfluous argument to @end table: @@
+ 'error_line' => 'bad argument to @end: table@@
',
'file_name' => '',
'line_nr' => 29,
'macro' => '',
- 'text' => 'superfluous argument to @end table: @@',
+ 'text' => 'bad argument to @end: table@@',
'type' => 'error'
},
{
- 'error_line' => ':35: superfluous argument to @end itemize: \'\'
+ 'error_line' => 'bad argument to @end: itemize\'\'
',
'file_name' => '',
'line_nr' => 35,
'macro' => '',
- 'text' => 'superfluous argument to @end itemize: \'\'',
+ 'text' => 'bad argument to @end: itemize\'\'',
'type' => 'error'
},
{
- 'error_line' => ':39: superfluous argument to @end itemize: @@
+ 'error_line' => 'bad argument to @end: itemize@@
',
'file_name' => '',
'line_nr' => 39,
'macro' => '',
- 'text' => 'superfluous argument to @end itemize: @@',
+ 'text' => 'bad argument to @end: itemize@@',
'type' => 'error'
},
{
- 'error_line' => ':46: superfluous argument to @end multitable: ^
+ 'error_line' => 'bad argument to @end: multitable^
',
'file_name' => '',
'line_nr' => 46,
'macro' => '',
- 'text' => 'superfluous argument to @end multitable: ^',
+ 'text' => 'bad argument to @end: multitable^',
'type' => 'error'
},
{
- 'error_line' => ':51: superfluous argument to @end multitable: @{
+ 'error_line' => 'bad argument to @end: multitable@{
',
'file_name' => '',
'line_nr' => 51,
'macro' => '',
- 'text' => 'superfluous argument to @end multitable: @{',
+ 'text' => 'bad argument to @end: multitable@{',
'type' => 'error'
},
{
- 'error_line' => ':57: superfluous argument to @end flushleft: !
+ 'error_line' => 'bad argument to @end: flushleft!
',
'file_name' => '',
'line_nr' => 57,
'macro' => '',
- 'text' => 'superfluous argument to @end flushleft: !',
+ 'text' => 'bad argument to @end: flushleft!',
'type' => 'error'
},
{
- 'error_line' => ':61: superfluous argument to @end flushleft: @@
+ 'error_line' => 'bad argument to @end: flushleft@@
',
'file_name' => '',
'line_nr' => 61,
'macro' => '',
- 'text' => 'superfluous argument to @end flushleft: @@',
+ 'text' => 'bad argument to @end: flushleft@@',
'type' => 'error'
},
{
- 'error_line' => ':67: superfluous argument to @end copying: *
+ 'error_line' => 'bad argument to @end: copying*
',
'file_name' => '',
'line_nr' => 67,
'macro' => '',
- 'text' => 'superfluous argument to @end copying: *',
+ 'text' => 'bad argument to @end: copying*',
'type' => 'error'
},
{
- 'error_line' => ':69: warning: multiple @copying
+ 'error_line' => 'warning: multiple @copying
',
'file_name' => '',
'line_nr' => 69,
@@ -2017,12 +1662,12 @@ $result_errors{'symbol_after_block'} = [
'type' => 'warning'
},
{
- 'error_line' => ':71: superfluous argument to @end copying: @@
+ 'error_line' => 'bad argument to @end: copying@@
',
'file_name' => '',
'line_nr' => 71,
'macro' => '',
- 'text' => 'superfluous argument to @end copying: @@',
+ 'text' => 'bad argument to @end: copying@@',
'type' => 'error'
}
];
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/symbol_after_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/symbol_after_command.pl
index bd7a204c27..c691b22cac 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/symbol_after_command.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/symbol_after_command.pl
@@ -1,511 +1,382 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'symbol_after_command'} = {
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'cmdname' => 'asis',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {},
- 'type' => 'command_as_argument'
+ 'type' => 'block_line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
- {
+ 'cmdname' => 'table',
'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '. dot'
+ 'contents' => [
+ {
+ 'text' => '. dot'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ 'cmdname' => 'item',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
}
],
- 'parent' => {},
- 'type' => 'table_term'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'contents' => [
+ 'type' => 'table_entry'
+ },
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => ', comma'
+ 'contents' => [
+ {
+ 'text' => ', comma'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ 'cmdname' => 'item',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
}
],
- 'parent' => {},
- 'type' => 'table_term'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'contents' => [
+ 'type' => 'table_entry'
+ },
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
+ 'args' => [
{
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
+ 'contents' => [
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '@'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ 'cmdname' => 'item',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
}
],
- 'parent' => {},
- 'type' => 'table_term'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'contents' => [
+ 'type' => 'table_entry'
+ },
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'cmdname' => '{',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => '{',
- 'parent' => {}
+ 'contents' => [
+ {
+ 'cmdname' => '{'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '{'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ 'cmdname' => 'item',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
}
],
- 'parent' => {},
- 'type' => 'table_term'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'contents' => [
+ 'type' => 'table_entry'
+ },
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '! exclam'
+ 'contents' => [
+ {
+ 'text' => '! exclam'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ 'cmdname' => 'item',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
}
],
- 'parent' => {},
- 'type' => 'table_term'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'contents' => [
+ 'type' => 'table_entry'
+ },
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '\'\' quotes'
+ 'contents' => [
+ {
+ 'text' => '\'\' quotes'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ 'cmdname' => 'item',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
}
],
- 'parent' => {},
- 'type' => 'table_term'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'contents' => [
+ 'type' => 'table_entry'
+ },
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => ': colon'
+ 'contents' => [
+ {
+ 'text' => ': colon'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ 'cmdname' => 'item',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
}
],
- 'parent' => {},
- 'type' => 'table_term'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'args' => [
+ 'type' => 'table_entry'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'table'
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'table'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'table',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'table'
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'cmdname' => '@',
- 'parent' => {}
+ }
},
{
- 'parent' => {},
- 'text' => '. '
- },
- {
- 'cmdname' => '{',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ', '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => '?',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ', '
- },
- {
- 'cmdname' => '!',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ': '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'cmdname' => '{',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '\'\' '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
- 'parent' => {},
- 'text' => ':
+ 'contents' => [
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => '. '
+ },
+ {
+ 'cmdname' => '{'
+ },
+ {
+ 'text' => ', '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '?'
+ },
+ {
+ 'text' => ', '
+ },
+ {
+ 'cmdname' => '!'
+ },
+ {
+ 'text' => ': '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'cmdname' => '{'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => '\'\' '
+ },
+ {
+ 'cmdname' => '@'
+ },
+ {
+ 'text' => ':
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'symbol_after_command'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[7]{'args'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[7];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[7];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'};
-$result_trees{'symbol_after_command'}{'contents'}[1]{'parent'} = $result_trees{'symbol_after_command'};
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[11]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[12]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[13]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[14]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[15]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[16]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'contents'}[17]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[2]{'parent'} = $result_trees{'symbol_after_command'};
+$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_texis{'symbol_after_command'} = '@table @asis
@item. dot
@@ -544,21 +415,21 @@ $result_converted{'plaintext'}->{'symbol_after_command'} = '. dot
@ @
{ {
! exclam
-" quotes
+” quotes
: colon
- @. {, @@ ?, !: @{ @" @:
+ @. {, @@ ?, !: @{ @” @:
';
-$result_converted{'html_text'}->{'symbol_after_command'} = '<dl compact="compact">
-<dt><span>. dot</span></dt>
-<dt><span>, comma</span></dt>
-<dt><span>@ @</span></dt>
-<dt><span>{ {</span></dt>
-<dt><span>! exclam</span></dt>
-<dt><span>&rdquo; quotes</span></dt>
-<dt><span>: colon</span></dt>
+$result_converted{'html_text'}->{'symbol_after_command'} = '<dl class="table">
+<dt>. dot</dt>
+<dt>, comma</dt>
+<dt>@ @</dt>
+<dt>{ {</dt>
+<dt>! exclam</dt>
+<dt>&rdquo; quotes</dt>
+<dt>: colon</dt>
</dl>
<p>@. {, @@ ?, !: @{ @&rdquo; @:
@@ -579,6 +450,27 @@ $result_converted{'xml'}->{'symbol_after_command'} = '<table commandarg="asis" s
</para>';
+$result_converted{'latex_text'}->{'symbol_after_command'} = '\\begin{description}
+\\item[{\\parbox[b]{\\linewidth}{%
+. dot}}]
+\\item[{\\parbox[b]{\\linewidth}{%
+, comma}}]
+\\item[{\\parbox[b]{\\linewidth}{%
+@ @}}]
+\\item[{\\parbox[b]{\\linewidth}{%
+\\{ \\{}}]
+\\item[{\\parbox[b]{\\linewidth}{%
+! exclam}}]
+\\item[{\\parbox[b]{\\linewidth}{%
+\'\' quotes}}]
+\\item[{\\parbox[b]{\\linewidth}{%
+: colon}}]
+\\end{description}
+
+@. \\{, @@ \\@?, \\@!: @\\{ @\'\' @:
+';
+
+
$result_converted{'docbook'}->{'symbol_after_command'} = '<variablelist><varlistentry><term>. dot
</term></varlistentry><varlistentry><term>, comma
</term></varlistentry><varlistentry><term>@ @
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/table.pl b/macros/texinfo/texinfo/tp/t/results/coverage/table.pl
index 8f976c6700..f620d03040 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/table.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/table.pl
@@ -1,594 +1,586 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'table'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'cmdname' => 'asis',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {},
- 'type' => 'command_as_argument'
+ 'type' => 'block_line_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
- {
+ 'cmdname' => 'table',
'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'table item'
+ 'contents' => [
+ {
+ 'text' => 'table item'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'item',
'extra' => {
- 'spaces_after_argument' => '
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'table itemx'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'itemx',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
},
{
- 'args' => [
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'table itemx'
+ 'text' => 'In table
+'
}
],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'paragraph'
}
],
- 'cmdname' => 'itemx',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_item'
}
],
- 'parent' => {},
- 'type' => 'table_term'
+ 'type' => 'table_entry'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
+ 'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'In table
-'
+ 'text' => 'table'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'table_item'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'table'
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'table'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'table',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'table'
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 2,
'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ }
+ },
{
- 'contents' => [
- {
- 'cmdname' => 'samp',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
- ],
- 'extra' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' samp
+ 'text' => '
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' samp
-'
- ]
- },
- 'parent' => {}
- }
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'parent' => {},
- 'text' => ' after vtable
-',
- 'type' => 'misc_arg'
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
- 'cmdname' => 'c',
'extra' => {
- 'misc_args' => [
- ' after vtable
-'
- ]
- },
- 'parent' => {}
- },
- {
- 'args' => [
- {
- 'contents' => [
+ 'comment_at_end' => {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'index entry'
+ 'text' => ' samp
+',
+ 'type' => 'misc_arg'
}
],
+ 'cmdname' => 'c',
'extra' => {
- 'spaces_after_argument' => '
+ 'misc_args' => [
+ ' samp
'
- },
- 'parent' => {},
- 'type' => 'line_arg'
+ ]
+ }
}
- ],
- 'cmdname' => 'cindex',
- 'extra' => {
- 'index_entry' => {
- 'command' => {},
- 'content' => [],
- 'content_normalized' => [],
- 'in_code' => 0,
- 'index_at_command' => 'cindex',
- 'index_name' => 'cp',
- 'index_type_command' => 'cindex',
- 'key' => 'index entry',
- 'number' => 1
- },
- 'spaces_before_argument' => ' '
},
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'index_entry_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'before_item'
- },
- {
+ 'cmdname' => 'vtable',
'contents' => [
{
'contents' => [
{
'args' => [
{
+ 'text' => ' after vtable
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' after vtable
+'
+ ]
+ }
+ },
+ {
+ 'args' => [
+ {
'contents' => [
{
- 'parent' => {},
- 'text' => 'vtable item'
+ 'text' => 'index entry'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
- 'cmdname' => 'item',
+ 'cmdname' => 'cindex',
'extra' => {
'index_entry' => {
- 'command' => {},
- 'content' => [],
'content_normalized' => [],
- 'in_code' => 1,
- 'index_at_command' => 'item',
- 'index_name' => 'vr',
- 'index_type_command' => 'vtable',
- 'key' => 'vtable item',
- 'number' => 1
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_number' => 1,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
},
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
},
- 'parent' => {}
+ 'type' => 'index_entry_command'
},
{
- 'contents' => [
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' after item
+ 'text' => '
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' after item
-'
- ]
- },
- 'parent' => {}
- },
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'before_item'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'key'
+ 'text' => 'vtable item'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
'type' => 'line_arg'
}
],
- 'cmdname' => 'kindex',
+ 'cmdname' => 'item',
'extra' => {
'index_entry' => {
- 'command' => {},
- 'content' => [],
'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_number' => 1,
'in_code' => 1,
- 'index_at_command' => 'kindex',
- 'index_name' => 'ky',
- 'index_type_command' => 'kindex',
- 'key' => 'key',
- 'number' => 1
+ 'index_at_command' => 'item',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'vr',
+ 'index_type_command' => 'vtable'
},
'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
- },
- 'parent' => {},
- 'type' => 'index_entry_command'
- }
- ],
- 'parent' => {},
- 'type' => 'inter_item'
- },
- {
- 'args' => [
+ }
+ },
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'itemx vtable'
- }
- ],
- 'extra' => {
- 'comment_at_end' => {
'args' => [
{
- 'parent' => {},
- 'text' => ' comment in itemx line
+ 'text' => ' after item
',
'type' => 'misc_arg'
}
],
- 'cmdname' => 'comment',
+ 'cmdname' => 'c',
'extra' => {
'misc_args' => [
- ' comment in itemx line
+ ' after item
'
]
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'key'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'kindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_number' => 1,
+ 'in_code' => 1,
+ 'index_at_command' => 'kindex',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'ky',
+ 'index_type_command' => 'kindex'
+ },
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
},
- 'parent' => {}
+ 'type' => 'index_entry_command'
+ }
+ ],
+ 'type' => 'inter_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'itemx vtable'
+ }
+ ],
+ 'extra' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment in itemx line
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'comment',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment in itemx line
+'
+ ]
+ }
+ },
+ 'spaces_after_argument' => ' '
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'itemx',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_number' => 2,
+ 'in_code' => 1,
+ 'index_at_command' => 'itemx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'vr',
+ 'index_type_command' => 'vtable'
},
- 'spaces_after_argument' => ' '
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'itemx',
- 'extra' => {
- 'index_entry' => {
- 'command' => {},
- 'content' => [],
- 'content_normalized' => [],
- 'in_code' => 1,
- 'index_at_command' => 'itemx',
- 'index_name' => 'vr',
- 'index_type_command' => 'vtable',
- 'key' => 'itemx vtable',
- 'number' => 2
- },
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 16,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'table_item'
}
],
- 'parent' => {},
- 'type' => 'table_term'
+ 'type' => 'table_entry'
},
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'contents' => [
+ {
+ 'text' => 'vtable'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'table_item'
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'vtable'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ }
}
],
- 'parent' => {},
- 'type' => 'table_entry'
+ 'extra' => {
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'args' => [
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'vtable'
+ 'cmdname' => 'strong',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
'spaces_after_argument' => '
'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'unknown command after indicating command'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'table_term'
+ }
+ ],
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'table'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'vtable',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'vtable'
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 20,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'table'}{'contents'}[0]{'parent'} = $result_trees{'table'};
-$result_trees{'table'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'args'}[0];
-$result_trees{'table'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[0];
-$result_trees{'table'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1];
-$result_trees{'table'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'table'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[1]{'contents'}[1];
-$result_trees{'table'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table'}{'contents'}[1];
-$result_trees{'table'}{'contents'}[1]{'extra'}{'command_as_argument'} = $result_trees{'table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'table'}{'contents'}[1]{'contents'}[1];
-$result_trees{'table'}{'contents'}[1]{'parent'} = $result_trees{'table'};
-$result_trees{'table'}{'contents'}[2]{'parent'} = $result_trees{'table'};
-$result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'args'}[0];
-$result_trees{'table'}{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'};
-$result_trees{'table'}{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'table'}{'contents'}[3]{'args'}[0];
-$result_trees{'table'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3];
-$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'} = $result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'} = $result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[1];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'table'}{'contents'}[3];
-$result_trees{'table'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'table'}{'contents'}[3]{'contents'}[2];
-$result_trees{'table'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'table'}{'contents'}[3];
-$result_trees{'table'}{'contents'}[3]{'extra'}{'command_as_argument'} = $result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'table'}{'contents'}[3]{'contents'}[2];
-$result_trees{'table'}{'contents'}[3]{'parent'} = $result_trees{'table'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'} = $result_trees{'table'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'} = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'} = $result_trees{'table'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
$result_texis{'table'} = '
@table @asis
@@ -608,6 +600,10 @@ In table
@itemx itemx vtable @comment comment in itemx line
@end vtable
+
+@table @strong
+@item unknown command after indicating command
+@end table
';
@@ -621,11 +617,13 @@ In table
vtable item
itemx vtable
+
+unknown command after indicating command
';
$result_errors{'table'} = [
{
- 'error_line' => ':11: warning: entry for index `cp\' outside of any node
+ 'error_line' => 'warning: entry for index `cp\' outside of any node
',
'file_name' => '',
'line_nr' => 11,
@@ -634,7 +632,7 @@ $result_errors{'table'} = [
'type' => 'warning'
},
{
- 'error_line' => ':13: warning: entry for index `vr\' outside of any node
+ 'error_line' => 'warning: entry for index `vr\' outside of any node
',
'file_name' => '',
'line_nr' => 13,
@@ -643,7 +641,7 @@ $result_errors{'table'} = [
'type' => 'warning'
},
{
- 'error_line' => ':15: warning: entry for index `ky\' outside of any node
+ 'error_line' => 'warning: entry for index `ky\' outside of any node
',
'file_name' => '',
'line_nr' => 15,
@@ -652,13 +650,22 @@ $result_errors{'table'} = [
'type' => 'warning'
},
{
- 'error_line' => ':16: warning: entry for index `vr\' outside of any node
+ 'error_line' => 'warning: entry for index `vr\' outside of any node
',
'file_name' => '',
'line_nr' => 16,
'macro' => '',
'text' => 'entry for index `vr\' outside of any node',
'type' => 'warning'
+ },
+ {
+ 'error_line' => 'unknown command `unknown\'
+',
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => '',
+ 'text' => 'unknown command `unknown\'',
+ 'type' => 'error'
}
];
@@ -666,35 +673,54 @@ $result_errors{'table'} = [
$result_floats{'table'} = {};
+$result_indices_sort_strings{'table'} = {
+ 'cp' => [
+ 'index entry'
+ ],
+ 'ky' => [
+ 'key'
+ ],
+ 'vr' => [
+ 'itemx vtable',
+ 'vtable item'
+ ]
+};
+
+
$result_converted{'plaintext'}->{'table'} = 'table item
table itemx
In table
-\'vtable item\'
-\'itemx vtable\'
+‘vtable item’
+‘itemx vtable’
+*unknown command after indicating command*
';
$result_converted{'html_text'}->{'table'} = '
-<dl compact="compact">
-<dt><span>table item</span></dt>
-<dt><span>table itemx</span></dt>
+<dl class="table">
+<dt>table item</dt>
+<dt>table itemx</dt>
<dd>
<p>In table
</p></dd>
</dl>
-<dl compact="compact">
-<dd><span id="index-index-entry"></span>
+<dl class="vtable">
+<dd><a class="index-entry-id" id="index-index-entry"></a>
</dd>
-<dt id=\'index-vtable-item\'><span>&lsquo;<samp>vtable item</samp>&rsquo;<a href=\'#index-vtable-item\' class=\'copiable-anchor\'> &para;</a></span></dt>
-<dd><span id="index-key"></span>
+<dt id=\'index-vtable-item\'><span>&lsquo;<samp class="samp">vtable item</samp>&rsquo;<a class="copiable-link" href=\'#index-vtable-item\'> &para;</a></span></dt>
+<dd><a class="index-entry-id" id="index-key"></a>
</dd>
-<dt id=\'index-itemx-vtable\'><span>&lsquo;<samp>itemx vtable</samp>&rsquo;<a href=\'#index-itemx-vtable\' class=\'copiable-anchor\'> &para;</a></span></dt>
+<dt id=\'index-itemx-vtable\'><span>&lsquo;<samp class="samp">itemx vtable</samp>&rsquo;<a class="copiable-link" href=\'#index-itemx-vtable\'> &para;</a></span></dt>
+</dl>
+
+<dl class="table">
+<dt><strong class="strong">unknown command after indicating command</strong></dt>
</dl>
';
@@ -714,9 +740,42 @@ $result_converted{'xml'}->{'table'} = '
</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat command="samp"><indexterm index="vr" number="1">vtable item</indexterm>vtable item</itemformat></item>
<!-- c after item -->
<kindex index="ky" spaces=" "><indexterm index="ky" number="1">key</indexterm></kindex>
-<itemx spaces=" "><itemformat command="samp"><indexterm index="vr" number="2">itemx vtable</indexterm>itemx vtable <!-- comment comment in itemx line --></itemformat></itemx>
+<itemx spaces=" "><itemformat command="samp"><indexterm index="vr" number="2">itemx vtable</indexterm>itemx vtable </itemformat></itemx><!-- comment comment in itemx line -->
</tableterm><tableitem>
</tableitem></tableentry></vtable>
+
+<table commandarg="strong" spaces=" " endspaces=" ">
+<tableentry><tableterm><item spaces=" "><itemformat command="strong">unknown command after indicating command</itemformat></item>
+</tableterm></tableentry></table>
+';
+
+
+$result_converted{'latex_text'}->{'table'} = '
+\\begin{description}
+\\item[{\\parbox[b]{\\linewidth}{%
+table item\\\\
+table itemx}}]
+
+In table
+\\end{description}
+
+\\begin{description}
+\\item[] \\index[cp]{index entry@index entry}%
+
+\\item[{\\parbox[b]{\\linewidth}{%
+\\Texinfotablestylesamp{vtable item}\\\\
+\\index[vr]{vtable item@\\texttt{vtable item}}%
+\\index[ky]{key@\\texttt{key}}%
+\\Texinfotablestylesamp{itemx vtable}
+\\index[vr]{itemx vtable@\\texttt{itemx vtable}}%
+}}]
+
+\\end{description}
+
+\\begin{description}
+\\item[{\\parbox[b]{\\linewidth}{%
+\\textbf{unknown command after indicating command}}}]
+\\end{description}
';
@@ -734,6 +793,8 @@ $result_converted{'docbook'}->{'table'} = '
<indexterm role="ky"><primary>key</primary></indexterm>
<term><indexterm role="vr"><primary>itemx vtable</primary></indexterm>&#8216;<literal>itemx vtable</literal>&#8217;
</term><listitem>
-</listitem></varlistentry></variablelist>';
+</listitem></varlistentry></variablelist>
+<variablelist><varlistentry><term><emphasis role="bold">unknown command after indicating command</emphasis>
+</term></varlistentry></variablelist>';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl b/macros/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl
index fa248e7a64..9846017e63 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl
@@ -1,151 +1,126 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'table_command_comment'} = {
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
- ],
- 'extra' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'parent' => {},
- 'text' => ' in comment
-',
- 'type' => 'misc_arg'
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
}
],
- 'cmdname' => 'c',
'extra' => {
- 'misc_args' => [
- ' in comment
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' in comment
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' in comment
'
- ]
+ ]
+ }
+ }
},
- 'parent' => {}
+ 'type' => 'block_line_arg'
}
- },
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
- {
+ ],
+ 'cmdname' => 'table',
'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'item'
+ 'contents' => [
+ {
+ 'text' => 'item'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'item',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'item',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'table_term'
}
],
- 'parent' => {},
- 'type' => 'table_term'
- }
- ],
- 'parent' => {},
- 'type' => 'table_entry'
- },
- {
- 'args' => [
+ 'type' => 'table_entry'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'table'
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'type' => 'line_arg'
}
],
- 'parent' => {},
- 'type' => 'line_arg'
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'table'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
'extra' => {
- 'command_argument' => 'table',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'table'
+ 'command_as_argument' => {},
+ 'spaces_before_argument' => ' '
},
- 'line_nr' => {
+ 'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
- },
- 'parent' => {}
+ }
}
],
- 'extra' => {
- 'command_as_argument' => {},
- 'end_command' => {},
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
-$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1];
-$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'table_command_comment'}{'contents'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1];
-$result_trees{'table_command_comment'}{'contents'}[0]{'parent'} = $result_trees{'table_command_comment'};
+$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_texis{'table_command_comment'} = '@table @code@c in comment
@item item
@@ -162,12 +137,12 @@ $result_floats{'table_command_comment'} = {};
-$result_converted{'plaintext'}->{'table_command_comment'} = '\'item\'
+$result_converted{'plaintext'}->{'table_command_comment'} = '‘item’
';
-$result_converted{'html_text'}->{'table_command_comment'} = '<dl compact="compact">
-<dt><span><code>item</code></span></dt>
+$result_converted{'html_text'}->{'table_command_comment'} = '<dl class="table">
+<dt><code class="code">item</code></dt>
</dl>
';
@@ -177,6 +152,13 @@ $result_converted{'xml'}->{'table_command_comment'} = '<table commandarg="code"
</tableterm></tableentry></table>';
+$result_converted{'latex_text'}->{'table_command_comment'} = '\\begin{description}
+\\item[{\\parbox[b]{\\linewidth}{%
+\\texttt{item}}}]
+\\end{description}
+';
+
+
$result_converted{'docbook'}->{'table_command_comment'} = '<variablelist><varlistentry><term><literal>item</literal>
</term></varlistentry></variablelist>';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/test_errormsg.pl b/macros/texinfo/texinfo/tp/t/results/coverage/test_errormsg.pl
index dcd52f44b0..9f22b54abf 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/test_errormsg.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/test_errormsg.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,140 +10,107 @@ $result_trees{'test_errormsg'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'Some text
+ 'contents' => [
+ {
+ 'text' => 'Some text
'
- },
- {
- 'args' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Text '
- },
- {
- 'args' => [
+ 'contents' => [
+ {
+ 'text' => 'Text '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'code'
+ 'contents' => [
+ {
+ 'text' => 'code'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'errormsg',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ 'cmdname' => 'errormsg',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
'
- },
- {
- 'args' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'with surrounding spaces'
+ 'contents' => [
+ {
+ 'text' => 'with surrounding spaces'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' ',
+ 'spaces_before_argument' => ' '
+ },
+ 'type' => 'brace_command_arg'
}
],
- 'extra' => {
- 'spaces_after_argument' => ' ',
- 'spaces_before_argument' => ' '
- },
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'errormsg',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => 'errormsg',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[3];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0];
-$result_trees{'test_errormsg'}{'contents'}[0]{'parent'} = $result_trees{'test_errormsg'};
$result_texis{'test_errormsg'} = 'Some text
@errormsg{Text @~e @code{code}}
@@ -158,7 +125,7 @@ $result_texts{'test_errormsg'} = 'Some text
$result_errors{'test_errormsg'} = [
{
- 'error_line' => ':2: Text
+ 'error_line' => 'Text
',
'file_name' => '',
'line_nr' => 2,
@@ -167,7 +134,7 @@ $result_errors{'test_errormsg'} = [
'type' => 'error'
},
{
- 'error_line' => ':3: with surrounding spaces
+ 'error_line' => 'with surrounding spaces
',
'file_name' => '',
'line_nr' => 3,
@@ -198,6 +165,12 @@ $result_converted{'xml'}->{'test_errormsg'} = '<para>Some text
</para>';
+$result_converted{'latex_text'}->{'test_errormsg'} = 'Some text
+
+
+';
+
+
$result_converted{'docbook'}->{'test_errormsg'} = '<para>Some text
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/test_tie.pl b/macros/texinfo/texinfo/tp/t/results/coverage/test_tie.pl
index 1558486bd1..896b90a51a 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/test_tie.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/test_tie.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,43 +10,36 @@ $result_trees{'test_tie'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
- },
- {
- 'args' => [
+ 'contents' => [
+ {
+ 'text' => 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+ },
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'tie',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'text' => 'BBBBBBBBBBB
+'
}
],
- 'cmdname' => 'tie',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => 'BBBBBBBBBBB
-'
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'test_tie'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_tie'}{'contents'}[0];
-$result_trees{'test_tie'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'test_tie'}{'contents'}[0]{'contents'}[1];
-$result_trees{'test_tie'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_tie'}{'contents'}[0];
-$result_trees{'test_tie'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_tie'}{'contents'}[0];
-$result_trees{'test_tie'}{'contents'}[0]{'parent'} = $result_trees{'test_tie'};
$result_texis{'test_tie'} = 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA@tie{}BBBBBBBBBBB
';
@@ -74,6 +67,10 @@ $result_converted{'xml'}->{'test_tie'} = '<para>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
</para>';
+$result_converted{'latex_text'}->{'test_tie'} = 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~BBBBBBBBBBB
+';
+
+
$result_converted{'docbook'}->{'test_tie'} = '<para>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA&#160;BBBBBBBBBBB
</para>';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/test_today.pl b/macros/texinfo/texinfo/tp/t/results/coverage/test_today.pl
index 157b107398..dd44c4902f 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/test_today.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/test_today.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,37 +10,32 @@ $result_trees{'test_today'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'today',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.'
}
],
- 'cmdname' => 'today',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '.'
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'test_today'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_today'}{'contents'}[0]{'contents'}[0];
-$result_trees{'test_today'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_today'}{'contents'}[0];
-$result_trees{'test_today'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_today'}{'contents'}[0];
-$result_trees{'test_today'}{'contents'}[0]{'parent'} = $result_trees{'test_today'};
$result_texis{'test_today'} = '@today{}.';
@@ -64,6 +59,9 @@ $result_converted{'html_text'}->{'test_today'} = '<p>a sunny day.</p>';
$result_converted{'xml'}->{'test_today'} = '<para><today/>.</para>';
+$result_converted{'latex_text'}->{'test_today'} = '\\today{}.';
+
+
$result_converted{'docbook'}->{'test_today'} = '<para>a sunny day.</para>';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/titlefont_in_center.pl b/macros/texinfo/texinfo/tp/t/results/coverage/titlefont_in_center.pl
index 1b8b8ced84..b95270bfb0 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/titlefont_in_center.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/titlefont_in_center.pl
@@ -1,73 +1,65 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'titlefont_in_center'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'A manual'
+ 'contents' => [
+ {
+ 'text' => 'A manual'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => 'titlefont',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'titlefont',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
},
- 'parent' => {}
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'center',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'center',
- 'extra' => {
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'titlefont_in_center'}{'contents'}[0]{'parent'} = $result_trees{'titlefont_in_center'};
-$result_trees{'titlefont_in_center'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'titlefont_in_center'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'titlefont_in_center'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'titlefont_in_center'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'titlefont_in_center'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'titlefont_in_center'}{'contents'}[1]{'args'}[0];
-$result_trees{'titlefont_in_center'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'titlefont_in_center'}{'contents'}[1];
-$result_trees{'titlefont_in_center'}{'contents'}[1]{'parent'} = $result_trees{'titlefont_in_center'};
$result_texis{'titlefont_in_center'} = '
@center @titlefont{A manual}
@@ -91,7 +83,7 @@ $result_converted{'plaintext'}->{'titlefont_in_center'} = '
$result_converted{'html_text'}->{'titlefont_in_center'} = '
-<div align="center"><h1 class="titlefont">A manual</h1>
+<div class="center"><h1 class="titlefont">A manual</h1>
</div>';
@@ -100,8 +92,15 @@ $result_converted{'xml'}->{'titlefont_in_center'} = '
';
+$result_converted{'latex_text'}->{'titlefont_in_center'} = '
+\\begin{center}
+{\\huge \\bfseries A manual}
+\\end{center}
+';
+
+
$result_converted{'docbook'}->{'titlefont_in_center'} = '
-A manual
+<simpara role="center">A manual</simpara>
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl b/macros/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl
index 2d9cf1aadd..1976e32d6f 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,841 +10,599 @@ $result_trees{'unknown_accents'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'X'
+ 'contents' => [
+ {
+ 'text' => 'X'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '"',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '"',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'x'
+ 'contents' => [
+ {
+ 'text' => 'x'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '"',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '"',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Q'
+ 'contents' => [
+ {
+ 'text' => 'Q'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '"',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '"',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Y'
+ 'contents' => [
+ {
+ 'text' => 'Y'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
+ 'cmdname' => '"',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => '"',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'z'
+ 'contents' => [
+ {
+ 'text' => 'z'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '\'',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '\'',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'q'
+ 'contents' => [
+ {
+ 'text' => 'q'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '\'',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '\'',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '\'',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ 'cmdname' => '\'',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
'
- },
- {
- 'args' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Z'
+ 'contents' => [
+ {
+ 'text' => 'Z'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '\'',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '\'',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Q'
+ 'contents' => [
+ {
+ 'text' => 'Q'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '\'',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '\'',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'R'
+ 'contents' => [
+ {
+ 'text' => 'R'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
+ 'cmdname' => '\'',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => '\'',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'H'
+ 'contents' => [
+ {
+ 'text' => 'H'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => ',',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => ',',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'h'
+ 'contents' => [
+ {
+ 'text' => 'h'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'parent' => {},
- 'type' => 'brace_command_arg'
+ 'cmdname' => ',',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => ',',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'z'
+ 'contents' => [
+ {
+ 'text' => 'z'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 't'
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'k'
+ 'contents' => [
+ {
+ 'text' => 'k'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
'
- },
- {
- 'args' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Z'
+ 'contents' => [
+ {
+ 'text' => 'Z'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'R'
+ 'contents' => [
+ {
+ 'text' => 'R'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'T'
+ 'contents' => [
+ {
+ 'text' => 'T'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'K'
+ 'contents' => [
+ {
+ 'text' => 'K'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => '^',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'z'
+ 'contents' => [
+ {
+ 'text' => 'z'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '`',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '`',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'm'
+ 'contents' => [
+ {
+ 'text' => 'm'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '`',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '`',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'p'
+ 'contents' => [
+ {
+ 'text' => 'p'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
+ 'cmdname' => '`',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => '`',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'paragraph'
},
{
- 'parent' => {},
'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
+ 'type' => 'empty_line'
+ },
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'Z'
+ 'contents' => [
+ {
+ 'text' => 'Z'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'args' => [
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'parent' => {},
- 'text' => 's'
+ 'contents' => [
+ {
+ 'text' => 's'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'parent' => {},
- 'type' => 'following_arg'
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+'
}
],
- 'cmdname' => '~',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'};
-$result_trees{'unknown_accents'}{'contents'}[1]{'parent'} = $result_trees{'unknown_accents'};
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[11]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'};
-$result_trees{'unknown_accents'}{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'};
-$result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[0]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[4];
-$result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[4];
-$result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[4];
-$result_trees{'unknown_accents'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[4];
-$result_trees{'unknown_accents'}{'contents'}[4]{'parent'} = $result_trees{'unknown_accents'};
-$result_trees{'unknown_accents'}{'contents'}[5]{'parent'} = $result_trees{'unknown_accents'};
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[5]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[7]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[9]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[11]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[13]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[15]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
-$result_trees{'unknown_accents'}{'contents'}[6]{'parent'} = $result_trees{'unknown_accents'};
-$result_trees{'unknown_accents'}{'contents'}[7]{'parent'} = $result_trees{'unknown_accents'};
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[0]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8];
-$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[5]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8];
-$result_trees{'unknown_accents'}{'contents'}[8]{'parent'} = $result_trees{'unknown_accents'};
-$result_trees{'unknown_accents'}{'contents'}[9]{'parent'} = $result_trees{'unknown_accents'};
-$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[0]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[0];
-$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10];
-$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10];
-$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'args'}[0];
-$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2];
-$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10];
-$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10];
-$result_trees{'unknown_accents'}{'contents'}[10]{'parent'} = $result_trees{'unknown_accents'};
$result_texis{'unknown_accents'} = '@"X @"x @"Q @"Y
@@ -898,19 +656,19 @@ $result_converted{'plaintext'}->{'unknown_accents'} = 'Ẍ ẍ Q̈ Ÿ
';
-$result_converted{'html_text'}->{'unknown_accents'} = '<p>&#7820; &#7821; Q" &#376;
+$result_converted{'html_text'}->{'unknown_accents'} = '<p>&#7820; &#7821; Q&#776; &#376;
</p>
-<p>&#394; q\' &#341;
-&#377; Q\' &#340;
+<p>&#394; q&#769; &#341;
+&#377; Q&#769; &#340;
</p>
<p>&#7720; &#7721;
</p>
-<p>&#7825; r^ t^ k^
-&#7824; R^ T^ K^
+<p>&#7825; r&#770; t&#770; k&#770;
+&#7824; R&#770; T&#770; K&#770;
</p>
-<p>z` m` p`
+<p>z&#768; m&#768; p&#768;
</p>
-<p>Z~ s~
+<p>Z&#771; s&#771;
</p>';
@@ -930,19 +688,35 @@ $result_converted{'xml'}->{'unknown_accents'} = '<para><accent type="uml" bracke
</para>';
-$result_converted{'docbook'}->{'unknown_accents'} = '<para>&#7820; &#7821; Q" &#376;
+$result_converted{'latex_text'}->{'unknown_accents'} = '\\"{X} \\"{x} \\"{Q} \\"{Y}
+
+\\\'{z} \\\'{q} \\\'{r}
+\\\'{Z} \\\'{Q} \\\'{R}
+
+\\c{H} \\c{h}
+
+\\^{z} \\^{r} \\^{t} \\^{k}
+\\^{Z} \\^{R} \\^{T} \\^{K}
+
+\\`{z} \\`{m} \\`{p}
+
+\\~{Z} \\~{s}
+';
+
+
+$result_converted{'docbook'}->{'unknown_accents'} = '<para>&#7820; &#7821; Q&#776; &#376;
</para>
-<para>&#394; q\' &#341;
-&#377; Q\' &#340;
+<para>&#394; q&#769; &#341;
+&#377; Q&#769; &#340;
</para>
<para>&#7720; &#7721;
</para>
-<para>&#7825; r^ t^ k^
-&#7824; R^ T^ K^
+<para>&#7825; r&#770; t&#770; k&#770;
+&#7824; R&#770; T&#770; K&#770;
</para>
-<para>z` m` p`
+<para>z&#768; m&#768; p&#768;
</para>
-<para>Z~ s~
+<para>Z&#771; s&#771;
</para>';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/unknown_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage/unknown_commands.pl
index a919c07163..956346e43a 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/unknown_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/unknown_commands.pl
@@ -1,7 +1,7 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
@@ -10,25 +10,24 @@ $result_trees{'unknown_commands'} = {
{
'contents' => [
{
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '
'
- },
- {
- 'parent' => {},
- 'text' => '#
+ },
+ {
+ 'text' => '#
'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'unknown_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_commands'}{'contents'}[0];
-$result_trees{'unknown_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'unknown_commands'}{'contents'}[0];
-$result_trees{'unknown_commands'}{'contents'}[0]{'parent'} = $result_trees{'unknown_commands'};
$result_texis{'unknown_commands'} = '
#
@@ -41,7 +40,7 @@ $result_texts{'unknown_commands'} = '
$result_errors{'unknown_commands'} = [
{
- 'error_line' => ':1: unknown command `unknwon\'
+ 'error_line' => 'unknown command `unknwon\'
',
'file_name' => '',
'line_nr' => 1,
@@ -50,7 +49,7 @@ $result_errors{'unknown_commands'} = [
'type' => 'error'
},
{
- 'error_line' => ':2: unexpected @
+ 'error_line' => 'unexpected @
',
'file_name' => '',
'line_nr' => 2,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl b/macros/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl
index 4a5e0bc77f..98dfb86834 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl
@@ -1,55 +1,52 @@
use vars qw(%result_texis %result_texts %result_trees %result_errors
%result_indices %result_sectioning %result_nodes %result_menus
%result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
+ %result_elements %result_directions_text %result_indices_sort_strings);
use utf8;
$result_trees{'verbatiminclude'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
+ 'type' => 'empty_line'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'parent' => {},
- 'text' => 'incl-incl.txi'
+ 'contents' => [
+ {
+ 'text' => 'incl-incl.txi'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'verbatiminclude',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'input_perl_encoding' => 'utf-8',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'incl-incl.txi'
},
- 'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'verbatiminclude',
- 'extra' => {
- 'input_perl_encoding' => 'utf-8',
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'incl-incl.txi'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'before_node_section'
}
],
- 'type' => 'text_root'
+ 'type' => 'document_root'
};
-$result_trees{'verbatiminclude'}{'contents'}[0]{'parent'} = $result_trees{'verbatiminclude'};
-$result_trees{'verbatiminclude'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'verbatiminclude'}{'contents'}[1]{'args'}[0];
-$result_trees{'verbatiminclude'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'verbatiminclude'}{'contents'}[1];
-$result_trees{'verbatiminclude'}{'contents'}[1]{'parent'} = $result_trees{'verbatiminclude'};
$result_texis{'verbatiminclude'} = '
@verbatiminclude incl-incl.txi
@@ -80,6 +77,13 @@ $result_converted{'xml'}->{'verbatiminclude'} = '
';
+$result_converted{'latex_text'}->{'verbatiminclude'} = '
+\\begin{verbatim}
+This is the @emph{included} file (include-value2.txi) <> ---.
+\\end{verbatim}
+';
+
+
$result_converted{'docbook'}->{'verbatiminclude'} = '
<screen>This is the @emph{included} file (include-value2.txi) &lt;&gt; ---.
</screen>';