[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Structuring.pm (_sort_index_entries)
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/Texinfo/Structuring.pm (_sort_index_entries): use index_name as the last way to disambiguate index entries when sorting. |
Date: |
Thu, 16 Feb 2023 16:57:15 -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 ff35a55fdb * tp/Texinfo/Structuring.pm (_sort_index_entries): use
index_name as the last way to disambiguate index entries when sorting.
ff35a55fdb is described below
commit ff35a55fdbf1633675b776f2c62e4cbb62fa01c0
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Feb 16 22:57:05 2023 +0100
* tp/Texinfo/Structuring.pm (_sort_index_entries): use index_name
as the last way to disambiguate index entries when sorting.
---
ChangeLog | 5 +++++
tp/Texinfo/Structuring.pm | 5 ++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c490390668..a5b31020a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-16 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Structuring.pm (_sort_index_entries): use index_name
+ as the last way to disambiguate index entries when sorting.
+
2023-02-16 Gavin Smith <gavinsmith0123@gmail.com>
Initial @defblock, @defline in texi2any
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 6955789ad2..34ad91acc7 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1769,10 +1769,9 @@ sub _sort_index_entries($$)
$res = ($key1->{'number'} <=> $key2->{'number'});
}
# This may happen if 2 indices are merged as the number is per
- # index name. The @-command should be different though, for
- # index names to be different.
+ # index name.
if ($res == 0) {
- $res = ($key1->{'index_at_command'} cmp $key2->{'index_at_command'});
+ $res = ($key1->{'index_name'} cmp $key2->{'index_name'});
}
return $res;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Structuring.pm (_sort_index_entries): use index_name as the last way to disambiguate index entries when sorting.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_close_container, _remove_empty_content) (_expand_macro_arguments), tp/Texinfo/XS/parsetexi/close.c (remove_empty_content, close_container), tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments): separate the code to remove empty content, put in remove_empty_content from the remaining of close_container. Do not remove completly macro arguments that are empty, only remove the contents, keep a brace_command_arg to mark that there was an empty string argument [...]
- Next by Date:
branch master updated: * tp/Texinfo/Structuring.pm (_sort_index_entries) (_collator_sort_index_entries): use index_name as the last way to disambiguate index entries when sorting.
- Previous by thread:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_close_container, _remove_empty_content) (_expand_macro_arguments), tp/Texinfo/XS/parsetexi/close.c (remove_empty_content, close_container), tp/Texinfo/XS/parsetexi/macro.c (expand_macro_arguments): separate the code to remove empty content, put in remove_empty_content from the remaining of close_container. Do not remove completly macro arguments that are empty, only remove the contents, keep a brace_command_arg to mark that there was an empty string argument [...]
- Next by thread:
branch master updated: * tp/Texinfo/Structuring.pm (_sort_index_entries) (_collator_sort_index_entries): use index_name as the last way to disambiguate index entries when sorting.
- Index(es):