|
| From: | Gavin D. Smith |
| Subject: | branch master updated: * tp/t/22xtable.t (item_index_transformation): New test using 'relate_index_entries_to_item' transformation. |
| Date: | Sun, 02 Apr 2023 09:39:49 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 0bec5edad4 * tp/t/22xtable.t (item_index_transformation): New test
using 'relate_index_entries_to_item' transformation.
0bec5edad4 is described below
commit 0bec5edad44f801e3de74e35ee331ecb34e08dea
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Apr 2 14:39:41 2023 +0100
* tp/t/22xtable.t (item_index_transformation):
New test using 'relate_index_entries_to_item' transformation.
---
ChangeLog | 5 +
tp/t/22xtable.t | 49 +++++
tp/t/results/linemacro/api_doc_with_linemacro.pl | 220 -------------------
tp/t/results/linemacro/brace_command_not_closed.pl | 37 ----
tp/t/results/linemacro/braces_after_text.pl | 73 -------
tp/t/results/linemacro/empty_last_argument.pl | 116 ----------
.../results/linemacro/last_argument_with_braces.pl | 229 --------------------
tp/t/results/linemacro/nested_linemacro_calls.pl | 188 ----------------
.../linemacro/newline_and_continuation_in_brace.pl | 112 ----------
tp/t/results/linemacro/no_arguments.pl | 86 --------
tp/t/results/linemacro/paragraph_no_paragraph.pl | 127 -----------
tp/t/results/linemacro/protected_spaces_on_line.pl | 220 -------------------
.../linemacro/simple_nested_linemacro_calls.pl | 237 ---------------------
.../linemacro/spaces_after_command_in_call.pl | 72 -------
tp/t/results/linemacro/spaces_in_args.pl | 83 --------
tp/t/results/linemacro/spaces_in_call.pl | 48 -----
tp/t/results/linemacro/text_arguments.pl | 47 ----
tp/t/results/linemacro/verb_not_closed.pl | 46 ----
tp/t/test_utils.pl | 2 +-
19 files changed, 55 insertions(+), 1942 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f12023dbdc..05f1686e7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-04-02 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/t/22xtable.t (item_index_transformation):
+ New test using 'relate_index_entries_to_item' transformation.
+
2023-04-02 Gavin Smith <gavinsmith0123@gmail.com>
* util/htmlxref.cnf (gdb, stabs): Update.
diff --git a/tp/t/22xtable.t b/tp/t/22xtable.t
index 7a4e673e3a..1f98dcb1d5 100644
--- a/tp/t/22xtable.t
+++ b/tp/t/22xtable.t
@@ -194,6 +194,55 @@ aaaaa
@vindex var
@end table
'],
+['item_index_transformation',
+'@node chap
+@chapter Chapter
+
+@table @asis
+@cindex Before1
+@item one
+@itemx onex
+@itemx oney
+@cindex After1
+@cindex After2
+AAA
+@item two
+BBB
+@end table
+
+@table @asis
+@item three
+@itemx threex
+@itemx zzzz
+@cindex after1
+@cindex after2
+CCCC
+@item zzzz2
+DDDDD
+@end table
+
+@table @asis
+@cindex before1
+@cindex before2
+@item four
+@itemx fourx
+EEEE
+@item foour
+FFFFf
+@end table
+
+@table @asis
+@item five
+GGGG
+@item six
+@itemx sixx
+@cindex after6
+@cindex after7
+HHHHHH
+@end table
+',
+{'TREE_TRANSFORMATIONS' => 'relate_index_entries_to_items'}
+],
['block_commands_in_table',
'@node Top
@top Element
diff --git a/tp/t/results/linemacro/api_doc_with_linemacro.pl
b/tp/t/results/linemacro/api_doc_with_linemacro.pl
index d04278660b..42b728599d 100644
--- a/tp/t/results/linemacro/api_doc_with_linemacro.pl
+++ b/tp/t/results/linemacro/api_doc_with_linemacro.pl
@@ -492,43 +492,6 @@ $result_trees{'api_doc_with_linemacro'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'a'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'array_like'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'param'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -661,58 +624,6 @@ $result_trees{'api_doc_with_linemacro'} = {
'source_marks' => [
{
'counter' => 2,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'n'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'int,'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'optional'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'param'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -870,58 +781,6 @@ $result_trees{'api_doc_with_linemacro'} = {
'source_marks' => [
{
'counter' => 3,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'axis'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'int,'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'optional'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'param'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -1054,58 +913,6 @@ $result_trees{'api_doc_with_linemacro'} = {
'source_marks' => [
{
'counter' => 4,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'out'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'complex'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'ndarray'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'returns'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -1248,33 +1055,6 @@ $result_trees{'api_doc_with_linemacro'} = {
'source_marks' => [
{
'counter' => 5,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'IndexError'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'raises'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/brace_command_not_closed.pl
b/tp/t/results/linemacro/brace_command_not_closed.pl
index c5fda0f4da..b7ee602929 100644
--- a/tp/t/results/linemacro/brace_command_not_closed.pl
+++ b/tp/t/results/linemacro/brace_command_not_closed.pl
@@ -87,43 +87,6 @@ $result_trees{'brace_command_not_closed'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'in code
-'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- }
- }
- ],
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'mycommand'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/braces_after_text.pl
b/tp/t/results/linemacro/braces_after_text.pl
index 45638b647d..fdf032d11b 100644
--- a/tp/t/results/linemacro/braces_after_text.pl
+++ b/tp/t/results/linemacro/braces_after_text.pl
@@ -103,79 +103,6 @@ $result_trees{'braces_after_text'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'text'
- },
- {
- 'contents' => [
- {
- 'text' => 'in paren'
- }
- ],
- 'type' => 'bracketed_arg'
- }
- ],
- 'type' => 'def_aggregate'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'rest'
- },
- {
- 'contents' => [
- {
- 'text' => 'in paren'
- }
- ],
- 'type' => 'bracketed_arg'
- }
- ],
- 'type' => 'def_aggregate'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'type' => 'bracketed_arg'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'mymacro'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/empty_last_argument.pl
b/tp/t/results/linemacro/empty_last_argument.pl
index 7a21d18cd5..26c9501ed4 100644
--- a/tp/t/results/linemacro/empty_last_argument.pl
+++ b/tp/t/results/linemacro/empty_last_argument.pl
@@ -138,43 +138,6 @@ $result_trees{'empty_last_argument'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'foo'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'type' => 'bracketed_arg'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'defbuiltin'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -290,33 +253,6 @@ $result_trees{'empty_last_argument'} = {
'source_marks' => [
{
'counter' => 2,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'foo'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'defbuiltin'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -432,58 +368,6 @@ $result_trees{'empty_last_argument'} = {
'source_marks' => [
{
'counter' => 3,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'foo'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '{}'
- }
- ],
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => ''
- },
- 'type' => 'balanced_braces'
- }
- ],
- 'type' => 'bracketed_arg'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'defbuiltin'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/last_argument_with_braces.pl
b/tp/t/results/linemacro/last_argument_with_braces.pl
index ad7c73cf4b..72a1bd4eb4 100644
--- a/tp/t/results/linemacro/last_argument_with_braces.pl
+++ b/tp/t/results/linemacro/last_argument_with_braces.pl
@@ -104,91 +104,6 @@ $result_trees{'last_argument_with_braces'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'my foo'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'a'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'last'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'arg'
- },
- {
- 'contents' => [
- {
- 'text' => 'ument'
- }
- ],
- 'type' => 'bracketed_arg'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'defbuiltin'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -431,63 +346,6 @@ $result_trees{'last_argument_with_braces'} = {
'source_marks' => [
{
'counter' => 2,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'my foo'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'type' => 'bracketed_arg'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'defbuiltin'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -693,93 +551,6 @@ $result_trees{'last_argument_with_braces'} = {
'source_marks' => [
{
'counter' => 3,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'my foo'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'second arg'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'remaining'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'on'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'line'
- }
- ],
- 'type' => 'bracketed_arg'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'defbuiltin'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/nested_linemacro_calls.pl
b/tp/t/results/linemacro/nested_linemacro_calls.pl
index 0fc191544e..f6867cec3d 100644
--- a/tp/t/results/linemacro/nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/nested_linemacro_calls.pl
@@ -178,194 +178,6 @@ $result_trees{'nested_linemacro_calls'} = {
'source_marks' => [
{
'counter' => 2,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'type'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'source_marks' => [
- {
- 'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'X'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'Y'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => '('
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'remaining,'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'type'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'typed'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => ')'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'inside'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
- 'sourcemark_type' =>
'linemacro_expansion',
- 'status' => 'start'
- }
- ],
- 'text' => ''
- },
- {
- 'text' => 'inside '
- },
- {
- 'contents' => [
- {
- 'text' => '{X operator '
- },
- {
- 'contents' => [
- {
- 'text' => '{Y}'
- }
- ],
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => 'inside'
- },
- 'type' => 'balanced_braces'
- },
- {
- 'text' => ' ( remaining, type typed )}'
- }
- ],
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => 'inside'
- },
- 'type' => 'balanced_braces'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'bracketed_arg'
- }
- ],
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'outside'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
index ad3369b382..07f07b552b 100644
--- a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
+++ b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
@@ -108,118 +108,6 @@ $result_trees{'newline_and_continuation_in_brace'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'a'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'b c'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- }
- },
- {
- 'text' => 'd'
- }
- ],
- 'type' => 'def_aggregate'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'some arg '
- },
- {
- 'cmdname' => '
-'
- },
- {
- 'text' => ' b'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'next '
- },
- {
- 'cmdname' => '
-'
- },
- {
- 'text' => ' last'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'line'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'mylinecommand'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/no_arguments.pl
b/tp/t/results/linemacro/no_arguments.pl
index 56add141b5..870b4ffc6b 100644
--- a/tp/t/results/linemacro/no_arguments.pl
+++ b/tp/t/results/linemacro/no_arguments.pl
@@ -75,23 +75,6 @@ $result_trees{'no_arguments'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'noarg'
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -125,43 +108,6 @@ $result_trees{'no_arguments'} = {
'source_marks' => [
{
'counter' => 2,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'A'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'B'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'noarg'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -195,38 +141,6 @@ $result_trees{'no_arguments'} = {
'source_marks' => [
{
'counter' => 3,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'in brace'
- }
- ],
- 'type' => 'bracketed_arg'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'noarg'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/paragraph_no_paragraph.pl
b/tp/t/results/linemacro/paragraph_no_paragraph.pl
index d74e119408..8aa7816270 100644
--- a/tp/t/results/linemacro/paragraph_no_paragraph.pl
+++ b/tp/t/results/linemacro/paragraph_no_paragraph.pl
@@ -90,101 +90,6 @@ $result_trees{'paragraph_no_paragraph'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'aa'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'anchor',
- 'extra' => {
- 'normalized' => 'aa'
- },
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- }
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'definite'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'and'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'more'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- }
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'mycommand'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'position' => 1,
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
@@ -259,38 +164,6 @@ $result_trees{'paragraph_no_paragraph'} = {
'source_marks' => [
{
'counter' => 2,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'bracketed_arg'
- }
- ],
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'mycommand'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'position' => 10,
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
diff --git a/tp/t/results/linemacro/protected_spaces_on_line.pl
b/tp/t/results/linemacro/protected_spaces_on_line.pl
index 0f24a6f922..f7cbc4e4cd 100644
--- a/tp/t/results/linemacro/protected_spaces_on_line.pl
+++ b/tp/t/results/linemacro/protected_spaces_on_line.pl
@@ -93,82 +93,6 @@ $result_trees{'protected_spaces_on_line'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'foo'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => '(bar,'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'baz)'
- },
- {
- 'cmdname' => '
-'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'continuation'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'line'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'test'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -382,95 +306,6 @@ $result_trees{'protected_spaces_on_line'} = {
'source_marks' => [
{
'counter' => 2,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'foo'
- },
- {
- 'cmdname' => ' '
- },
- {
- 'text' => 'b'
- }
- ],
- 'type' => 'def_aggregate'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => '(bar,'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'baz)'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'rest'
- },
- {
- 'cmdname' => ' '
- },
- {
- 'text' => 'and'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'more'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'test'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
@@ -700,61 +535,6 @@ $result_trees{'protected_spaces_on_line'} = {
'source_marks' => [
{
'counter' => 3,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'foo'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => '(bar,'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'baz)'
- },
- {
- 'cmdname' => '@'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'test'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
index a3179043a2..233549bee5 100644
--- a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
@@ -207,243 +207,6 @@ $result_trees{'simple_nested_linemacro_calls'} = {
'source_marks' => [
{
'counter' => 2,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'type'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'a function'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'source_marks' => [
- {
- 'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'X'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'Y'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => '('
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'remaining,'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'type'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'typed'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => ')'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'inside'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
- 'position' => 1,
- 'sourcemark_type' => 'linemacro_expansion',
- 'status' => 'start'
- }
- ],
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'inside'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'X operator Y'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => '('
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'remaining,'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'type'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'typed'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => ')'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'outside'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/spaces_after_command_in_call.pl
b/tp/t/results/linemacro/spaces_after_command_in_call.pl
index b7852adf93..62b7c2b6fe 100644
--- a/tp/t/results/linemacro/spaces_after_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_command_in_call.pl
@@ -97,78 +97,6 @@ $result_trees{'spaces_after_command_in_call'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'd'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'b'
- }
- ],
- 'type' => 'following_arg'
- }
- ],
- 'cmdname' => 'ringaccent',
- 'info' => {
- 'spaces_after_cmd_before_arg' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- }
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'rest'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'mylinecommand'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/spaces_in_args.pl
b/tp/t/results/linemacro/spaces_in_args.pl
index 916f16df68..3ae926d49b 100644
--- a/tp/t/results/linemacro/spaces_in_args.pl
+++ b/tp/t/results/linemacro/spaces_in_args.pl
@@ -97,89 +97,6 @@ $result_trees{'spaces_in_args'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
- },
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'd'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
- },
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'contents' => [
- {
- 'text' => 'rest'
- }
- ],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'bracketed_arg'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'mylinecommand'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/spaces_in_call.pl
b/tp/t/results/linemacro/spaces_in_call.pl
index 21d80679ca..790595b217 100644
--- a/tp/t/results/linemacro/spaces_in_call.pl
+++ b/tp/t/results/linemacro/spaces_in_call.pl
@@ -97,54 +97,6 @@ $result_trees{'spaces_in_call'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'a b'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'contents' => [
- {
- 'text' => 'c d'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'contents' => [
- {
- 'text' => 'rest'
- }
- ],
- 'type' => 'bracketed_arg'
- }
- ],
- 'type' => 'def_aggregate'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'mylinecommand'
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/text_arguments.pl
b/tp/t/results/linemacro/text_arguments.pl
index 680c9f1cf8..19ae6b003f 100644
--- a/tp/t/results/linemacro/text_arguments.pl
+++ b/tp/t/results/linemacro/text_arguments.pl
@@ -87,53 +87,6 @@ $result_trees{'text_arguments'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'X'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'Y'
- },
- {
- 'extra' => {
- 'def_role' => 'spaces'
- },
- 'text' => ' ',
- 'type' => 'spaces'
- },
- {
- 'text' => 'Z'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'nospace'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/results/linemacro/verb_not_closed.pl
b/tp/t/results/linemacro/verb_not_closed.pl
index 799c8a22d5..bcc359e307 100644
--- a/tp/t/results/linemacro/verb_not_closed.pl
+++ b/tp/t/results/linemacro/verb_not_closed.pl
@@ -87,52 +87,6 @@ $result_trees{'verb_not_closed'} = {
'source_marks' => [
{
'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => ' in verb
-',
- 'type' => 'raw'
- },
- {
- 'text' => '
-',
- 'type' => 'raw'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'verb',
- 'info' => {
- 'delimiter' => ':'
- },
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- }
- }
- ],
- 'type' => 'line_arg'
- }
- ],
- 'extra' => {
- 'name' => 'mycommand'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'linemacro_call'
- },
'sourcemark_type' => 'linemacro_expansion',
'status' => 'start'
}
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index c8da99a7b2..00b485e564 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -460,7 +460,7 @@ my @avoided_keys_tree = (@sections_keys, @menus_keys,
@node_keys,
# FIXME remaining_args should not be present in the final tree, but they are
'remaining_args',
'structure', 'menu_child', 'unit_next', 'directions', 'page_next',
- 'parent');
+ 'parent', 'element');
foreach my $avoided_key(@avoided_keys_tree) {
$avoided_keys_tree{$avoided_key} = 1;
}
| [Prev in Thread] | Current Thread | [Next in Thread] |