[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Translations.pm (complete_indices):
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Translations.pm (complete_indices): remove the type of the tree root returned by gdt. Do not mess with the parent of the elements, as the elements may be in the main tree. |
|
Date: |
Tue, 07 Mar 2023 03:03:53 -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 aaee74f76e * tp/Texinfo/Translations.pm (complete_indices): remove the
type of the tree root returned by gdt. Do not mess with the parent of the
elements, as the elements may be in the main tree.
aaee74f76e is described below
commit aaee74f76e557a67b4520bd4779b214adfc3c5dc
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Mar 7 09:03:43 2023 +0100
* tp/Texinfo/Translations.pm (complete_indices): remove the type of
the tree root returned by gdt. Do not mess with the parent of the
elements, as the elements may be in the main tree.
---
ChangeLog | 6 ++
tp/Texinfo/Translations.pm | 15 +++--
.../converters_tests/definition_commands.pl | 3 +-
.../converters_tests/frenchspacing_and_code.pl | 12 ++--
.../converters_tests/test_deftypefnnewline.pl | 24 +++-----
tp/t/results/def/all_commands.pl | 30 ++++------
tp/t/results/def/all_commands_delimiters.pl | 69 ++++++++--------------
.../def/all_commands_delimiters_printindex.pl | 69 ++++++++--------------
tp/t/results/def/all_commands_printindex.pl | 30 ++++------
tp/t/results/def/ampchar.pl | 3 +-
tp/t/results/def/empty_deftype.pl | 6 +-
tp/t/results/languages/documentlanguage.pl | 3 +-
tp/t/results/languages/documentlanguage_option.pl | 3 +-
tp/t/results/languages/documentlanguage_unknown.pl | 3 +-
.../results/languages/multiple_documentlanguage.pl | 9 +--
tp/t/results/languages/multiple_in_preamble.pl | 9 +--
.../languages/multiple_in_preamble_before_node.pl | 6 +-
tp/t/results/languages/multiple_lang_chapters.pl | 9 +--
.../languages/multiple_lang_chapters_latex.pl | 9 +--
.../languages/multiple_lang_chapters_texi2html.pl | 9 +--
tp/t/results/languages/simple_documentlanguage.pl | 3 +-
tp/t/results/languages/unknown_region.pl | 3 +-
22 files changed, 119 insertions(+), 214 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b0d27b6d0f..658d421b98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-03-07 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Translations.pm (complete_indices): remove the type of
+ the tree root returned by gdt. Do not mess with the parent of the
+ elements, as the elements may be in the main tree.
+
2023-03-07 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Translations.pm (complete_indices): determine the name
diff --git a/tp/Texinfo/Translations.pm b/tp/Texinfo/Translations.pm
index 13388587a1..e81f85443c 100644
--- a/tp/Texinfo/Translations.pm
+++ b/tp/Texinfo/Translations.pm
@@ -440,12 +440,15 @@ sub complete_indices($)
_non_bracketed_contents($class)];
}
- # 'root_line' is the container returned by gdt.
- if ($index_entry->{'type'} and $index_entry->{'type'} eq
'root_line') {
- for my $child (@{$index_entry->{'contents'}}) {
- delete $child->{'parent'};
- }
- }
+ # FIXME the 'parent' of the tree elements that correspond to name and
+ # class, be them from gdt or from _non_bracketed_contents, are in the
+ # main tree in the definition command arguments, while the new text
has
+ # either no parent (for index_contents_normalized) or the 'root_line'
+ # container returned by gdt.
+ #
+ # prefer a type-less container rather than 'root_line' returned by
gdt
+ delete $index_entry->{'type'};
+
$main_entry_element->{'extra'}->{'def_index_element'} = $index_entry;
$main_entry_element->{'extra'}->{'def_index_ref_element'}
= {'contents' => $index_contents_normalized};
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index 54e00a0c08..dd4be938b9 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -9338,8 +9338,7 @@ $result_trees{'definition_commands'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 2e2f452943..eaeda644af 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -500,8 +500,7 @@ $result_trees{'frenchspacing_and_code'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -778,8 +777,7 @@ $result_trees{'frenchspacing_and_code'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1294,8 +1292,7 @@ $result_trees{'frenchspacing_and_code'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1572,8 +1569,7 @@ $result_trees{'frenchspacing_and_code'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 9e8d5196d5..095362173a 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -583,8 +583,7 @@ $result_trees{'test_deftypefnnewline'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -749,8 +748,7 @@ $result_trees{'test_deftypefnnewline'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -915,8 +913,7 @@ $result_trees{'test_deftypefnnewline'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1094,8 +1091,7 @@ $result_trees{'test_deftypefnnewline'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1718,8 +1714,7 @@ $result_trees{'test_deftypefnnewline'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1884,8 +1879,7 @@ $result_trees{'test_deftypefnnewline'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -2050,8 +2044,7 @@ $result_trees{'test_deftypefnnewline'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -2229,8 +2222,7 @@ $result_trees{'test_deftypefnnewline'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 48dab0c515..d190240a7a 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -742,8 +742,7 @@ $result_trees{'all_commands'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -907,8 +906,7 @@ $result_trees{'all_commands'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1484,8 +1482,7 @@ $result_trees{'all_commands'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1662,8 +1659,7 @@ $result_trees{'all_commands'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1827,8 +1823,7 @@ $result_trees{'all_commands'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1978,8 +1973,7 @@ $result_trees{'all_commands'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -3364,8 +3358,7 @@ $result_trees{'all_commands'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -3533,8 +3526,7 @@ $result_trees{'all_commands'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -3703,8 +3695,7 @@ $result_trees{'all_commands'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -3885,8 +3876,7 @@ $result_trees{'all_commands'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/def/all_commands_delimiters.pl
b/tp/t/results/def/all_commands_delimiters.pl
index 0dcdbcd640..45d0b20cef 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -3485,8 +3485,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -3863,8 +3862,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -4268,8 +4266,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -4460,8 +4457,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -4672,8 +4668,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -4884,8 +4879,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -5076,8 +5070,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -5268,8 +5261,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -5480,8 +5472,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -5692,8 +5683,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -5884,8 +5874,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -6076,8 +6065,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -6288,8 +6276,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -6500,8 +6487,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -6692,8 +6678,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -6884,8 +6869,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -7109,8 +7093,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -9990,8 +9973,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -10257,8 +10239,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -10496,8 +10477,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -10734,8 +10714,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -11000,8 +10979,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -11267,8 +11245,7 @@ $result_trees{'all_commands_delimiters'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 535370b773..ea720b971a 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -3551,8 +3551,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -3930,8 +3929,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -4336,8 +4334,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -4529,8 +4526,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -4742,8 +4738,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -4955,8 +4950,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -5148,8 +5142,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -5341,8 +5334,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -5554,8 +5546,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -5767,8 +5758,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -5960,8 +5950,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -6153,8 +6142,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -6366,8 +6354,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -6579,8 +6566,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -6772,8 +6758,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -6965,8 +6950,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -7191,8 +7175,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -10086,8 +10069,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -10354,8 +10336,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -10594,8 +10575,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -10833,8 +10813,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -11100,8 +11079,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -11368,8 +11346,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/def/all_commands_printindex.pl
b/tp/t/results/def/all_commands_printindex.pl
index 5fb0127576..886441282f 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -804,8 +804,7 @@ $result_trees{'all_commands_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -970,8 +969,7 @@ $result_trees{'all_commands_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1551,8 +1549,7 @@ $result_trees{'all_commands_printindex'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1730,8 +1727,7 @@ $result_trees{'all_commands_printindex'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1896,8 +1892,7 @@ $result_trees{'all_commands_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -2048,8 +2043,7 @@ $result_trees{'all_commands_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -3444,8 +3438,7 @@ $result_trees{'all_commands_printindex'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -3614,8 +3607,7 @@ $result_trees{'all_commands_printindex'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -3785,8 +3777,7 @@ $result_trees{'all_commands_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -3968,8 +3959,7 @@ $result_trees{'all_commands_printindex'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index 5069ae193a..302d6f4ea5 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -122,8 +122,7 @@ $result_trees{'ampchar'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/def/empty_deftype.pl
b/tp/t/results/def/empty_deftype.pl
index 4dd28bfe6f..a0a37d8121 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -516,8 +516,7 @@ $result_trees{'empty_deftype'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -726,8 +725,7 @@ $result_trees{'empty_deftype'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/documentlanguage.pl
b/tp/t/results/languages/documentlanguage.pl
index 5b94e7e8e3..3103f040d6 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -511,8 +511,7 @@ $result_trees{'documentlanguage'} = {
'text' => ' na '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/documentlanguage_option.pl
b/tp/t/results/languages/documentlanguage_option.pl
index 21e8cc1cf4..fd95db87a1 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -511,8 +511,7 @@ $result_trees{'documentlanguage_option'} = {
'text' => ' de '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl
b/tp/t/results/languages/documentlanguage_unknown.pl
index b2f0998cbc..fda4872ffe 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -511,8 +511,7 @@ $result_trees{'documentlanguage_unknown'} = {
'text' => ' on '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl
b/tp/t/results/languages/multiple_documentlanguage.pl
index 3879dbfb45..4440baeafa 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -142,8 +142,7 @@ $result_trees{'multiple_documentlanguage'} = {
'text' => ' de '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -501,8 +500,7 @@ $result_trees{'multiple_documentlanguage'} = {
'text' => ' de '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -783,8 +781,7 @@ $result_trees{'multiple_documentlanguage'} = {
'text' => ' od '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/multiple_in_preamble.pl
b/tp/t/results/languages/multiple_in_preamble.pl
index 03d1bde49b..0d54a07175 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -142,8 +142,7 @@ $result_trees{'multiple_in_preamble'} = {
'text' => ' de '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -537,8 +536,7 @@ $result_trees{'multiple_in_preamble'} = {
'text' => ' od '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -762,8 +760,7 @@ $result_trees{'multiple_in_preamble'} = {
'text' => ' von '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index 71a8483c3c..e735a430b4 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -142,8 +142,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
'text' => ' de '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -588,8 +587,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
'text' => ' von '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl
b/tp/t/results/languages/multiple_lang_chapters.pl
index 90d5141d0c..112a5f4536 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -801,8 +801,7 @@ $result_trees{'multiple_lang_chapters'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1099,8 +1098,7 @@ $result_trees{'multiple_lang_chapters'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1361,8 +1359,7 @@ $result_trees{'multiple_lang_chapters'} = {
'text' => ' de '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 1c71a264a3..6d9a962c17 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -801,8 +801,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1099,8 +1098,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1361,8 +1359,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'text' => ' de '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index e29d1b6f19..dfdee21dbd 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -768,8 +768,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1066,8 +1065,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'text' => ' of '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
@@ -1328,8 +1326,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'text' => ' de '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/simple_documentlanguage.pl
b/tp/t/results/languages/simple_documentlanguage.pl
index 7b0887a76b..0f8b1af654 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -190,8 +190,7 @@ $result_trees{'simple_documentlanguage'} = {
'text' => ' de '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
diff --git a/tp/t/results/languages/unknown_region.pl
b/tp/t/results/languages/unknown_region.pl
index 5972812e0a..ecffa0f900 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -190,8 +190,7 @@ $result_trees{'unknown_region'} = {
'text' => ' de '
},
{}
- ],
- 'type' => 'root_line'
+ ]
},
'def_index_ref_element' => {
'contents' => [
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Translations.pm (complete_indices): remove the type of the tree root returned by gdt. Do not mess with the parent of the elements, as the elements may be in the main tree.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Translations.pm (complete_indices): determine the name and class of def command by looking at the contents instead of using def_parsed_hash.
- Next by Date:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line_def_line), tp/Texinfo/XS/parsetexi/api.c (store_additional_info), tp/Texinfo/XS/parsetexi/end_line.c (end_line_def_line), tp/Texinfo/XS/parsetexi/extra.c (add_extra_misc_args), tp/Texinfo/XS/parsetexi/tree.c (destroy_associated_info), tp/Texinfo/XS/parsetexi/tree_types.h (enum extra_type): do not set extra def_parsed_hash in the tree. It is easy to look at the contents, and in general the @def args argument need to be collected at the same time, such [...]
- Previous by thread:
branch master updated: * tp/Texinfo/Translations.pm (complete_indices): determine the name and class of def command by looking at the contents instead of using def_parsed_hash.
- Next by thread:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line_def_line), tp/Texinfo/XS/parsetexi/api.c (store_additional_info), tp/Texinfo/XS/parsetexi/end_line.c (end_line_def_line), tp/Texinfo/XS/parsetexi/extra.c (add_extra_misc_args), tp/Texinfo/XS/parsetexi/tree.c (destroy_associated_info), tp/Texinfo/XS/parsetexi/tree_types.h (enum extra_type): do not set extra def_parsed_hash in the tree. It is easy to look at the contents, and in general the @def args argument need to be collected at the same time, such [...]
- Index(es):