[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/t/60macro.t, tp/t/80include.t: change tests
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/t/60macro.t, tp/t/80include.t: change tests to be more useful for LaTeX by adding nodes after Top node. |
|
Date: |
Wed, 15 Feb 2023 11:49:12 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 5706faa569 * tp/t/60macro.t, tp/t/80include.t: change tests to be more
useful for LaTeX by adding nodes after Top node.
5706faa569 is described below
commit 5706faa569fc2ac50eaeb1c56aadd1dc635803a8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Feb 15 17:49:04 2023 +0100
* tp/t/60macro.t, tp/t/80include.t: change tests to be more useful for
LaTeX by adding nodes after Top node.
---
ChangeLog | 5 +
tp/t/60macro.t | 2 +
tp/t/80include.t | 5 +
tp/t/input_files/cpp_line_latin1.texi | 2 +
tp/t/input_files/cpp_lines.texi | 1 +
tp/t/results/include/cpp_line_latin1.pl | 80 ++++++++++++-
tp/t/results/include/cpp_lines.pl | 70 +++++++++++-
.../macro_and_commands_in_early_commands.pl | 86 ++++++++++++--
tp/t/results/include/macro_in_early_commands.pl | 84 ++++++++++++--
tp/t/results/include/value_expansion_in_include.pl | 94 ++++++++++++---
tp/t/results/macro/backslash_in_arg.pl | 119 ++++++++++++++-----
tp/t/results/macro/macro_in_index_commands.pl | 127 +++++++++++++++------
12 files changed, 569 insertions(+), 106 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7252675410..bbdd7a47e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-15 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/60macro.t, tp/t/80include.t: change tests to be more useful for
+ LaTeX by adding nodes after Top node.
+
2023-02-15 Patrice Dumas <pertusus@free.fr>
* tp/t/57invalid_nestings.t: change ref_in_anchor test name to
diff --git a/tp/t/60macro.t b/tp/t/60macro.t
index 2374ba4b2b..2096cdefe6 100644
--- a/tp/t/60macro.t
+++ b/tp/t/60macro.t
@@ -292,6 +292,7 @@ result: @emph{\arg1\} protected \\\\ -> \\\\arg1\\\\
@emph{\arg2\}
'],
['backslash_in_arg',
'@node Top
+@node chap
@macro funindex {TEXT}
@findex \TEXT\
@@ -971,6 +972,7 @@ a @var{index entry} t@\'e @^{@dotless{i}}
@end macro
@node Top
+@node chap
@trucindexcommand{} index truc
diff --git a/tp/t/80include.t b/tp/t/80include.t
index 8df746f118..af43b3e548 100644
--- a/tp/t/80include.t
+++ b/tp/t/80include.t
@@ -43,6 +43,7 @@ After inclusion.
@node Top
+@node chap
testvar include: @include @value{testvar}
@@ -86,6 +87,8 @@ macro_included.texi
@node Top
@top top
+@node chap
+
@include @multiinclude
@themacro{}
@@ -115,6 +118,8 @@ macro_included.texi
@node Top
@top top
+@node chap
+
@include @multiinclude
@themacro{}
diff --git a/tp/t/input_files/cpp_line_latin1.texi
b/tp/t/input_files/cpp_line_latin1.texi
index a7161933a3..21a369f791 100644
--- a/tp/t/input_files/cpp_line_latin1.texi
+++ b/tp/t/input_files/cpp_line_latin1.texi
@@ -5,6 +5,8 @@
@node Top
@top
+@node chap
+
#line 100 "foo.pt�xi"
@gggg
diff --git a/tp/t/input_files/cpp_lines.texi b/tp/t/input_files/cpp_lines.texi
index a9b7dda98e..c03cad0c48 100644
--- a/tp/t/input_files/cpp_lines.texi
+++ b/tp/t/input_files/cpp_lines.texi
@@ -7,6 +7,7 @@
@email{before top}.
@node Top
+@node chap
# 10 25 209
# 1 2
diff --git a/tp/t/results/include/cpp_line_latin1.pl
b/tp/t/results/include/cpp_line_latin1.pl
index eb3fbcc505..b0982c9880 100644
--- a/tp/t/results/include/cpp_line_latin1.pl
+++ b/tp/t/results/include/cpp_line_latin1.pl
@@ -130,6 +130,38 @@ $result_trees{'cpp_line_latin1'} = {
'contents' => [
{
'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'source_info' => {
+ 'file_name' => 'cpp_line_latin1.texi',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
+ 'text' => '
',
'type' => 'empty_line'
},
@@ -167,10 +199,28 @@ $result_trees{'cpp_line_latin1'} = {
'type' => 'empty_line'
}
],
- 'extra' => {},
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'chap'
+ }
+ ],
+ 'normalized' => 'chap'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
'source_info' => {
'file_name' => 'cpp_line_latin1.texi',
- 'line_nr' => 6,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -189,6 +239,8 @@ $result_trees{'cpp_line_latin1'} = {
};
$result_trees{'cpp_line_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'cpp_line_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'cpp_line_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'cpp_line_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'cpp_line_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0] =
$result_trees{'cpp_line_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'cpp_line_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'cpp_line_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
$result_texis{'cpp_line_latin1'} = '\\input texinfo
@@ -197,6 +249,8 @@ $result_texis{'cpp_line_latin1'} = '\\input texinfo
@node Top
@top
+@node chap
+
@@ -211,6 +265,7 @@ $result_texts{'cpp_line_latin1'} = '
+
aaa
';
@@ -226,7 +281,8 @@ $result_sectioning{'cpp_line_latin1'} = {
'extra' => {
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
}
},
'structure' => {
@@ -250,15 +306,29 @@ $result_nodes{'cpp_line_latin1'} = {
},
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chap'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_prev' => {}
+ }
+ }
+ }
};
+$result_nodes{'cpp_line_latin1'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'cpp_line_latin1'};
$result_menus{'cpp_line_latin1'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
};
$result_errors{'cpp_line_latin1'} = [
diff --git a/tp/t/results/include/cpp_lines.pl
b/tp/t/results/include/cpp_lines.pl
index 1caba9614c..924ed5a1ba 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -117,6 +117,49 @@ $result_trees{'cpp_lines'} = {
'info' => {
'spaces_after_argument' => {
'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => 70,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
}
},
@@ -1145,10 +1188,10 @@ $result_trees{'cpp_lines'} = {
'node_content' => [
{}
],
- 'normalized' => 'Top'
+ 'normalized' => 'chap'
}
],
- 'normalized' => 'Top'
+ 'normalized' => 'chap'
},
'info' => {
'spaces_before_argument' => {
@@ -1157,7 +1200,7 @@ $result_trees{'cpp_lines'} = {
},
'source_info' => {
'file_name' => 'g_f',
- 'line_nr' => 70,
+ 'line_nr' => 71,
'macro' => ''
}
},
@@ -1176,6 +1219,8 @@ $result_trees{'cpp_lines'} = {
};
$result_trees{'cpp_lines'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'cpp_lines'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[2]{'extra'}{'node_content'}[0] =
$result_trees{'cpp_lines'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'cpp_lines'}{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_texis{'cpp_lines'} = '\\input texinfo
@setfilename cpp_lines.info
@@ -1184,6 +1229,7 @@ $result_texis{'cpp_lines'} = '\\input texinfo
@email{before top}.
@node Top
+@node chap
# 10 25 209
# 1 2
@@ -1334,15 +1380,29 @@ $result_nodes{'cpp_lines'} = {
'extra' => {
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chap'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_prev' => {}
+ }
+ }
+ }
};
+$result_nodes{'cpp_lines'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'cpp_lines'};
$result_menus{'cpp_lines'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
};
$result_errors{'cpp_lines'} = [
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 17ec24ae49..ce1c7e177e 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -389,6 +389,43 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
}
],
'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
'contents' => [
{
'source_marks' => [
@@ -436,7 +473,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 21,
+ 'line_nr' => 23,
'macro' => ''
}
},
@@ -555,7 +592,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 21,
+ 'line_nr' => 23,
'macro' => 'multiinclude'
}
},
@@ -657,12 +694,25 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 25,
+ 'line_nr' => 27,
'macro' => ''
}
}
],
- 'extra' => {},
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'chap'
+ }
+ ],
+ 'normalized' => 'chap'
+ },
'info' => {
'spaces_before_argument' => {
'text' => ' '
@@ -670,7 +720,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 21,
'macro' => ''
}
}
@@ -679,6 +729,8 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
};
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
$result_texis{'macro_and_commands_in_early_commands'} = '@macro begin-file
macro_i--n_pass@@
@@ -700,6 +752,8 @@ macro_included.texi
@node Top
@top top
+@node chap
+
@macro themacro
in themacro
@end macro
@@ -719,6 +773,7 @@ $result_texts{'macro_and_commands_in_early_commands'} = '
top
***
+
In included file.
in themacro
@@ -736,7 +791,8 @@ $result_sectioning{'macro_and_commands_in_early_commands'}
= {
'extra' => {
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
}
},
'info' => {},
@@ -762,15 +818,29 @@ $result_nodes{'macro_and_commands_in_early_commands'} = {
},
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chap'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_prev' => {}
+ }
+ }
+ }
};
+$result_nodes{'macro_and_commands_in_early_commands'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'macro_and_commands_in_early_commands'};
$result_menus{'macro_and_commands_in_early_commands'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
};
$result_errors{'macro_and_commands_in_early_commands'} = [
diff --git a/tp/t/results/include/macro_in_early_commands.pl
b/tp/t/results/include/macro_in_early_commands.pl
index fa74e5b0f5..f148574ec7 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -554,6 +554,43 @@ $result_trees{'macro_in_early_commands'} = {
}
],
'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 26,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
'contents' => [
{
'source_marks' => [
@@ -601,7 +638,7 @@ $result_trees{'macro_in_early_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 28,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -714,7 +751,7 @@ $result_trees{'macro_in_early_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 28,
+ 'line_nr' => 30,
'macro' => 'multiinclude'
}
},
@@ -839,7 +876,20 @@ $result_trees{'macro_in_early_commands'} = {
'type' => 'paragraph'
}
],
- 'extra' => {},
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'chap'
+ }
+ ],
+ 'normalized' => 'chap'
+ },
'info' => {
'spaces_before_argument' => {
'text' => ' '
@@ -847,7 +897,7 @@ $result_trees{'macro_in_early_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 26,
+ 'line_nr' => 28,
'macro' => ''
}
}
@@ -856,6 +906,8 @@ $result_trees{'macro_in_early_commands'} = {
};
$result_trees{'macro_in_early_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'macro_in_early_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'macro_in_early_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'macro_in_early_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'macro_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'macro_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
$result_texis{'macro_in_early_commands'} = '@macro begin-file
macro_in_pass
@@ -884,6 +936,8 @@ macro_included.texi
@node Top
@top top
+@node chap
+
@macro themacro
in themacro
@end macro
@@ -905,6 +959,7 @@ $result_texts{'macro_in_early_commands'} = '
top
***
+
In included file.
in themacro
@@ -924,7 +979,8 @@ $result_sectioning{'macro_in_early_commands'} = {
'extra' => {
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
}
},
'info' => {},
@@ -950,15 +1006,29 @@ $result_nodes{'macro_in_early_commands'} = {
},
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chap'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_prev' => {}
+ }
+ }
+ }
};
+$result_nodes{'macro_in_early_commands'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'macro_in_early_commands'};
$result_menus{'macro_in_early_commands'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
};
$result_errors{'macro_in_early_commands'} = [];
diff --git a/tp/t/results/include/value_expansion_in_include.pl
b/tp/t/results/include/value_expansion_in_include.pl
index 417330d7c2..5f1b78bece 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -144,6 +144,49 @@ $result_trees{'value_expansion_in_include'} = {
'info' => {
'spaces_after_argument' => {
'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
}
},
@@ -216,7 +259,7 @@ $result_trees{'value_expansion_in_include'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -327,7 +370,7 @@ $result_trees{'value_expansion_in_include'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 15,
'macro' => ''
}
},
@@ -400,7 +443,7 @@ $result_trees{'value_expansion_in_include'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -511,7 +554,7 @@ $result_trees{'value_expansion_in_include'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 20,
'macro' => ''
}
},
@@ -582,7 +625,7 @@ $result_trees{'value_expansion_in_include'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 22,
+ 'line_nr' => 23,
'macro' => ''
}
},
@@ -691,7 +734,7 @@ $result_trees{'value_expansion_in_include'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 24,
+ 'line_nr' => 25,
'macro' => ''
}
}
@@ -705,10 +748,10 @@ $result_trees{'value_expansion_in_include'} = {
'node_content' => [
{}
],
- 'normalized' => 'Top'
+ 'normalized' => 'chap'
}
],
- 'normalized' => 'Top'
+ 'normalized' => 'chap'
},
'info' => {
'spaces_before_argument' => {
@@ -717,7 +760,7 @@ $result_trees{'value_expansion_in_include'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 11,
'macro' => ''
}
}
@@ -726,6 +769,8 @@ $result_trees{'value_expansion_in_include'} = {
};
$result_trees{'value_expansion_in_include'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'value_expansion_in_include'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'value_expansion_in_include'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'value_expansion_in_include'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'value_expansion_in_include'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'value_expansion_in_include'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'value_expansion_in_include'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'value_expansion_in_include'}{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_texis{'value_expansion_in_include'} = '@set testvar incl-incl.txi
@@ -737,6 +782,7 @@ $result_texis{'value_expansion_in_include'} = '@set testvar
incl-incl.txi
@node Top
+@node chap
testvar include: This is the @emph{included} file (include-value2.txi) <> ---.
@@ -776,15 +822,29 @@ $result_nodes{'value_expansion_in_include'} = {
'extra' => {
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chap'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_prev' => {}
+ }
+ }
+ }
};
+$result_nodes{'value_expansion_in_include'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'value_expansion_in_include'};
$result_menus{'value_expansion_in_include'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
};
$result_errors{'value_expansion_in_include'} = [
@@ -792,7 +852,7 @@ $result_errors{'value_expansion_in_include'} = [
'error_line' => 'warning: @include should only appear at the beginning of
a line
',
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 13,
'macro' => '',
'text' => '@include should only appear at the beginning of a line',
'type' => 'warning'
@@ -801,7 +861,7 @@ $result_errors{'value_expansion_in_include'} = [
'error_line' => 'warning: @verbatiminclude should only appear at the
beginning of a line
',
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 15,
'macro' => '',
'text' => '@verbatiminclude should only appear at the beginning of a line',
'type' => 'warning'
@@ -810,7 +870,7 @@ $result_errors{'value_expansion_in_include'} = [
'error_line' => 'warning: @include should only appear at the beginning of
a line
',
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 18,
'macro' => '',
'text' => '@include should only appear at the beginning of a line',
'type' => 'warning'
@@ -819,7 +879,7 @@ $result_errors{'value_expansion_in_include'} = [
'error_line' => 'warning: @verbatiminclude should only appear at the
beginning of a line
',
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 20,
'macro' => '',
'text' => '@verbatiminclude should only appear at the beginning of a line',
'type' => 'warning'
@@ -828,7 +888,7 @@ $result_errors{'value_expansion_in_include'} = [
'error_line' => 'warning: @include should only appear at the beginning of
a line
',
'file_name' => '',
- 'line_nr' => 22,
+ 'line_nr' => 23,
'macro' => '',
'text' => '@include should only appear at the beginning of a line',
'type' => 'warning'
@@ -837,7 +897,7 @@ $result_errors{'value_expansion_in_include'} = [
'error_line' => 'warning: @verbatiminclude should only appear at the
beginning of a line
',
'file_name' => '',
- 'line_nr' => 24,
+ 'line_nr' => 25,
'macro' => '',
'text' => '@verbatiminclude should only appear at the beginning of a line',
'type' => 'warning'
diff --git a/tp/t/results/macro/backslash_in_arg.pl
b/tp/t/results/macro/backslash_in_arg.pl
index 738fe248cc..9f09b03239 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -21,6 +21,49 @@ $result_trees{'backslash_in_arg'} = {
'info' => {
'spaces_after_argument' => {
'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
}
},
@@ -80,7 +123,7 @@ $result_trees{'backslash_in_arg'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 6,
'macro' => ''
}
}
@@ -91,7 +134,7 @@ $result_trees{'backslash_in_arg'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -176,7 +219,7 @@ $result_trees{'backslash_in_arg'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 8,
'macro' => 'funindex'
},
'source_marks' => [
@@ -251,7 +294,7 @@ $result_trees{'backslash_in_arg'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => 'funindex'
},
'source_marks' => [
@@ -331,7 +374,7 @@ $result_trees{'backslash_in_arg'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => 'funindex'
},
'source_marks' => [
@@ -406,7 +449,7 @@ $result_trees{'backslash_in_arg'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 11,
'macro' => 'funindex'
},
'type' => 'index_entry_command'
@@ -441,7 +484,7 @@ $result_trees{'backslash_in_arg'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 12,
'macro' => ''
}
}
@@ -456,10 +499,10 @@ $result_trees{'backslash_in_arg'} = {
'node_content' => [
{}
],
- 'normalized' => 'Top'
+ 'normalized' => 'chap'
}
],
- 'normalized' => 'Top'
+ 'normalized' => 'chap'
},
'info' => {
'spaces_before_argument' => {
@@ -468,33 +511,36 @@ $result_trees{'backslash_in_arg'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => ''
}
}
],
'type' => 'document_root'
};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'backslash_in_arg'}{'contents'}[1];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'backslash_in_arg'}{'contents'}[1];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'backslash_in_arg'}{'contents'}[1];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'backslash_in_arg'}{'contents'}[1];
$result_trees{'backslash_in_arg'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'backslash_in_arg'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'backslash_in_arg'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'backslash_in_arg'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'backslash_in_arg'}{'contents'}[2];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'backslash_in_arg'}{'contents'}[2];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'backslash_in_arg'}{'contents'}[2];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'backslash_in_arg'}{'contents'}[2];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'extra'}{'node_content'}[0] =
$result_trees{'backslash_in_arg'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'backslash_in_arg'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'backslash_in_arg'}{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_texis{'backslash_in_arg'} = '@node Top
+@node chap
@macro funindex {TEXT}
@findex \\TEXT\\
@@ -515,19 +561,32 @@ $result_texts{'backslash_in_arg'} = '
$result_nodes{'backslash_in_arg'} = {
'cmdname' => 'node',
'extra' => {
- 'isindex' => 1,
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'isindex' => 1,
+ 'normalized' => 'chap'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_prev' => {}
+ }
+ }
+ }
};
+$result_nodes{'backslash_in_arg'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'backslash_in_arg'};
$result_menus{'backslash_in_arg'} = {
'cmdname' => 'node',
'extra' => {
- 'isindex' => 1,
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
};
$result_errors{'backslash_in_arg'} = [];
diff --git a/tp/t/results/macro/macro_in_index_commands.pl
b/tp/t/results/macro/macro_in_index_commands.pl
index 4f3fd25d6c..93b924dbfc 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -717,6 +717,49 @@ $result_trees{'macro_in_index_commands'} = {
'info' => {
'spaces_after_argument' => {
'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 36,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
}
},
@@ -790,7 +833,7 @@ $result_trees{'macro_in_index_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 38,
+ 'line_nr' => 39,
'macro' => 'trucindexcommand'
},
'type' => 'index_entry_command'
@@ -821,7 +864,7 @@ $result_trees{'macro_in_index_commands'} = {
'cmdname' => 'var',
'source_info' => {
'file_name' => '',
- 'line_nr' => 40,
+ 'line_nr' => 41,
'macro' => 'defcodeindexentry'
}
},
@@ -842,7 +885,7 @@ $result_trees{'macro_in_index_commands'} = {
'cmdname' => '\'',
'source_info' => {
'file_name' => '',
- 'line_nr' => 40,
+ 'line_nr' => 41,
'macro' => 'defcodeindexentry'
}
},
@@ -867,7 +910,7 @@ $result_trees{'macro_in_index_commands'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => '',
- 'line_nr' => 40,
+ 'line_nr' => 41,
'macro' => 'defcodeindexentry'
}
}
@@ -878,7 +921,7 @@ $result_trees{'macro_in_index_commands'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => '',
- 'line_nr' => 40,
+ 'line_nr' => 41,
'macro' => 'defcodeindexentry'
},
'source_marks' => [
@@ -935,7 +978,7 @@ $result_trees{'macro_in_index_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 40,
+ 'line_nr' => 41,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1006,7 +1049,7 @@ $result_trees{'macro_in_index_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 42,
+ 'line_nr' => 43,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1070,7 +1113,7 @@ $result_trees{'macro_in_index_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 43,
+ 'line_nr' => 44,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1141,7 +1184,7 @@ $result_trees{'macro_in_index_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 46,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -1211,7 +1254,7 @@ $result_trees{'macro_in_index_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 49,
+ 'line_nr' => 50,
'macro' => ''
}
},
@@ -1231,10 +1274,10 @@ $result_trees{'macro_in_index_commands'} = {
'node_content' => [
{}
],
- 'normalized' => 'Top'
+ 'normalized' => 'chap'
}
],
- 'normalized' => 'Top'
+ 'normalized' => 'chap'
},
'info' => {
'spaces_before_argument' => {
@@ -1243,31 +1286,33 @@ $result_trees{'macro_in_index_commands'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 36,
+ 'line_nr' => 37,
'macro' => ''
}
}
],
'type' => 'document_root'
};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'macro_in_index_commands'}{'contents'}[1];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'macro_in_index_commands'}{'contents'}[1];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'macro_in_index_commands'}{'contents'}[1];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'macro_in_index_commands'}{'contents'}[1];
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'macro_in_index_commands'}{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'macro_in_index_commands'}{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'macro_in_index_commands'}{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'macro_in_index_commands'}{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_texis{'macro_in_index_commands'} = '@macro cp
cp
@@ -1305,6 +1350,7 @@ a @var{index entry} t@\'e @^{@dotless{i}}
@end macro
@node Top
+@node chap
@trucindex index truc
@@ -1345,19 +1391,32 @@ macro cp
$result_nodes{'macro_in_index_commands'} = {
'cmdname' => 'node',
'extra' => {
- 'isindex' => 1,
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'isindex' => 1,
+ 'normalized' => 'chap'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_prev' => {}
+ }
+ }
+ }
};
+$result_nodes{'macro_in_index_commands'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'macro_in_index_commands'};
$result_menus{'macro_in_index_commands'} = {
'cmdname' => 'node',
'extra' => {
- 'isindex' => 1,
'normalized' => 'Top'
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
};
$result_errors{'macro_in_index_commands'} = [
@@ -1365,7 +1424,7 @@ $result_errors{'macro_in_index_commands'} = [
'error_line' => 'warning: printing an index `cp\' merged in another one,
`fn\'
',
'file_name' => '',
- 'line_nr' => 49,
+ 'line_nr' => 50,
'macro' => '',
'text' => 'printing an index `cp\' merged in another one, `fn\'',
'type' => 'warning'
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/t/60macro.t, tp/t/80include.t: change tests to be more useful for LaTeX by adding nodes after Top node.,
Patrice Dumas <=