master updated (19f98a0a5c -> 25686a7a0e)

[Patrice Dumas]

pertusus pushed a change to branch master.

    from 19f98a0a5c * tp/Texinfo/Structuring.pm (_sort_index_entries) 
(_collator_sort_index_entries): use index_name as the last way to disambiguate 
index entries when sorting.
     new 0e3289c174 * tp/Texinfo/Structuring.pm (sort_indices): determine 
@-command name associated to index entry based on the tree element.
     new 25686a7a0e * tp/Texinfo/ParserNonXS.pm (_enter_index_entry), 
tp/Texinfo/XS/parsetexi/api.c (build_single_index_data), 
tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry): remove index_at_command 
and index_type_command entries from index entries. Remove index_at_command 
argument of enter_index_entry, update callers.


Summary of changes:
 ChangeLog                                          |  16 +
 tp/Texinfo/Convert/Plaintext.pm                    |   6 +-
 tp/Texinfo/ParserNonXS.pm                          |  30 +-
 tp/Texinfo/Structuring.pm                          |  12 +-
 tp/Texinfo/XS/parsetexi/api.c                      |   4 -
 tp/Texinfo/XS/parsetexi/end_line.c                 |   5 +-
 tp/Texinfo/XS/parsetexi/indices.c                  |  10 +-
 tp/Texinfo/XS/parsetexi/indices.h                  |   5 +-
 tp/Texinfo/XS/parsetexi/tree_types.h               |   2 -
 .../results/converters_tests/at_commands_in_raw.pl |   4 +-
 tp/t/results/converters_tests/complex_nestings.pl  |  20 +-
 .../converters_tests/definition_commands.pl        | 312 +++---------
 tp/t/results/converters_tests/form_feeds.pl        |   8 +-
 .../converters_tests/frenchspacing_and_code.pl     |  16 +-
 .../index_entry_in_preformatted.pl                 |  12 +-
 .../indices_in_begin_tables_lists.pl               | 116 ++---
 ...ces_in_begin_tables_lists_entries_after_item.pl | 116 ++---
 .../printindex_merged_indices_code_style.pl        |  20 +-
 .../references_to_top_no_top_output.pl             |   8 +-
 .../converters_tests/test_deftypefnnewline.pl      |  56 +--
 .../converters_tests/things_before_setfilename.pl  |   4 +-
 .../things_before_setfilename_no_element.pl        |   4 +-
 tp/t/results/coverage/commands.pl                  |   4 +-
 tp/t/results/coverage/def.pl                       |  60 +--
 tp/t/results/coverage/formats_titles.pl            |   4 +-
 tp/t/results/coverage/multitable.pl                |   4 +-
 tp/t/results/coverage/preformatted.pl              |   4 +-
 .../coverage/punctuation_in_line_commands.pl       |   4 +-
 tp/t/results/coverage/table.pl                     |  16 +-
 .../coverage_braces/contain_plain_text_nestings.pl |   4 -
 .../results/coverage_braces/heading_in_footnote.pl |   4 +-
 tp/t/results/def/all_commands.pl                   | 108 ++---
 tp/t/results/def/all_commands_delimiters.pl        | 188 ++-----
 .../def/all_commands_delimiters_printindex.pl      | 188 ++-----
 tp/t/results/def/all_commands_printindex.pl        | 108 ++---
 tp/t/results/def/ampchar.pl                        |   4 +-
 tp/t/results/def/code_in_def.pl                    |   4 +-
 tp/t/results/def/def_defx_mismatch.pl              |   8 +-
 tp/t/results/def/defx_after_comment.pl             |   8 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |   8 +-
 tp/t/results/def/defx_after_empty_line.pl          |   8 +-
 .../def/defx_after_empty_line_in_example.pl        |   8 +-
 tp/t/results/def/defx_after_paragraph_end.pl       |   8 +-
 .../def/defx_after_preformatted_with_text.pl       |   8 +-
 tp/t/results/def/defx_after_text.pl                |   8 +-
 tp/t/results/def/defx_in_example.pl                |   8 +-
 tp/t/results/def/double_command.pl                 |  16 +-
 tp/t/results/def/empty_def_arguments.pl            |   4 +-
 tp/t/results/def/empty_def_command.pl              |  12 +-
 tp/t/results/def/empty_deftype.pl                  |  16 +-
 tp/t/results/def/end_of_line_end_file.pl           |   4 +-
 tp/t/results/def/end_of_line_protect_at_end.pl     |   4 +-
 tp/t/results/def/end_of_lines_protected.pl         |   4 +-
 .../def/end_of_lines_protected_in_footnote.pl      |   4 +-
 .../def/end_of_lines_protected_non_ascii.pl        |   4 +-
 tp/t/results/def/inter_item_commands_in_def.pl     |  20 +-
 .../def/inter_item_commands_in_def_in_example.pl   |  20 +-
 tp/t/results/def/leading_space_in_def_arg.pl       |   4 +-
 tp/t/results/def/no_category_or_no_name.pl         |   4 +-
 tp/t/results/def/not_closed.pl                     |  12 +-
 tp/t/results/def/omit_def_space.pl                 |   8 +-
 tp/t/results/def/protected_brace.pl                |   4 +-
 tp/t/results/def/ref_in_def.pl                     |   8 +-
 tp/t/results/def/space_in_def_for_index.pl         |   8 +-
 tp/t/results/def/wrong_braces_simple.pl            |  36 +-
 tp/t/results/def/wrong_braces_with_end_of_lines.pl |   8 +-
 tp/t/results/float/cindex_in_caption.pl            |   4 +-
 tp/t/results/float/complex_float.pl                |  12 +-
 tp/t/results/float/float_copying.pl                |  16 +-
 .../char_latin1_latin1_in_refs.pl                  |  24 +-
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |  24 +-
 .../char_latin2_latin2_in_refs.pl                  |   4 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |  16 +-
 tp/t/results/heading/heading_in_copying.pl         |   4 +-
 .../deftypefnnewline_for_copying_after.pl          |   8 +-
 .../deftypefnnewline_for_copying_before.pl         |   8 +-
 tp/t/results/html_tests/float_copying.pl           |  24 +-
 .../results/html_tests/index_and_node_same_name.pl |   4 +-
 tp/t/results/html_tests/index_below.pl             |   4 +-
 tp/t/results/indices/complex_recursive_synindex.pl |  24 +-
 tp/t/results/indices/def_syn_indices.pl            |  28 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |   8 +-
 tp/t/results/indices/double_index_entry.pl         |  12 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |  16 +-
 tp/t/results/indices/double_syncodeindex.pl        |   8 +-
 tp/t/results/indices/empty_string_index_entry.pl   |  16 +-
 tp/t/results/indices/encoding_index_ascii.pl       | 220 +++------
 .../encoding_index_ascii_enable_encoding.pl        | 220 +++------
 tp/t/results/indices/encoding_index_latin1.pl      | 220 +++------
 .../encoding_index_latin1_enable_encoding.pl       | 220 +++------
 tp/t/results/indices/encoding_index_utf8.pl        | 220 +++------
 .../indices/encoding_index_utf8_enable_encoding.pl | 220 +++------
 tp/t/results/indices/explicit_sort_key.pl          |  10 +-
 tp/t/results/indices/ftable_vtable.pl              |  28 +-
 .../indices/ignored_sort_char_empty_entries.pl     |  14 +-
 tp/t/results/indices/image_lines_count.pl          | Bin 7448 -> 7354 bytes
 tp/t/results/indices/image_text_lines_count.pl     | Bin 7943 -> 7849 bytes
 tp/t/results/indices/index_and_node_same_name.pl   |   4 +-
 tp/t/results/indices/index_entries_locations.pl    |  16 +-
 .../indices/index_entry_before_first_node.pl       | Bin 7797 -> 7703 bytes
 tp/t/results/indices/index_entry_before_node.pl    |   4 +-
 tp/t/results/indices/index_entry_in_footnote.pl    | Bin 9313 -> 9187 bytes
 .../index_entry_in_footnote_different_node_end.pl  |   8 +-
 .../indices/index_entry_in_footnote_sections.pl    |   4 +-
 .../index_entry_in_footnote_sections_separate.pl   |   4 +-
 .../indices/index_entry_in_footnote_separate.pl    |   8 +-
 tp/t/results/indices/index_no_node.pl              |  56 +--
 tp/t/results/indices/index_no_node_no_top.pl       |  56 +--
 .../indices/index_no_node_no_top_no_node.pl        |  56 +--
 tp/t/results/indices/index_nodes.pl                |  44 +-
 .../indices/index_nodes_no_split_no_use_nodes.pl   |  44 +-
 tp/t/results/indices/index_special_region.pl       |  32 +-
 .../index_special_region_no_insertcopying.pl       |  32 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |  32 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |  32 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |  32 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |  32 +-
 .../index_special_region_titlepage_no_nodes.pl     |  32 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |  32 +-
 tp/t/results/indices/index_split.pl                |  76 +--
 .../indices/index_split_split_chapter_no_nodes.pl  |  76 +--
 tp/t/results/indices/index_table.pl                | 540 ++++++---------------
 .../results/indices/index_table_chapter_no_node.pl | 540 ++++++---------------
 .../multiple_index_text_sortas_seeentry_seealso.pl |   8 +-
 tp/t/results/indices/nodes_before_top.pl           |  52 +-
 .../nodes_before_top_and_sections_chapter.pl       |  60 +--
 ...odes_before_top_and_sections_chapter_no_node.pl |  60 +--
 ...des_before_top_and_sections_unsplit_no_nodes.pl |  60 +--
 .../indices/nodes_before_top_split_chapter.pl      |  52 +-
 .../nodes_before_top_split_chapter_no_nodes.pl     |  52 +-
 .../indices/printindex_between_node_section.pl     |  24 +-
 .../indices/printindex_between_part_chapter.pl     |  24 +-
 .../indices/printindex_index_entry_in_copying.pl   |  20 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |   4 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  20 +-
 .../indices/printindex_with_space_before.pl        | Bin 9165 -> 9071 bytes
 .../indices/same_index_entry_merged_indices.pl     |   8 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |  24 +-
 tp/t/results/indices/same_seealso_seeentry.pl      |  28 +-
 tp/t/results/indices/seealso_duplicate.pl          |   8 +-
 tp/t/results/indices/seeentry.pl                   |  16 +-
 tp/t/results/indices/sorted_subentries.pl          |  72 +--
 tp/t/results/indices/split_chapter_index.pl        |  48 +-
 tp/t/results/indices/subentries.pl                 |  32 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   4 -
 tp/t/results/indices/subentry_and_sortas_spaces.pl |  14 +-
 tp/t/results/indices/syncode_index_print_both.pl   |   8 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |  12 +-
 tp/t/results/indices/transparent_sort_chars.pl     |  12 +-
 .../indices/unknown_then_known_index_entry.pl      |   4 +-
 tp/t/results/indices/w_lines_count.pl              |   4 +-
 tp/t/results/info_tests/before_node_and_section.pl |   4 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |  16 +-
 .../info_tests/colons_in_index_entries_and_node.pl |  24 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |  24 +-
 tp/t/results/info_tests/def_in_copying.pl          |  16 +-
 .../end_of_line_command_in_node_lines.pl           |   4 +-
 tp/t/results/info_tests/index_entry_at_end_node.pl |   4 +-
 .../multitable_anchor_and_index_entry.pl           |   8 +-
 .../info_tests/nested_multitable_anchor_index.pl   |   8 +-
 .../info_tests/one_node_counted_elements.pl        |   8 +-
 tp/t/results/info_tests/test_index.pl              |  68 +--
 .../results/invalid_nestings/block_not_matching.pl |   4 +-
 tp/t/results/invalid_nestings/center.pl            |   4 +-
 .../invalid_nestings/def_in_style_command.pl       |   4 +-
 .../def_not_closed_in_menu_description.pl          |   4 +-
 tp/t/results/invalid_nestings/in_table.pl          |  20 +-
 .../invalid_nestings/multitable_item_in_index.pl   |   4 +-
 .../invalid_nestings/node_on_index_entry_line.pl   |   4 +-
 tp/t/results/invalid_nestings/on_def_line.pl       |   8 +-
 .../invalid_nestings/on_index_entry_line.pl        |   4 +-
 tp/t/results/invalid_nestings/raw_block_on_line.pl |   4 +-
 .../invalid_nestings/section_on_def_line.pl        |   4 +-
 .../invalid_nestings/section_on_defx_line.pl       |   8 +-
 .../section_on_index_entry_line.pl                 |   4 +-
 tp/t/results/invalid_nestings/tab_in_index.pl      |   4 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  28 +-
 .../itemize/inter_item_commands_in_itemize.pl      |  16 +-
 tp/t/results/languages/documentlanguage.pl         |   4 +-
 tp/t/results/languages/documentlanguage_option.pl  |   4 +-
 tp/t/results/languages/documentlanguage_unknown.pl |   4 +-
 .../results/languages/multiple_documentlanguage.pl |  12 +-
 tp/t/results/languages/multiple_in_preamble.pl     |  12 +-
 .../languages/multiple_in_preamble_before_node.pl  |   8 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |  12 +-
 .../languages/multiple_lang_chapters_latex.pl      |  12 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |  12 +-
 tp/t/results/languages/simple_documentlanguage.pl  |   4 +-
 tp/t/results/languages/unknown_region.pl           |   4 +-
 tp/t/results/latex_tests/brace_in_index.pl         |  16 +-
 tp/t/results/latex_tests/indices.pl                |  42 +-
 .../latex_tests/indices_disable_encoding.pl        |  42 +-
 tp/t/results/latex_tests/vbar_in_index.pl          |   8 +-
 tp/t/results/layout/no_monolithic.pl               |   4 +-
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |   4 +-
 tp/t/results/macro/backslash_in_arg.pl             |  16 +-
 tp/t/results/macro/macro_in_def_delimiters.pl      |   4 +-
 tp/t/results/macro/macro_in_index_commands.pl      |  16 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   4 +-
 .../misc_commands/comment_space_command_on_line.pl |   4 +-
 tp/t/results/misc_commands/index_entries.pl        |   8 +-
 tp/t/results/moresectioning/no_element.pl          |   4 +-
 .../moresectioning/placed_things_before_element.pl |   4 +-
 .../moresectioning/placed_things_before_node.pl    |   4 +-
 .../inter_item_commands_in_multitable.pl           |  12 +-
 .../at_commands_glued_in_example.pl                |   4 +-
 .../at_commands_glued_in_paragraph.pl              |   4 +-
 tp/t/results/preformatted/def_in_example.pl        |   4 +-
 ...dex_entries_relate_to_item_no_transformation.pl |  12 +-
 .../index_entries_relate_to_item_transformation.pl |  12 +-
 tp/t/results/value/value_in_index_commands.pl      |  16 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |   4 +-
 tp/t/results/xtable/block_commands_in_table.pl     |  20 +-
 tp/t/results/xtable/empty_item_itemx.pl            |  12 +-
 .../xtable/index_command_before_end_table.pl       |   4 +-
 .../results/xtable/inter_item_commands_in_table.pl |  84 +---
 .../inter_item_commands_in_table_in_example.pl     |   4 +-
 tp/t/results/xtable/table_nested.pl                |  48 +-
 218 files changed, 1697 insertions(+), 5039 deletions(-)