[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_enter_index_entry), tp/Texinfo/Structuring.pm (sort_indices), tp/Texinfo/XS/parsetexi/api.c (build_single_index_data), tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry): do not duplicate sortas information in index entry. Change 'current' variable name. |
|
Date: |
Fri, 17 Feb 2023 08:04:25 -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 c3536426d4 * tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
tp/Texinfo/Structuring.pm (sort_indices), tp/Texinfo/XS/parsetexi/api.c
(build_single_index_data), tp/Texinfo/XS/parsetexi/indices.c
(enter_index_entry): do not duplicate sortas information in index entry. Change
'current' variable name.
c3536426d4 is described below
commit c3536426d451caf2e8aed2a423131b0e82597847
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Feb 17 14:04:15 2023 +0100
* tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
tp/Texinfo/Structuring.pm (sort_indices),
tp/Texinfo/XS/parsetexi/api.c (build_single_index_data),
tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry): do not
duplicate sortas information in index entry. Change 'current' variable
name.
* tp/Texinfo/Convert/HTML.pm (_convert_printindex_command),
tp/Texinfo/Structuring.pm (sort_indices): use a variable for the
element associated to the index entry.
* tp/Texinfo/Structuring.pm: avoid autovivification.
---
ChangeLog | 15 +++++++++++
tp/Texinfo/Convert/HTML.pm | 15 +++++------
tp/Texinfo/ParserNonXS.pm | 14 +++++-----
tp/Texinfo/Structuring.pm | 30 +++++++++++++---------
tp/Texinfo/XS/parsetexi/api.c | 2 --
tp/Texinfo/XS/parsetexi/indices.c | 12 +++------
tp/Texinfo/XS/parsetexi/tree_types.h | 1 -
.../coverage_braces/contain_plain_text_nestings.pl | 6 ++---
tp/t/results/indices/explicit_sort_key.pl | 9 +++----
.../indices/ignored_sort_char_empty_entries.pl | 3 +--
.../multiple_index_text_sortas_seeentry_seealso.pl | 6 ++---
tp/t/results/indices/subentry_and_sortas.pl | 6 ++---
tp/t/results/indices/subentry_and_sortas_spaces.pl | 3 +--
tp/t/results/latex_tests/indices.pl | 3 +--
.../latex_tests/indices_disable_encoding.pl | 3 +--
.../in_menu_only_special_ascii_spaces_node.pl | 2 --
.../in_menu_only_special_ascii_spaces_node_menu.pl | 2 --
.../sectioning/in_menu_only_special_spaces_node.pl | 2 --
.../in_menu_only_special_spaces_node_menu.pl | 2 --
19 files changed, 63 insertions(+), 73 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 135fcdfc56..4ea326edfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2023-02-17 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
+ tp/Texinfo/Structuring.pm (sort_indices),
+ tp/Texinfo/XS/parsetexi/api.c (build_single_index_data),
+ tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry): do not
+ duplicate sortas information in index entry. Change 'current' variable
+ name.
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_printindex_command),
+ tp/Texinfo/Structuring.pm (sort_indices): use a variable for the
+ element associated to the index entry.
+
+ * tp/Texinfo/Structuring.pm: avoid autovivification.
+
2023-02-16 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 54a96b7fa6..3977d8af7d 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5558,6 +5558,7 @@ sub _convert_printindex_command($$$$)
my $normalized_entry_levels = [];
foreach my $index_entry_ref (@{$letter_entry->{'entries'}}) {
$entry_nr++;
+ my $main_entry_element = $index_entry_ref->{'entry_element'};
next if ($self->get_conf('NO_TOP_NODE_OUTPUT')
and defined($index_entry_ref->{'entry_node'})
and $index_entry_ref->{'entry_node'}->{'extra'}
@@ -5577,17 +5578,15 @@ sub _convert_printindex_command($$$$)
$entry_ref_tree->{'type'} = '_code' if ($index_entry_ref->{'in_code'});
# index entry with @seeentry or @seealso
- if ($index_entry_ref->{'entry_element'}->{'extra'}
- and ($index_entry_ref->{'entry_element'}->{'extra'}->{'seeentry'}
- or $index_entry_ref->{'entry_element'}->{'extra'}->{'seealso'}))
{
+ if ($main_entry_element->{'extra'}
+ and ($main_entry_element->{'extra'}->{'seeentry'}
+ or $main_entry_element->{'extra'}->{'seealso'})) {
my $referred_entry;
my $seenentry = 1;
- if ($index_entry_ref->{'entry_element'}->{'extra'}->{'seeentry'}) {
- $referred_entry
- = $index_entry_ref->{'entry_element'}->{'extra'}->{'seeentry'};
+ if ($main_entry_element->{'extra'}->{'seeentry'}) {
+ $referred_entry = $main_entry_element->{'extra'}->{'seeentry'};
} else {
- $referred_entry
- = $index_entry_ref->{'entry_element'}->{'extra'}->{'seealso'};
+ $referred_entry = $main_entry_element->{'extra'}->{'seealso'};
$seenentry = 0;
}
my @referred_contents;
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 6146f70bf3..46aed0c75a 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3310,7 +3310,7 @@ sub _register_label($$$)
# arguments, based on the definition line arguments.
sub _enter_index_entry($$$$$$)
{
- my ($self, $command_container, $current, $content,
+ my ($self, $command_container, $element, $content,
$content_normalized, $source_info) = @_;
$content_normalized = $content if (!defined($content_normalized));
@@ -3327,7 +3327,7 @@ sub _enter_index_entry($$$$$$)
my $index_entry = { 'index_name' => $index_name,
'entry_content' => $content,
'content_normalized' => $content_normalized,
- 'entry_element' => $current,
+ 'entry_element' => $element,
'entry_number' => $number,
'index_ignore_chars' => {},
};
@@ -3338,11 +3338,9 @@ sub _enter_index_entry($$$$$$)
$index_entry->{'index_ignore_chars'}->{$ignored_char} = 1;
}
}
- if (defined($current->{'extra'}) and
defined($current->{'extra'}->{'sortas'})) {
- $index_entry->{'sortas'} = $current->{'extra'}->{'sortas'};
- }
if (@{$self->{'nesting_context'}->{'regions_stack'}} > 0) {
- $index_entry->{'entry_region'} =
$self->{'nesting_context'}->{'regions_stack'}->[-1];
+ $index_entry->{'entry_region'}
+ = $self->{'nesting_context'}->{'regions_stack'}->[-1];
} elsif ($self->{'current_node'}) {
$index_entry->{'entry_node'} = $self->{'current_node'};
} elsif (!$self->{'current_section'}) {
@@ -3352,8 +3350,8 @@ sub _enter_index_entry($$$$$$)
push @{$index->{'index_entries'}}, $index_entry;
- $current->{'extra'} = {} if (!defined($current->{'extra'}));
- $current->{'extra'}->{'index_entry'} = $index_entry;
+ $element->{'extra'} = {} if (!defined($element->{'extra'}));
+ $element->{'extra'}->{'index_entry'} = $index_entry;
}
sub _in_include($)
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index e745fd5a71..c52add248c 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -439,11 +439,12 @@ sub check_nodes_are_referenced
# consider nodes in @*ref commands to be referenced
if (defined($refs)) {
foreach my $ref (@$refs) {
- my $node_arg = $ref->{'extra'}->{'node_argument'};
- if ($node_arg and $node_arg->{'node_content'}) {
+ if ($ref->{'extra'} and $ref->{'extra'}->{'node_argument'}
+ and $ref->{'extra'}->{'node_argument'}->{'node_content'}) {
my $normalized =
Texinfo::Convert::NodeNameNormalization::normalize_node(
- {'contents' => $node_arg->{'node_content'} });
+ {'contents' =>
+ $ref->{'extra'}->{'node_argument'}->{'node_content'} });
my $node_target = $labels->{$normalized};
if ($node_target) {
$referenced_nodes{$node_target} = 1;
@@ -1937,22 +1938,27 @@ sub sort_indices($$$;$$)
# used if $sort_by_letter
my $index_letter_hash = {};
foreach my $entry (@{$index_entries->{$index_name}}) {
+ my $main_entry_element = $entry->{'entry_element'};
+ my $main_entry_sortas;
+ $main_entry_sortas = $main_entry_element->{'extra'}->{'sortas'}
+ if ($main_entry_element->{'extra'});
my ($entry_key, $sort_entry_key)
- = index_entry_sort_string($entry,
+ = index_entry_sort_string($entry,
{'contents' => $entry->{'entry_content'}},
- $entry->{'sortas'}, $options, $entries_collator);
+ $main_entry_sortas,
+ $options, $entries_collator);
my @entry_keys;
my @sort_entry_keys;
my $letter = '';
if ($entry_key !~ /\S/) {
- my $entry_cmdname = $entry->{'entry_element'}->{'cmdname'};
+ my $entry_cmdname = $main_entry_element->{'cmdname'};
$entry_cmdname
- = $entry->{'entry_element'}->{'extra'}->{'original_def_cmdname'}
+ = $main_entry_element->{'extra'}->{'original_def_cmdname'}
if (!defined($entry_cmdname));
$registrar->line_warn($customization_information,
sprintf(__("empty index key in \@%s"),
$entry_cmdname),
- $entry->{'entry_element'}->{'source_info'});
+ $main_entry_element->{'source_info'});
push @entry_keys, '';
push @sort_entry_keys, '';
} else {
@@ -1974,7 +1980,7 @@ sub sort_indices($$$;$$)
}
}
my $subentry_nr = 0;
- my $subentry = $entry->{'entry_element'};
+ my $subentry = $main_entry_element;
while ($subentry->{'extra'} and $subentry->{'extra'}->{'subentry'}) {
$subentry_nr ++;
$subentry = $subentry->{'extra'}->{'subentry'};
@@ -1983,15 +1989,15 @@ sub sort_indices($$$;$$)
{'contents' => $subentry->{'args'}->[0]->{'contents'}},
$subentry->{'extra'}->{'sortas'}, $options, $entries_collator);
if ($subentry_key !~ /\S/) {
- my $entry_cmdname = $entry->{'entry_element'}->{'cmdname'};
+ my $entry_cmdname = $main_entry_element->{'cmdname'};
$entry_cmdname
- = $entry->{'entry_element'}->{'extra'}->{'original_def_cmdname'}
+ = $main_entry_element->{'extra'}->{'original_def_cmdname'}
if (!defined($entry_cmdname));
$registrar->line_warn($customization_information,
sprintf(__("empty index sub entry %d key in \@%s"),
$subentry_nr,
$entry_cmdname),
- $entry->{'entry_element'}->{'source_info'});
+ $main_entry_element->{'source_info'});
push @entry_keys, '';
push @sort_entry_keys, '';
} else {
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index 63769a1e6d..fcea928c3c 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -934,8 +934,6 @@ build_single_index_data (INDEX *i)
if (e->node)
STORE2("entry_node", newRV_inc ((SV *)e->node->hv));
- if (e->sortas)
- STORE2("sortas", newSVpv_utf8 (e->sortas, 0));
/* Create ignored_chars hash. */
{
diff --git a/tp/Texinfo/XS/parsetexi/indices.c
b/tp/Texinfo/XS/parsetexi/indices.c
index bc7038ec3e..054142e662 100644
--- a/tp/Texinfo/XS/parsetexi/indices.c
+++ b/tp/Texinfo/XS/parsetexi/indices.c
@@ -263,14 +263,14 @@ typedef struct {
/* INDEX_TYPE_CMD is used to determine which index to enter the entry in.
CONTENT is an element whose contents represent the text of the
- index entry. CURRENT is the element in the main body of the manual that
- the index entry refers to.
+ index entry. ELEMENT is the element in the main body of the manual that
+ the index entry refers/belongs to.
CONTENT_NORMALIZED would be "the index entry content, independent
of the current language." */
void
enter_index_entry (enum command_id index_type_cmd,
- ELEMENT *current, ELEMENT *content)
+ ELEMENT *element, ELEMENT *content)
{
INDEX *idx;
INDEX_ENTRY *entry;
@@ -290,14 +290,10 @@ enter_index_entry (enum command_id index_type_cmd,
entry->index_name = idx->name;
entry->index_prefix = idx->prefix;
entry->content = content;
- entry->command = current;
+ entry->command = element;
entry->number = idx->index_number;
entry->ignored_chars = global_info.ignored_chars;
- k = lookup_extra (current, "sortas");
- if (k)
- entry->sortas = (char *) k->value;
-
if (nesting_context.regions_stack.top > 0)
entry->region = top_command (&nesting_context.regions_stack);
else
diff --git a/tp/Texinfo/XS/parsetexi/tree_types.h
b/tp/Texinfo/XS/parsetexi/tree_types.h
index 8abec666fa..bb5b8e3c55 100644
--- a/tp/Texinfo/XS/parsetexi/tree_types.h
+++ b/tp/Texinfo/XS/parsetexi/tree_types.h
@@ -138,7 +138,6 @@ typedef struct {
ELEMENT *node;
int number; /* Index of entry in containing index, 1-based. */
enum command_id region;
- char *sortas; /* the sort key for the index */
IGNORED_CHARS ignored_chars;
} INDEX_ENTRY;
diff --git a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
index 1f89e450d2..9d1bba58c6 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -351,8 +351,7 @@ $result_trees{'contain_plain_text_nestings'} = {
'entry_number' => 1,
'in_code' => 0,
'index_ignore_chars' => {},
- 'index_name' => 'cp',
- 'sortas' => ' text'
+ 'index_name' => 'cp'
},
'sortas' => ' text'
},
@@ -673,8 +672,7 @@ $result_trees{'contain_plain_text_nestings'} = {
'entry_number' => 2,
'in_code' => 0,
'index_ignore_chars' => {},
- 'index_name' => 'cp',
- 'sortas' => ' text'
+ 'index_name' => 'cp'
},
'sortas' => ' text'
},
diff --git a/tp/t/results/indices/explicit_sort_key.pl
b/tp/t/results/indices/explicit_sort_key.pl
index 68e1b4d964..65e046e8df 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -198,8 +198,7 @@ $result_trees{'explicit_sort_key'} = {
'entry_number' => 1,
'in_code' => 0,
'index_ignore_chars' => {},
- 'index_name' => 'SK',
- 'sortas' => 'A'
+ 'index_name' => 'SK'
},
'sortas' => 'A'
},
@@ -264,8 +263,7 @@ $result_trees{'explicit_sort_key'} = {
'entry_number' => 2,
'in_code' => 0,
'index_ignore_chars' => {},
- 'index_name' => 'SK',
- 'sortas' => 'B'
+ 'index_name' => 'SK'
},
'sortas' => 'B'
},
@@ -330,8 +328,7 @@ $result_trees{'explicit_sort_key'} = {
'entry_number' => 3,
'in_code' => 0,
'index_ignore_chars' => {},
- 'index_name' => 'SK',
- 'sortas' => '0'
+ 'index_name' => 'SK'
},
'sortas' => '0'
},
diff --git a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
index 912304352a..91eb21d280 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -322,8 +322,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
'index_ignore_chars' => {
'-' => 1
},
- 'index_name' => 'fn',
- 'sortas' => '--'
+ 'index_name' => 'fn'
},
'sortas' => '--'
},
diff --git
a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
index 6b11d677f5..bd9adde0cc 100644
--- a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
+++ b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
@@ -259,8 +259,7 @@
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
'entry_number' => 1,
'in_code' => 0,
'index_ignore_chars' => {},
- 'index_name' => 'cp',
- 'sortas' => 'A---S'
+ 'index_name' => 'cp'
},
'seealso' => {},
'seeentry' => {},
@@ -333,8 +332,7 @@
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
'entry_number' => 2,
'in_code' => 0,
'index_ignore_chars' => {},
- 'index_name' => 'cp',
- 'sortas' => 'BB'
+ 'index_name' => 'cp'
},
'sortas' => 'BB'
},
diff --git a/tp/t/results/indices/subentry_and_sortas.pl
b/tp/t/results/indices/subentry_and_sortas.pl
index e94322a0ee..aaac2d240b 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -202,8 +202,7 @@ $result_trees{'subentry_and_sortas'} = {
'entry_number' => 1,
'in_code' => 0,
'index_ignore_chars' => {},
- 'index_name' => 'cp',
- 'sortas' => 'A---S'
+ 'index_name' => 'cp'
},
'sortas' => 'A---S',
'subentry' => {
@@ -328,8 +327,7 @@ $result_trees{'subentry_and_sortas'} = {
'entry_number' => 1,
'in_code' => 1,
'index_ignore_chars' => {},
- 'index_name' => 'fn',
- 'sortas' => 'X---S'
+ 'index_name' => 'fn'
},
'sortas' => 'X---S',
'subentry' => {
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index 6eea799991..e91a7c6b88 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -197,8 +197,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
'entry_number' => 1,
'in_code' => 0,
'index_ignore_chars' => {},
- 'index_name' => 'cp',
- 'sortas' => 'A---S'
+ 'index_name' => 'cp'
},
'sortas' => 'A---S',
'subentry' => {
diff --git a/tp/t/results/latex_tests/indices.pl
b/tp/t/results/latex_tests/indices.pl
index bfea01598c..af67079f52 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -956,8 +956,7 @@ $result_trees{'indices'} = {
'index_ignore_chars' => {
'\\' => 1
},
- 'index_name' => 'cp',
- 'sortas' => '\\cmd'
+ 'index_name' => 'cp'
},
'sortas' => '\\cmd'
},
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index 77bb5ed855..95e0d38439 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -956,8 +956,7 @@ $result_trees{'indices_disable_encoding'} = {
'index_ignore_chars' => {
'\\' => 1
},
- 'index_name' => 'cp',
- 'sortas' => '\\cmd'
+ 'index_name' => 'cp'
},
'sortas' => '\\cmd'
},
diff --git a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
index 379ce3a30c..abb5dd7a2a 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
@@ -120,7 +120,6 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
"type" => "menu_entry_description"
}
],
- "extra" => {},
"source_info" => {
"file_name" => "in_menu_only_special_ascii_spaces_node.texi",
"line_nr" => 5,
@@ -155,7 +154,6 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
"type" => "menu_entry_description"
}
],
- "extra" => {},
"source_info" => {
"file_name" => "in_menu_only_special_ascii_spaces_node.texi",
"line_nr" => 6,
diff --git
a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
index 10a76dcfa7..9c8ec4130f 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
@@ -120,7 +120,6 @@
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
"type" => "menu_entry_description"
}
],
- "extra" => {},
"source_info" => {
"file_name" => "in_menu_only_special_ascii_spaces_node.texi",
"line_nr" => 5,
@@ -155,7 +154,6 @@
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
"type" => "menu_entry_description"
}
],
- "extra" => {},
"source_info" => {
"file_name" => "in_menu_only_special_ascii_spaces_node.texi",
"line_nr" => 6,
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
index 5b35cbbce5..d8f7800782 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
@@ -176,7 +176,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
"type" => "menu_entry_description"
}
],
- "extra" => {},
"source_info" => {
"file_name" => "in_menu_only_special_spaces_node.texi",
"line_nr" => 7,
@@ -211,7 +210,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
"type" => "menu_entry_description"
}
],
- "extra" => {},
"source_info" => {
"file_name" => "in_menu_only_special_spaces_node.texi",
"line_nr" => 8,
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
index 0a724d0e85..ab5d5ee15c 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
@@ -176,7 +176,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
"type" => "menu_entry_description"
}
],
- "extra" => {},
"source_info" => {
"file_name" => "in_menu_only_special_spaces_node.texi",
"line_nr" => 7,
@@ -211,7 +210,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
"type" => "menu_entry_description"
}
],
- "extra" => {},
"source_info" => {
"file_name" => "in_menu_only_special_spaces_node.texi",
"line_nr" => 8,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_enter_index_entry), tp/Texinfo/Structuring.pm (sort_indices), tp/Texinfo/XS/parsetexi/api.c (build_single_index_data), tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry): do not duplicate sortas information in index entry. Change 'current' variable name.,
Patrice Dumas <=
- Prev by Date:
[no subject]
- Next by Date:
branch master updated: * tp/Texinfo/Common.pm (index_content_element), tp/Texinfo/Convert/DocBook.pm (_index_entry), tp/Texinfo/Convert/HTML.pm (_convert_printindex_command) (_prepare_index_entries, output_internal_links), tp/Texinfo/Convert/IXIN.pm (output_ixin), tp/Texinfo/Convert/LaTeX.pm (_index_entry), tp/Texinfo/Convert/Plaintext.pm (process_printindex), tp/Texinfo/Convert/TexinfoMarkup.pm (_index_entry), tp/Texinfo/ParserNonXS.pm (_enter_index_entry), tp/Texinfo/Structuring.pm (sort_indices), tp/Texinfo/T [...]
- Previous by thread:
master updated (19f98a0a5c -> 25686a7a0e)
- Next by thread:
branch master updated: * tp/Texinfo/Common.pm (index_content_element), tp/Texinfo/Convert/DocBook.pm (_index_entry), tp/Texinfo/Convert/HTML.pm (_convert_printindex_command) (_prepare_index_entries, output_internal_links), tp/Texinfo/Convert/IXIN.pm (output_ixin), tp/Texinfo/Convert/LaTeX.pm (_index_entry), tp/Texinfo/Convert/Plaintext.pm (process_printindex), tp/Texinfo/Convert/TexinfoMarkup.pm (_index_entry), tp/Texinfo/ParserNonXS.pm (_enter_index_entry), tp/Texinfo/Structuring.pm (sort_indices), tp/Texinfo/T [...]
- Index(es):