texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Patrice Dumas
Date: Sat, 23 Dec 2023 11:41:50 -0500 (EST)

branch: master
commit 7153b3d3f0307cc7f010732984badbeaba7c36e4
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Dec 23 17:41:42 2023 +0100

    * tp/Texinfo/XS/main/build_perl_info.c (output_unit_to_perl_hash): add
    unit_index to output unit perl data.
    
    * tp/Texinfo/ParserNonXS.pm (_register_global_command),
    tp/Texinfo/XS/parsetexi/parser.c (register_global_command),
    tp/t/test_utils.pl (new_test): add global_command_number extra
    information.
---
 ChangeLog                                             |  10 ++++++++++
 tp/TODO                                               |  16 ++++++++++++++++
 tp/Texinfo/ParserNonXS.pm                             |   3 +++
 tp/Texinfo/XS/main/build_perl_info.c                  |   3 +++
 tp/Texinfo/XS/parsetexi/parser.c                      |   6 ++++++
 tp/t/results/converters_tests/at_commands_in_raw.pl   |   2 ++
 tp/t/results/converters_tests/commands_in_sc.pl       |   2 ++
 tp/t/results/converters_tests/commands_in_var.pl      |   2 ++
 .../converters_tests/contents_at_document_begin.pl    |   1 +
 .../contents_at_document_begin_inline.pl              |   1 +
 .../contents_at_document_begin_separate_element.pl    |   1 +
 tp/t/results/converters_tests/footnote_no_number.pl   |   2 ++
 .../converters_tests/footnote_no_number_separate.pl   |   2 ++
 tp/t/results/converters_tests/ref_in_sectioning.pl    |   1 +
 .../references_to_top_no_top_output.pl                |   2 ++
 .../converters_tests/things_before_setfilename.pl     |   2 ++
 .../things_before_setfilename_no_element.pl           |   2 ++
 tp/t/results/coverage/commands.pl                     |   1 +
 tp/t/results/coverage/hyphenation.pl                  |   1 +
 tp/t/results/coverage/insertcopying.pl                |   1 +
 tp/t/results/coverage/punctuation_in_line_commands.pl |   3 +++
 tp/t/results/coverage/titlefont_in_center.pl          |   1 +
 .../coverage_braces/contain_plain_text_nestings.pl    |   2 ++
 tp/t/results/coverage_braces/empty_commands.pl        |   2 ++
 tp/t/results/coverage_braces/footnote.pl              |   1 +
 .../coverage_braces/footnote_ending_on_empty_line.pl  |   1 +
 tp/t/results/coverage_braces/footnote_no_node.pl      |   1 +
 .../coverage_braces/form_feed_in_brace_commands.pl    |   2 ++
 .../coverage_braces/format_on_first_footnote_line.pl  |   2 ++
 tp/t/results/coverage_braces/heading_in_footnote.pl   |   2 ++
 tp/t/results/coverage_braces/nested_in_sc.pl          |   1 +
 .../one_argument_leading_trailing_spaces.pl           |   1 +
 tp/t/results/coverage_braces/space_in_footnote.pl     |   1 +
 tp/t/results/coverage_braces/test_image.pl            |   1 +
 .../results/coverage_braces/two_footnotes_in_nodes.pl |   4 ++++
 .../two_footnotes_in_nodes_separate.pl                |   4 ++++
 .../two_footnotes_in_nodes_separate_no_header.pl      |   4 ++++
 .../results/def/all_commands_delimiters_printindex.pl |   3 +++
 tp/t/results/def/all_commands_printindex.pl           |   3 +++
 .../results/def/end_of_lines_protected_in_footnote.pl |   1 +
 tp/t/results/float/complex_float.pl                   |   3 +++
 tp/t/results/float/float_copying.pl                   |   4 ++++
 tp/t/results/float/footnote_in_caption.pl             |   1 +
 tp/t/results/float/footnote_in_caption_and_error.pl   |   1 +
 tp/t/results/formats_encodings/sample_utf8.pl         |   3 +++
 tp/t/results/heading/heading_in_copying.pl            |   3 +++
 tp/t/results/heading/heading_in_example.pl            |   1 +
 tp/t/results/heading/heading_in_quotation.pl          |   1 +
 .../html_tests/character_number_leading_toc_stoc.pl   |   2 ++
 tp/t/results/html_tests/contents_at_end.pl            |   1 +
 tp/t/results/html_tests/contents_at_end_inline.pl     |   1 +
 .../html_tests/contents_at_end_separate_element.pl    |   1 +
 tp/t/results/html_tests/contents_in_middle_chapter.pl |   1 +
 .../html_tests/contents_in_middle_chapter_inline.pl   |   1 +
 .../contents_in_middle_chapter_separate_element.pl    |   1 +
 tp/t/results/html_tests/contents_in_middle_section.pl |   1 +
 .../html_tests/contents_in_middle_section_inline.pl   |   1 +
 .../contents_in_middle_section_separate_element.pl    |   1 +
 .../html_tests/deftypefnnewline_for_copying_after.pl  |   2 ++
 tp/t/results/html_tests/double_contents.pl            |   3 +++
 .../results/html_tests/double_contents_after_title.pl |   3 +++
 .../double_contents_after_title_show_title.pl         |   3 +++
 .../double_contents_after_title_show_title_nodes.pl   |   3 +++
 tp/t/results/html_tests/double_contents_book.pl       |   3 +++
 tp/t/results/html_tests/double_contents_chapter.pl    |   3 +++
 tp/t/results/html_tests/double_contents_inline.pl     |   3 +++
 .../html_tests/double_contents_inline_chapter.pl      |   3 +++
 .../html_tests/double_contents_inline_nodes.pl        |   3 +++
 .../html_tests/double_contents_inline_section.pl      |   3 +++
 tp/t/results/html_tests/double_contents_nodes.pl      |   3 +++
 tp/t/results/html_tests/double_contents_section.pl    |   3 +++
 .../html_tests/double_contents_separate_element.pl    |   3 +++
 .../double_contents_separate_element_chapter.pl       |   3 +++
 .../double_contents_separate_element_nodes.pl         |   3 +++
 .../double_contents_separate_element_section.pl       |   3 +++
 tp/t/results/html_tests/empty_titlefont.pl            |   1 +
 .../html_tests/filenameconflictwithspecialelement.pl  |   1 +
 tp/t/results/html_tests/float_copying.pl              |   6 ++++++
 .../footnotestyle_separate_html_text_no_monolithic.pl |   1 +
 .../results/html_tests/footnotestyle_separate_late.pl |   2 ++
 tp/t/results/html_tests/headings_after_lone_nodes.pl  |   8 ++++++++
 tp/t/results/html_tests/itemize_arguments.pl          |   1 +
 .../html_tests/itemize_arguments_enable_encoding.pl   |   1 +
 tp/t/results/html_tests/menu.pl                       |   1 +
 tp/t/results/html_tests/node_footnote_end.pl          |   3 +++
 tp/t/results/html_tests/node_footnote_separated.pl    |   3 +++
 tp/t/results/html_tests/node_footnote_use_node.pl     |   3 +++
 .../html_tests/node_footnote_use_node_separate.pl     |   3 +++
 .../html_tests/sectioning_check_menu_structure.pl     |   1 +
 tp/t/results/html_tests/shortcontents_no_top.pl       |   1 +
 .../test_separated_contents_shortcontents.pl          |   2 ++
 .../text_before_top_and_contents_after_title.pl       |   1 +
 ...text_before_top_and_summarycontents_after_title.pl |   1 +
 tp/t/results/htmlxref/htmlxref.pl                     |   3 +++
 tp/t/results/htmlxref/htmlxref_nodes.pl               |   3 +++
 tp/t/results/htmlxref/htmlxref_only_mono.pl           |   3 +++
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl     |   3 +++
 tp/t/results/htmlxref/htmlxref_only_split.pl          |   3 +++
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl    |   3 +++
 tp/t/results/include/cpp_lines.pl                     |   2 ++
 tp/t/results/indices/index_entry_in_footnote.pl       | Bin 7102 -> 7131 bytes
 .../index_entry_in_footnote_different_node_end.pl     |   1 +
 .../indices/index_entry_in_footnote_sections.pl       |   1 +
 .../index_entry_in_footnote_sections_separate.pl      |   1 +
 .../indices/index_entry_in_footnote_separate.pl       |   1 +
 tp/t/results/indices/index_no_node.pl                 |   1 +
 tp/t/results/indices/index_no_node_no_top.pl          |   1 +
 tp/t/results/indices/index_no_node_no_top_no_node.pl  |   1 +
 tp/t/results/indices/index_special_region.pl          |   6 ++++++
 .../indices/index_special_region_no_insertcopying.pl  |   4 ++++
 ...l_region_no_insertcopying_no_titlepage_no_nodes.pl |   4 ++++
 ...cial_region_no_insertcopying_titlepage_no_nodes.pl |   4 ++++
 ...ertcopying_titlepage_no_nodes_footnotes_default.pl |   4 ++++
 .../index_special_region_no_titlepage_no_nodes.pl     |   6 ++++++
 .../index_special_region_titlepage_no_nodes.pl        |   6 ++++++
 ...ial_region_titlepage_no_nodes_footnotes_default.pl |   6 ++++++
 tp/t/results/indices/index_table.pl                   |   1 +
 tp/t/results/indices/index_table_chapter_no_node.pl   |   1 +
 .../indices/printindex_index_entry_in_copying.pl      |   2 ++
 .../printindex_index_entry_in_copying_in_footnote.pl  |   3 +++
 tp/t/results/indices/unknown_printindex.pl            |   1 +
 tp/t/results/info_tests/before_node_and_section.pl    |   2 ++
 tp/t/results/info_tests/error_in_footnote.pl          |   1 +
 tp/t/results/info_tests/nested_footnotes_separate.pl  |   2 ++
 tp/t/results/info_tests/test_index.pl                 |   1 +
 .../init_files_tests/customize_special_element.pl     |   3 +++
 .../init_files_tests/customize_translations.pl        |   1 +
 .../init_files_tests/documentation_examples.pl        |   2 ++
 tp/t/results/invalid_nestings/center.pl               |   2 ++
 tp/t/results/invalid_nestings/footnote_in_ref.pl      |   1 +
 tp/t/results/invalid_nestings/in_table.pl             |   3 +++
 .../invalid_nestings/node_in_copying_not_closed.pl    |   1 +
 .../results/invalid_nestings/on_block_command_line.pl |   4 ++++
 tp/t/results/invalid_nestings/on_index_entry_line.pl  |   2 ++
 tp/t/results/invalid_nestings/on_itemize_line.pl      |   2 ++
 tp/t/results/invalid_nestings/on_node_line.pl         |   1 +
 tp/t/results/invalid_nestings/on_section_line.pl      |   2 ++
 tp/t/results/invalid_nestings/on_subheading_line.pl   |   3 +++
 tp/t/results/invalid_nestings/recursive_copying.pl    |   1 +
 tp/t/results/languages/appendix_translated.pl         |   1 +
 tp/t/results/languages/multiple_documentlanguage.pl   |   2 ++
 .../anchor_in_copying_insertcopying_chap.pl           |   1 +
 .../anchor_in_copying_insertcopying_titlepage.pl      |   1 +
 .../anchor_in_copying_insertcopying_titlepage_chap.pl |   2 ++
 .../latex_tests/custom_heading_with_include.pl        |   1 +
 .../custom_heading_with_include_in_command.pl         |   1 +
 .../latex_tests/error_in_sectioning_command.pl        |   1 +
 tp/t/results/latex_tests/titlepage_classical.pl       |   3 +++
 tp/t/results/latex_tests/titlepage_no_title.pl        |   1 +
 .../latex_tests/titlepage_with_commands_classical.pl  |   4 ++++
 tp/t/results/layout/navigation.pl                     |   1 +
 tp/t/results/layout/navigation_chapter.pl             |   1 +
 tp/t/results/layout/navigation_chapter_no_header.pl   |   1 +
 .../layout/navigation_chapter_no_header_vertical.pl   |   1 +
 tp/t/results/layout/navigation_chapter_vertical.pl    |   1 +
 tp/t/results/layout/navigation_no_header.pl           |   1 +
 tp/t/results/layout/navigation_no_header_vertical.pl  |   1 +
 tp/t/results/layout/navigation_node.pl                |   1 +
 tp/t/results/layout/navigation_node_no_header.pl      |   1 +
 .../layout/navigation_node_no_header_vertical.pl      |   1 +
 tp/t/results/layout/navigation_node_vertical.pl       |   1 +
 tp/t/results/layout/navigation_section.pl             |   1 +
 tp/t/results/layout/navigation_section_no_header.pl   |   1 +
 .../layout/navigation_section_no_header_vertical.pl   |   1 +
 tp/t/results/layout/navigation_section_vertical.pl    |   1 +
 .../layout/navigation_test_misc_file_collision.pl     |   1 +
 tp/t/results/layout/navigation_vertical.pl            |   1 +
 tp/t/results/layout/no_monolithic.pl                  |   3 +++
 tp/t/results/layout/no_monolithic_only_toc_out.pl     |   3 +++
 tp/t/results/macro/complex_argument.pl                |   1 +
 .../macro_in_menu_comment_closed_by_detailmenu.pl     |   1 +
 tp/t/results/macro/macro_in_misc_commands.pl          |   6 ++++++
 tp/t/results/menu/commands_in_nodedescriptionblock.pl |   1 +
 tp/t/results/menu/detailmenu.pl                       |   1 +
 tp/t/results/menu/detailmenu_in_description.pl        |   1 +
 tp/t/results/menu/detailmenu_on_subnodes.pl           |   2 ++
 tp/t/results/menu/detailmenu_unknown_node.pl          |   1 +
 tp/t/results/menu/entry_after_detailmenu.pl           |   2 ++
 tp/t/results/menu/submenu_in_example.pl               |   1 +
 tp/t/results/misc_commands/also_not_line.pl           |   1 +
 .../author_outside_titlepage_quotation.pl             |   1 +
 tp/t/results/misc_commands/clickstyle.pl              |   2 ++
 tp/t/results/misc_commands/clickstyle_and_comments.pl |   7 +++++++
 .../misc_commands/clickstyle_no_end_of_line.pl        |   1 +
 .../codequoteundirected_codequotebacktick.pl          |   7 +++++++
 .../command_not_closed_in_documentencoding.pl         |   1 +
 .../misc_commands/comment_space_command_on_line.pl    |   1 +
 tp/t/results/misc_commands/contents.pl                |   6 ++++++
 tp/t/results/misc_commands/empty_documentencoding.pl  |   1 +
 tp/t/results/misc_commands/footnote_in_center.pl      |   1 +
 .../incorrect_allowcodebreaks_argument.pl             |   1 +
 tp/t/results/misc_commands/invalid_clickstyle.pl      |   3 +++
 tp/t/results/misc_commands/invalid_kbdinputstyle.pl   |   1 +
 tp/t/results/misc_commands/many_lines.pl              |   4 ++++
 .../misc_commands/no_empty_line_between_headings.pl   |   1 +
 .../results/misc_commands/text_before_line_command.pl |   1 +
 tp/t/results/moresectioning/anchor_in_footnote.pl     |   1 +
 .../moresectioning/anchor_in_footnote_separate.pl     |   1 +
 .../anchor_in_footnote_separate_split_node.pl         |   1 +
 .../moresectioning/anchor_in_footnote_split_node.pl   |   1 +
 .../moresectioning/character_and_spaces_in_refs.pl    |   2 ++
 .../character_and_spaces_in_refs_out.pl               |   2 ++
 tp/t/results/moresectioning/complex.pl                |   1 +
 tp/t/results/moresectioning/complex_split_at_node.pl  |   1 +
 tp/t/results/moresectioning/contents.pl               |   1 +
 .../moresectioning/contents_and_shortcontents.pl      |   2 ++
 .../contents_at_begin_chapter_without_node.pl         |   1 +
 .../moresectioning/contents_at_end_document.pl        |   1 +
 .../contents_at_end_document_after_node.pl            |   1 +
 tp/t/results/moresectioning/contents_in_document.pl   |   1 +
 tp/t/results/moresectioning/lowered_subsubsection.pl  |   1 +
 tp/t/results/moresectioning/no_element.pl             |   1 +
 .../moresectioning/placed_things_before_element.pl    |   1 +
 .../placed_things_before_element_no_use_node.pl       |   1 +
 .../moresectioning/placed_things_before_node.pl       |   1 +
 tp/t/results/moresectioning/raiselowersections.pl     |   1 +
 .../moresectioning/section_in_unnumbered_info.pl      |   1 +
 .../moresectioning/section_in_unnumbered_plaintext.pl |   1 +
 tp/t/results/moresectioning/shortcontents.pl          |   1 +
 tp/t/results/multitable/ref_in_multitable.pl          |   1 +
 tp/t/results/paragraph/close_paragraph_command.pl     |   1 +
 tp/t/results/paragraph/no_paragraph_commands.pl       |   1 +
 tp/t/results/paragraph/paragraph_command.pl           |   1 +
 .../plaintext_tests/at_commands_glued_in_example.pl   |   1 +
 .../plaintext_tests/at_commands_glued_in_paragraph.pl |   1 +
 .../plaintext_tests/characters_and_commands_in_var.pl |   1 +
 .../plaintext_tests/insert_copying_and_paragraph.pl   |   1 +
 .../plaintext_tests/punctuation_and_footnotes.pl      |  12 ++++++++++++
 .../punctuation_and_footnotes_frenchspacing.pl        |  12 ++++++++++++
 tp/t/results/plaintext_tests/transparent_text.pl      |   1 +
 tp/t/results/preformatted/insertcopying_in_example.pl |   1 +
 tp/t/results/preformatted/titlefont_in_example.pl     |   1 +
 .../quotation/footnote_in_quotation_with_arg.pl       |   1 +
 tp/t/results/regions/anchor_in_copying.pl             |   2 ++
 tp/t/results/regions/anchor_in_copying_in_footnote.pl |   3 +++
 tp/t/results/regions/ref_in_copying.pl                |   1 +
 .../regions/ref_in_copying_insert_in_chapter.pl       |   1 +
 tp/t/results/regions/today_in_copying.pl              |   1 +
 .../sectioning/chapter_before_and_after_part.pl       |   1 +
 tp/t/results/sectioning/chapter_between_nodes.pl      |   1 +
 .../sectioning/chapter_between_nodes_texi2html.pl     |   1 +
 .../sectioning/chapter_node_before_and_after_part.pl  |   1 +
 tp/t/results/sectioning/contents_and_parts.pl         |   2 ++
 tp/t/results/sectioning/contents_in_html_text.pl      |   2 ++
 .../results/sectioning/contents_with_only_top_node.pl |   1 +
 tp/t/results/sectioning/lone_contents.pl              |   1 +
 tp/t/results/sectioning/no_argument_and_contents.pl   |   1 +
 .../sectioning/node_part_chapter_after_chapter.pl     |   1 +
 tp/t/results/sectioning/section_before_part.pl        |   1 +
 tp/t/results/sectioning/section_below_unnumbered.pl   |   1 +
 tp/t/results/sectioning/unnumbered_before_top_node.pl |   1 +
 tp/t/results/value/value_in_misc_commands.pl          |   6 ++++++
 tp/t/results/xml_tests/commands_and_spaces.pl         |   2 ++
 .../xml_tests/comments_on_misc_command_line.pl        |   1 +
 tp/t/results/xml_tests/image_inline_or_not.pl         |   2 ++
 tp/t/test_utils.pl                                    |   6 ++++--
 256 files changed, 526 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c2abc9b42..05ffa0b9a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-12-23  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/main/build_perl_info.c (output_unit_to_perl_hash): add
+       unit_index to output unit perl data.
+
+       * tp/Texinfo/ParserNonXS.pm (_register_global_command),
+       tp/Texinfo/XS/parsetexi/parser.c (register_global_command),
+       tp/t/test_utils.pl (new_test): add global_command_number extra
+       information. 
+
 2023-12-23  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/command_data.txt: set chapheading, heading, subheading,
diff --git a/tp/TODO b/tp/TODO
index 56460d3fed..7b6eba669a 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -18,6 +18,22 @@ Document that Texinfo::Document::rebuild_document or
 Texinfo::Document::rebuild_tree should be called after tree modifications
 if the parser is XS but converters are perl.
 
+Find perl index element in C:
+$element->{'extra'}->{'index_entry'} = [$index_name, $number];
+in C:
+index[$index_name][number] = { 'index_name'           => $index_name,
+                      'entry_element'        => $element,
+                      'entry_number'         => $number,
+                    };
+(find index j based on index_name, could be a bsearch or a lin search)
+ INDEX_ENTRY *index_entry;
+   index_entry = idx->index_entries[j];
+                  main_entry_element = index_entry->entry_element;
+extra normalized
+root_commands : find through associated output unit or linear search in root
+global commands: add an index
+
+
 Bugs
 ====
 
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 17ada3447e..cf5aee0826 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1159,6 +1159,9 @@ sub _register_global_command {
   if ($global_multiple_commands{$command}) {
     push @{$self->{'commands_info'}->{$command}}, $current;
     $current->{'source_info'} = $source_info if (!$current->{'source_info'});
+    $current->{'extra'} = {} if (!$current->{'extra'});
+    $current->{'extra'}->{'global_command_number'}
+      = scalar(@{$self->{'commands_info'}->{$command}});
     return 1;
   } elsif ($global_unique_commands{$command}) {
     # setfilename ignored in an included file
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index 3c147a3a0b..01cdf7e61d 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -1287,6 +1287,9 @@ output_unit_to_perl_hash (OUTPUT_UNIT *output_unit)
   sv = newSVpv (output_unit_type_names[output_unit->unit_type], 0);
   STORE("unit_type");
 
+  sv = newSViv ((IV) output_unit->index);
+  STORE("unit_index");
+
   /* setup an hash reference in any case */
   directions_hv = newHV ();
   sv = newRV_noinc ((SV *) directions_hv);
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 47c4bfe9fc..0b15620a38 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -364,14 +364,20 @@ register_global_command (ELEMENT *current)
 #define GLOBAL_CASE(cmx) \
         case CM_##cmx:   \
           add_to_element_list (&global_commands.cmx, current); \
+          add_extra_integer (current, "global_command_number", \
+                             global_commands.cmx.number); \
           break
 
         case CM_footnote:
           add_to_element_list (&global_commands.footnotes, current);
+          add_extra_integer (current, "global_command_number",
+                             global_commands.footnotes.number);
           break;
 
         case CM_float:
           add_to_element_list (&global_commands.floats, current);
+          add_extra_integer (current, "global_command_number",
+                             global_commands.floats.number);
           break;
 
 #include "global_multi_commands_case.c"
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl 
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index 07e81c70a8..e5cc379672 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -226,6 +226,7 @@ $result_trees{'at_commands_in_raw'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 12
                   }
@@ -332,6 +333,7 @@ $result_trees{'at_commands_in_raw'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 15
               }
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl 
b/tp/t/results/converters_tests/commands_in_sc.pl
index 4527de53fa..7d62ce6a47 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -415,6 +415,7 @@ $result_trees{'commands_in_sc'} = {
                         }
                       ],
                       'cmdname' => 'hyphenation',
+                      'extra' => {},
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -479,6 +480,7 @@ $result_trees{'commands_in_sc'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'line_nr' => 9
                       }
diff --git a/tp/t/results/converters_tests/commands_in_var.pl 
b/tp/t/results/converters_tests/commands_in_var.pl
index 8a23479385..6716e9d842 100644
--- a/tp/t/results/converters_tests/commands_in_var.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -415,6 +415,7 @@ $result_trees{'commands_in_var'} = {
                         }
                       ],
                       'cmdname' => 'hyphenation',
+                      'extra' => {},
                       'source_info' => {
                         'line_nr' => 8
                       }
@@ -479,6 +480,7 @@ $result_trees{'commands_in_var'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'line_nr' => 9
                       }
diff --git a/tp/t/results/converters_tests/contents_at_document_begin.pl 
b/tp/t/results/converters_tests/contents_at_document_begin.pl
index 05fa280c40..8b4a2cfbe4 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin.pl
@@ -35,6 +35,7 @@ $result_trees{'contents_at_document_begin'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
                 'line_nr' => 3
diff --git a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl 
b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
index cb934abd95..62ff8fb7ee 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
@@ -35,6 +35,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
                 'line_nr' => 3
diff --git 
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl 
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
index 11ecc3079c..dc47d4a4b9 100644
--- 
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
+++ 
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
@@ -35,6 +35,7 @@ $result_trees{'contents_at_document_begin_separate_element'} 
= {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
                 'line_nr' => 3
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index dffb760979..69602c98d9 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -153,6 +153,7 @@ $result_trees{'footnote_no_number'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 7
               }
@@ -191,6 +192,7 @@ $result_trees{'footnote_no_number'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 9
               }
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl 
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index 5a7322d4c0..dfa044b472 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -153,6 +153,7 @@ $result_trees{'footnote_no_number_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 7
               }
@@ -191,6 +192,7 @@ $result_trees{'footnote_no_number_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 9
               }
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 2880e4912a..a039c366c0 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -18,6 +18,7 @@ $result_trees{'ref_in_sectioning'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/converters_tests/references_to_top_no_top_output.pl 
b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
index 7d661170d7..8ee5380eea 100644
--- a/tp/t/results/converters_tests/references_to_top_no_top_output.pl
+++ b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
@@ -333,6 +333,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 18
               }
@@ -358,6 +359,7 @@ $result_trees{'references_to_top_no_top_output'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 20
           }
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index d9ff89ec7d..de8385c29c 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -237,6 +237,7 @@ $result_trees{'things_before_setfilename'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
                     'line_nr' => 11
@@ -519,6 +520,7 @@ $result_trees{'things_before_setfilename'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
                 'line_nr' => 32
diff --git 
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index e374aab511..51ab3faa9d 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -237,6 +237,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
                     'line_nr' => 11
@@ -519,6 +520,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
                 'line_nr' => 32
diff --git a/tp/t/results/coverage/commands.pl 
b/tp/t/results/coverage/commands.pl
index 18893de57d..55c5d220c1 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -348,6 +348,7 @@ $result_trees{'commands'} = {
             }
           ],
           'cmdname' => 'majorheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/coverage/hyphenation.pl 
b/tp/t/results/coverage/hyphenation.pl
index bd77527550..d5902e4558 100644
--- a/tp/t/results/coverage/hyphenation.pl
+++ b/tp/t/results/coverage/hyphenation.pl
@@ -31,6 +31,7 @@ $result_trees{'hyphenation'} = {
             }
           ],
           'cmdname' => 'hyphenation',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/coverage/insertcopying.pl 
b/tp/t/results/coverage/insertcopying.pl
index 6413e56025..639c16c64d 100644
--- a/tp/t/results/coverage/insertcopying.pl
+++ b/tp/t/results/coverage/insertcopying.pl
@@ -158,6 +158,7 @@ $result_trees{'insertcopying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 11
           }
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 354f16be14..a75bc17b29 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -615,6 +615,7 @@ $result_trees{'punctuation_in_line_commands'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -641,6 +642,7 @@ $result_trees{'punctuation_in_line_commands'} = {
             }
           ],
           'cmdname' => 'titlefont',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 30
           }
@@ -732,6 +734,7 @@ $result_trees{'punctuation_in_line_commands'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 36
           }
diff --git a/tp/t/results/coverage/titlefont_in_center.pl 
b/tp/t/results/coverage/titlefont_in_center.pl
index bbfccf4cbe..c9f93b42cd 100644
--- a/tp/t/results/coverage/titlefont_in_center.pl
+++ b/tp/t/results/coverage/titlefont_in_center.pl
@@ -30,6 +30,7 @@ $result_trees{'titlefont_in_center'} = {
                     }
                   ],
                   'cmdname' => 'titlefont',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 2
                   }
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 ad6641cee8..7575091149 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -201,6 +201,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                 }
               ],
               'cmdname' => 'hyphenation',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 8
               }
@@ -448,6 +449,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                 }
               ],
               'cmdname' => 'hyphenation',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 14
               }
diff --git a/tp/t/results/coverage_braces/empty_commands.pl 
b/tp/t/results/coverage_braces/empty_commands.pl
index 2a9e062e40..4d46dc90c8 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -16,6 +16,7 @@ $result_trees{'empty_commands'} = {
             }
           ],
           'cmdname' => 'titlefont',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 1
           }
@@ -91,6 +92,7 @@ $result_trees{'empty_commands'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/coverage_braces/footnote.pl 
b/tp/t/results/coverage_braces/footnote.pl
index cfddf6919c..a7280cc8c7 100644
--- a/tp/t/results/coverage_braces/footnote.pl
+++ b/tp/t/results/coverage_braces/footnote.pl
@@ -61,6 +61,7 @@ $result_trees{'footnote'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl 
b/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
index 88b831b4ab..59f69d5547 100644
--- a/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
+++ b/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
@@ -37,6 +37,7 @@ $result_trees{'footnote_ending_on_empty_line'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index c8827d8731..19a79b5d9e 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -56,6 +56,7 @@ $result_trees{'footnote_no_node'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 3
               }
diff --git a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl 
b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
index c1b4505320..ebfcfee7fa 100644
--- a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
+++ b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
@@ -125,6 +125,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' 
@@ -167,6 +168,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => '  '
diff --git a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl 
b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
index b5322997c0..51662dcd3c 100644
--- a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
+++ b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
@@ -81,6 +81,7 @@ $result_trees{'format_on_first_footnote_line'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 1
               }
@@ -174,6 +175,7 @@ $result_trees{'format_on_first_footnote_line'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 6
               }
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl 
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index 2a5253afea..828cac1931 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -45,6 +45,7 @@ $result_trees{'heading_in_footnote'} = {
                         }
                       ],
                       'cmdname' => 'heading',
+                      'extra' => {},
                       'info' => {
                         'spaces_before_argument' => {
                           'text' => ' '
@@ -103,6 +104,7 @@ $result_trees{'heading_in_footnote'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => '
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl 
b/tp/t/results/coverage_braces/nested_in_sc.pl
index e434c5ce2d..92f250be74 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -113,6 +113,7 @@ $result_trees{'nested_in_sc'} = {
                                 }
                               ],
                               'cmdname' => 'footnote',
+                              'extra' => {},
                               'source_info' => {
                                 'line_nr' => 1
                               }
diff --git 
a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl 
b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
index 05862b3d33..78d9f0ba48 100644
--- a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
@@ -108,6 +108,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                 }
               ],
               'cmdname' => 'hyphenation',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/coverage_braces/space_in_footnote.pl 
b/tp/t/results/coverage_braces/space_in_footnote.pl
index fd9a3529b2..9a95547223 100644
--- a/tp/t/results/coverage_braces/space_in_footnote.pl
+++ b/tp/t/results/coverage_braces/space_in_footnote.pl
@@ -31,6 +31,7 @@ $result_trees{'space_in_footnote'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 40c44366c7..2ae2a9cf89 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -1105,6 +1105,7 @@ $result_trees{'test_image'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 18
           }
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
index ff38f26d02..187ef69551 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -106,6 +106,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
@@ -158,6 +159,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 8
               }
@@ -376,6 +378,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 19
               }
@@ -428,6 +431,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 23
               }
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index e919111d97..5d3b1a9d3e 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
@@ -140,6 +140,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 5
               }
@@ -192,6 +193,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 9
               }
@@ -410,6 +412,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 20
               }
@@ -462,6 +465,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 24
               }
diff --git 
a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
index d1ed9e841b..56c257436c 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
@@ -140,6 +140,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 5
               }
@@ -192,6 +193,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 9
               }
@@ -410,6 +412,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 20
               }
@@ -462,6 +465,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 24
               }
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index c827790527..002a837750 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -11917,6 +11917,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -11981,6 +11982,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -12045,6 +12047,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index dd8f9634e7..f93c9eef81 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -3977,6 +3977,7 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -4041,6 +4042,7 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -4105,6 +4107,7 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/def/end_of_lines_protected_in_footnote.pl 
b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
index 8b89267332..9c4c5c03ec 100644
--- a/tp/t/results/def/end_of_lines_protected_in_footnote.pl
+++ b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
@@ -277,6 +277,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => '
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index ab5ee3db8b..3ed3be0d62 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -763,6 +763,7 @@ $result_trees{'complex_float'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 47
                   }
@@ -1658,6 +1659,7 @@ $result_trees{'complex_float'} = {
                             }
                           ],
                           'cmdname' => 'footnote',
+                          'extra' => {},
                           'source_info' => {
                             'line_nr' => 82
                           }
@@ -2958,6 +2960,7 @@ $result_trees{'complex_float'} = {
                             }
                           ],
                           'cmdname' => 'footnote',
+                          'extra' => {},
                           'source_info' => {
                             'line_nr' => 129
                           }
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 5ad39d0084..f3b252b8fa 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -261,6 +261,7 @@ $result_trees{'float_copying'} = {
                                     }
                                   ],
                                   'cmdname' => 'footnote',
+                                  'extra' => {},
                                   'info' => {
                                     'spaces_before_argument' => {
                                       'text' => '
@@ -556,6 +557,7 @@ $result_trees{'float_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 29
           }
@@ -741,6 +743,7 @@ $result_trees{'float_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 38
           }
@@ -754,6 +757,7 @@ $result_trees{'float_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 39
           }
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index f4a945f4a5..57a57b43d6 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -170,6 +170,7 @@ $result_trees{'footnote_in_caption'} = {
                             }
                           ],
                           'cmdname' => 'footnote',
+                          'extra' => {},
                           'source_info' => {
                             'line_nr' => 8
                           }
diff --git a/tp/t/results/float/footnote_in_caption_and_error.pl 
b/tp/t/results/float/footnote_in_caption_and_error.pl
index 4074121f9c..2b853d5677 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -176,6 +176,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
                             }
                           ],
                           'cmdname' => 'footnote',
+                          'extra' => {},
                           'source_info' => {
                             'line_nr' => 8
                           }
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index 22d838645c..040ff5e229 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -305,6 +305,7 @@ $result_trees{'sample_utf8'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 'sample_utf8.texi',
                     'line_nr' => 20
@@ -371,6 +372,7 @@ $result_trees{'sample_utf8'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
                 'line_nr' => 24
@@ -478,6 +480,7 @@ $result_trees{'sample_utf8'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'sample_utf8.texi',
             'line_nr' => 30
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index c2538fc145..c5ea9f6a9c 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -68,6 +68,7 @@ $result_trees{'heading_in_copying'} = {
                 }
               ],
               'cmdname' => 'heading',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
@@ -158,6 +159,7 @@ $result_trees{'heading_in_copying'} = {
                 }
               ],
               'cmdname' => 'subheading',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
@@ -274,6 +276,7 @@ $result_trees{'heading_in_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 12
           }
diff --git a/tp/t/results/heading/heading_in_example.pl 
b/tp/t/results/heading/heading_in_example.pl
index 34504a038a..a783190400 100644
--- a/tp/t/results/heading/heading_in_example.pl
+++ b/tp/t/results/heading/heading_in_example.pl
@@ -63,6 +63,7 @@ $result_trees{'heading_in_example'} = {
                 }
               ],
               'cmdname' => 'heading',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/heading/heading_in_quotation.pl 
b/tp/t/results/heading/heading_in_quotation.pl
index 1fa34afb68..399171a012 100644
--- a/tp/t/results/heading/heading_in_quotation.pl
+++ b/tp/t/results/heading/heading_in_quotation.pl
@@ -68,6 +68,7 @@ $result_trees{'heading_in_quotation'} = {
                 }
               ],
               'cmdname' => 'heading',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl 
b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
index bd09bc3dc2..e0f868fcbb 100644
--- a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
+++ b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
@@ -129,6 +129,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 6
           }
@@ -147,6 +148,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 8
           }
diff --git a/tp/t/results/html_tests/contents_at_end.pl 
b/tp/t/results/html_tests/contents_at_end.pl
index 78e772b5e3..2c19a09969 100644
--- a/tp/t/results/html_tests/contents_at_end.pl
+++ b/tp/t/results/html_tests/contents_at_end.pl
@@ -294,6 +294,7 @@ $result_trees{'contents_at_end'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'contents_at_end.texi',
             'line_nr' => 17
diff --git a/tp/t/results/html_tests/contents_at_end_inline.pl 
b/tp/t/results/html_tests/contents_at_end_inline.pl
index 218b632edd..6ca243683e 100644
--- a/tp/t/results/html_tests/contents_at_end_inline.pl
+++ b/tp/t/results/html_tests/contents_at_end_inline.pl
@@ -294,6 +294,7 @@ $result_trees{'contents_at_end_inline'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'contents_at_end.texi',
             'line_nr' => 17
diff --git a/tp/t/results/html_tests/contents_at_end_separate_element.pl 
b/tp/t/results/html_tests/contents_at_end_separate_element.pl
index dd63dfbec5..38777cea3d 100644
--- a/tp/t/results/html_tests/contents_at_end_separate_element.pl
+++ b/tp/t/results/html_tests/contents_at_end_separate_element.pl
@@ -294,6 +294,7 @@ $result_trees{'contents_at_end_separate_element'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'contents_at_end.texi',
             'line_nr' => 17
diff --git a/tp/t/results/html_tests/contents_in_middle_chapter.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter.pl
index 512fb1846f..e493be33d2 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter.pl
@@ -289,6 +289,7 @@ $result_trees{'contents_in_middle_chapter'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
             'line_nr' => 16
diff --git a/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
index 795010c527..1dd99c6c1f 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
@@ -289,6 +289,7 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
             'line_nr' => 16
diff --git 
a/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
index 42a0422806..1062c67f05 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
@@ -289,6 +289,7 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'contents_in_middle_chapter.texi',
             'line_nr' => 16
diff --git a/tp/t/results/html_tests/contents_in_middle_section.pl 
b/tp/t/results/html_tests/contents_in_middle_section.pl
index 6305243535..339ecfa215 100644
--- a/tp/t/results/html_tests/contents_in_middle_section.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section.pl
@@ -514,6 +514,7 @@ $result_trees{'contents_in_middle_section'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
             'line_nr' => 25
diff --git a/tp/t/results/html_tests/contents_in_middle_section_inline.pl 
b/tp/t/results/html_tests/contents_in_middle_section_inline.pl
index 33699b44d4..9a89e32a90 100644
--- a/tp/t/results/html_tests/contents_in_middle_section_inline.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section_inline.pl
@@ -514,6 +514,7 @@ $result_trees{'contents_in_middle_section_inline'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
             'line_nr' => 25
diff --git 
a/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl 
b/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
index 06be6dcd10..fc6fbb57b2 100644
--- a/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
@@ -514,6 +514,7 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'contents_in_middle_section.texi',
             'line_nr' => 25
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index 03977d74f8..b2571011e5 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -208,6 +208,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 7
           }
@@ -263,6 +264,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 11
           }
diff --git a/tp/t/results/html_tests/double_contents.pl 
b/tp/t/results/html_tests/double_contents.pl
index 1e5bcfdf06..a74cf0b31e 100644
--- a/tp/t/results/html_tests/double_contents.pl
+++ b/tp/t/results/html_tests/double_contents.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_after_title.pl 
b/tp/t/results/html_tests/double_contents_after_title.pl
index 2ef4649736..c305ce7c61 100644
--- a/tp/t/results/html_tests/double_contents_after_title.pl
+++ b/tp/t/results/html_tests/double_contents_after_title.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_after_title'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_after_title'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_after_title'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_after_title_show_title.pl 
b/tp/t/results/html_tests/double_contents_after_title_show_title.pl
index 36b0865fb8..ae969f9568 100644
--- a/tp/t/results/html_tests/double_contents_after_title_show_title.pl
+++ b/tp/t/results/html_tests/double_contents_after_title_show_title.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_after_title_show_title'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git 
a/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl 
b/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
index 2133cefda2..872cd39e1d 100644
--- a/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_after_title_show_title_nodes'} 
= {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_book.pl 
b/tp/t/results/html_tests/double_contents_book.pl
index 351f7ff37a..af1a800c33 100644
--- a/tp/t/results/html_tests/double_contents_book.pl
+++ b/tp/t/results/html_tests/double_contents_book.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_book'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_book'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_book'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_chapter.pl 
b/tp/t/results/html_tests/double_contents_chapter.pl
index fb6a6ea2ef..0b0cd4023b 100644
--- a/tp/t/results/html_tests/double_contents_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_chapter.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_chapter'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_chapter'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_chapter'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_inline.pl 
b/tp/t/results/html_tests/double_contents_inline.pl
index bbc88dc2cc..ee262b4092 100644
--- a/tp/t/results/html_tests/double_contents_inline.pl
+++ b/tp/t/results/html_tests/double_contents_inline.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_inline'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_inline'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_inline'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_inline_chapter.pl 
b/tp/t/results/html_tests/double_contents_inline_chapter.pl
index 759d12fda3..d2104f40f7 100644
--- a/tp/t/results/html_tests/double_contents_inline_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_inline_chapter.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_inline_chapter'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_inline_chapter'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_inline_chapter'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_inline_nodes.pl 
b/tp/t/results/html_tests/double_contents_inline_nodes.pl
index 8127fe372d..997dc50f4d 100644
--- a/tp/t/results/html_tests/double_contents_inline_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_inline_nodes.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_inline_nodes'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_inline_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_inline_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_inline_section.pl 
b/tp/t/results/html_tests/double_contents_inline_section.pl
index 1d5f69479c..b6dbb0cd32 100644
--- a/tp/t/results/html_tests/double_contents_inline_section.pl
+++ b/tp/t/results/html_tests/double_contents_inline_section.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_inline_section'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_inline_section'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_inline_section'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_nodes.pl 
b/tp/t/results/html_tests/double_contents_nodes.pl
index 1a404a0985..88362890bc 100644
--- a/tp/t/results/html_tests/double_contents_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_nodes.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_nodes'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_section.pl 
b/tp/t/results/html_tests/double_contents_section.pl
index 89d3ed1f1b..a7fdee142b 100644
--- a/tp/t/results/html_tests/double_contents_section.pl
+++ b/tp/t/results/html_tests/double_contents_section.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_section'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_section'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_section'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_separate_element.pl 
b/tp/t/results/html_tests/double_contents_separate_element.pl
index d5756de361..ab0d85e498 100644
--- a/tp/t/results/html_tests/double_contents_separate_element.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_separate_element'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_separate_element'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_separate_element'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git 
a/tp/t/results/html_tests/double_contents_separate_element_chapter.pl 
b/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
index 2ca16254fe..8c3f6de1ba 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_separate_element_chapter'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/double_contents_separate_element_nodes.pl 
b/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
index ccc65b7ec1..2e1f047e02 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_separate_element_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git 
a/tp/t/results/html_tests/double_contents_separate_element_section.pl 
b/tp/t/results/html_tests/double_contents_separate_element_section.pl
index 06730eca8f..3bc03c2ea8 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_section.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_section.pl
@@ -35,6 +35,7 @@ $result_trees{'double_contents_separate_element_section'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 3
@@ -301,6 +302,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 17
@@ -497,6 +499,7 @@ $result_trees{'double_contents_separate_element_section'} = 
{
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'double_contents.texi',
             'line_nr' => 26
diff --git a/tp/t/results/html_tests/empty_titlefont.pl 
b/tp/t/results/html_tests/empty_titlefont.pl
index f3a70437ff..2848c738c7 100644
--- a/tp/t/results/html_tests/empty_titlefont.pl
+++ b/tp/t/results/html_tests/empty_titlefont.pl
@@ -21,6 +21,7 @@ $result_trees{'empty_titlefont'} = {
             }
           ],
           'cmdname' => 'titlefont',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl 
b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
index 5fc2b4580f..6f04569aee 100644
--- a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
+++ b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
@@ -89,6 +89,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/html_tests/float_copying.pl 
b/tp/t/results/html_tests/float_copying.pl
index 1c4550ff14..9a72c65adb 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -321,6 +321,7 @@ $result_trees{'float_copying'} = {
                                     }
                                   ],
                                   'cmdname' => 'footnote',
+                                  'extra' => {},
                                   'info' => {
                                     'spaces_before_argument' => {
                                       'text' => '
@@ -752,6 +753,7 @@ $result_trees{'float_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'float_copying.texi',
             'line_nr' => 39
@@ -1087,6 +1089,7 @@ $result_trees{'float_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'float_copying.texi',
             'line_nr' => 57
@@ -1101,6 +1104,7 @@ $result_trees{'float_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'float_copying.texi',
             'line_nr' => 58
@@ -1129,6 +1133,7 @@ $result_trees{'float_copying'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -1193,6 +1198,7 @@ $result_trees{'float_copying'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git 
a/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl 
b/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
index 64006133c9..7c8ce54afc 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
@@ -121,6 +121,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index 2e68c48926..b1567960b3 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -163,6 +163,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                   }
                 ],
                 'cmdname' => 'footnote',
+                'extra' => {},
                 'source_info' => {
                   'line_nr' => 7
                 }
@@ -272,6 +273,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                   }
                 ],
                 'cmdname' => 'footnote',
+                'extra' => {},
                 'source_info' => {
                   'line_nr' => 12
                 }
diff --git a/tp/t/results/html_tests/headings_after_lone_nodes.pl 
b/tp/t/results/html_tests/headings_after_lone_nodes.pl
index edab5f209e..fc9f28e1f1 100644
--- a/tp/t/results/html_tests/headings_after_lone_nodes.pl
+++ b/tp/t/results/html_tests/headings_after_lone_nodes.pl
@@ -181,6 +181,7 @@ $result_trees{'headings_after_lone_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -336,6 +337,7 @@ $result_trees{'headings_after_lone_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 20
           }
@@ -589,6 +591,7 @@ $result_trees{'headings_after_lone_nodes'} = {
             }
           ],
           'cmdname' => 'subsubheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -674,6 +677,7 @@ $result_trees{'headings_after_lone_nodes'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -807,6 +811,7 @@ $result_trees{'headings_after_lone_nodes'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -940,6 +945,7 @@ $result_trees{'headings_after_lone_nodes'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -1047,6 +1053,7 @@ $result_trees{'headings_after_lone_nodes'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -1217,6 +1224,7 @@ $result_trees{'headings_after_lone_nodes'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/html_tests/itemize_arguments.pl 
b/tp/t/results/html_tests/itemize_arguments.pl
index 7e4a8e9834..c742ca3f22 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -3574,6 +3574,7 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @result
 '
diff --git a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl 
b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
index c163950347..7a333f1b54 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -3574,6 +3574,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @result
 '
diff --git a/tp/t/results/html_tests/menu.pl b/tp/t/results/html_tests/menu.pl
index 4d0c87e8e9..4e4e490204 100644
--- a/tp/t/results/html_tests/menu.pl
+++ b/tp/t/results/html_tests/menu.pl
@@ -1458,6 +1458,7 @@ $result_trees{'menu'} = {
                   }
                 }
               ],
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 38
               }
diff --git a/tp/t/results/html_tests/node_footnote_end.pl 
b/tp/t/results/html_tests/node_footnote_end.pl
index e4fda64d7f..571523ffe2 100644
--- a/tp/t/results/html_tests/node_footnote_end.pl
+++ b/tp/t/results/html_tests/node_footnote_end.pl
@@ -473,6 +473,7 @@ $result_trees{'node_footnote_end'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 17
@@ -606,6 +607,7 @@ $result_trees{'node_footnote_end'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 22
@@ -926,6 +928,7 @@ $result_trees{'node_footnote_end'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 34
diff --git a/tp/t/results/html_tests/node_footnote_separated.pl 
b/tp/t/results/html_tests/node_footnote_separated.pl
index 0e1b9586a2..bccdedee32 100644
--- a/tp/t/results/html_tests/node_footnote_separated.pl
+++ b/tp/t/results/html_tests/node_footnote_separated.pl
@@ -473,6 +473,7 @@ $result_trees{'node_footnote_separated'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 17
@@ -606,6 +607,7 @@ $result_trees{'node_footnote_separated'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 22
@@ -926,6 +928,7 @@ $result_trees{'node_footnote_separated'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 34
diff --git a/tp/t/results/html_tests/node_footnote_use_node.pl 
b/tp/t/results/html_tests/node_footnote_use_node.pl
index 64b2ab8cae..c85de28fc8 100644
--- a/tp/t/results/html_tests/node_footnote_use_node.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node.pl
@@ -473,6 +473,7 @@ $result_trees{'node_footnote_use_node'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 17
@@ -606,6 +607,7 @@ $result_trees{'node_footnote_use_node'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 22
@@ -926,6 +928,7 @@ $result_trees{'node_footnote_use_node'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 34
diff --git a/tp/t/results/html_tests/node_footnote_use_node_separate.pl 
b/tp/t/results/html_tests/node_footnote_use_node_separate.pl
index 1fb5ca88f3..00ef592a69 100644
--- a/tp/t/results/html_tests/node_footnote_use_node_separate.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node_separate.pl
@@ -473,6 +473,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 17
@@ -606,6 +607,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 22
@@ -926,6 +928,7 @@ $result_trees{'node_footnote_use_node_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 34
diff --git a/tp/t/results/html_tests/sectioning_check_menu_structure.pl 
b/tp/t/results/html_tests/sectioning_check_menu_structure.pl
index 20f37a6d9b..49bdd61494 100644
--- a/tp/t/results/html_tests/sectioning_check_menu_structure.pl
+++ b/tp/t/results/html_tests/sectioning_check_menu_structure.pl
@@ -2169,6 +2169,7 @@ $result_trees{'sectioning_check_menu_structure'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'sectioning.texi',
             'line_nr' => 96
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index 9bb39bdb32..205fecb7e7 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -117,6 +117,7 @@ $result_trees{'shortcontents_no_top'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 7
           }
diff --git a/tp/t/results/html_tests/test_separated_contents_shortcontents.pl 
b/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
index 7521c5f629..d6fb8bd011 100644
--- a/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
+++ b/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
@@ -20,6 +20,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 1
               }
@@ -233,6 +234,7 @@ $result_trees{'test_separated_contents_shortcontents'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 12
           }
diff --git 
a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
index 1504849405..8facc8d37c 100644
--- a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
@@ -144,6 +144,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 11
           }
diff --git 
a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
index 33ab94d641..265611cd17 100644
--- a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
@@ -144,6 +144,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
             }
           ],
           'cmdname' => 'summarycontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 11
           }
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 3a3e353a21..463e68994b 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -207,6 +207,7 @@ $result_trees{'htmlxref'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -832,6 +833,7 @@ $result_trees{'htmlxref'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -1013,6 +1015,7 @@ $result_trees{'htmlxref'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index e730b3b678..5f5eeb4a6b 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -207,6 +207,7 @@ $result_trees{'htmlxref_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -832,6 +833,7 @@ $result_trees{'htmlxref_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -1013,6 +1015,7 @@ $result_trees{'htmlxref_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 7ec2ba6e82..35be8c88c8 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -207,6 +207,7 @@ $result_trees{'htmlxref_only_mono'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -832,6 +833,7 @@ $result_trees{'htmlxref_only_mono'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -1013,6 +1015,7 @@ $result_trees{'htmlxref_only_mono'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 1f27976241..3827d6f0cd 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -207,6 +207,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -832,6 +833,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -1013,6 +1015,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 45a5cfaaa5..d873c6f0e0 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -207,6 +207,7 @@ $result_trees{'htmlxref_only_split'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -832,6 +833,7 @@ $result_trees{'htmlxref_only_split'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -1013,6 +1015,7 @@ $result_trees{'htmlxref_only_split'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index baa1f12d37..a448174321 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -207,6 +207,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -832,6 +833,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -1013,6 +1015,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index 346f51d611..b5aab4969a 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -792,6 +792,7 @@ $result_trees{'cpp_lines'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => '
@@ -842,6 +843,7 @@ $result_trees{'cpp_lines'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => '
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index dba448a863..5b1ab7ed85 100644
Binary files a/tp/t/results/indices/index_entry_in_footnote.pl and 
b/tp/t/results/indices/index_entry_in_footnote.pl differ
diff --git a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl 
b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
index 37a881a661..2e7511caea 100644
--- a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
@@ -351,6 +351,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 10
               }
diff --git a/tp/t/results/indices/index_entry_in_footnote_sections.pl 
b/tp/t/results/indices/index_entry_in_footnote_sections.pl
index d2edbbf008..aa159a540d 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections.pl
@@ -143,6 +143,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
index cf6e7c8e54..30707c3bbc 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
@@ -143,6 +143,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/indices/index_entry_in_footnote_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_separate.pl
index 362985ca97..60adecae4f 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -385,6 +385,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 11
               }
diff --git a/tp/t/results/indices/index_no_node.pl 
b/tp/t/results/indices/index_no_node.pl
index eff016d24b..24b5b3d3ff 100644
--- a/tp/t/results/indices/index_no_node.pl
+++ b/tp/t/results/indices/index_no_node.pl
@@ -198,6 +198,7 @@ $result_trees{'index_no_node'} = {
             }
           ],
           'cmdname' => 'printindex',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/indices/index_no_node_no_top.pl 
b/tp/t/results/indices/index_no_node_no_top.pl
index e8af932b73..b65f16a0ad 100644
--- a/tp/t/results/indices/index_no_node_no_top.pl
+++ b/tp/t/results/indices/index_no_node_no_top.pl
@@ -155,6 +155,7 @@ $result_trees{'index_no_node_no_top'} = {
             }
           ],
           'cmdname' => 'printindex',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/indices/index_no_node_no_top_no_node.pl 
b/tp/t/results/indices/index_no_node_no_top_no_node.pl
index 2233afed8a..7fa81db38b 100644
--- a/tp/t/results/indices/index_no_node_no_top_no_node.pl
+++ b/tp/t/results/indices/index_no_node_no_top_no_node.pl
@@ -155,6 +155,7 @@ $result_trees{'index_no_node_no_top_no_node'} = {
             }
           ],
           'cmdname' => 'printindex',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index 3719ef81f4..10cef2ef5e 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -217,6 +217,7 @@ $result_trees{'index_special_region'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
                         'line_nr' => 9
@@ -498,6 +499,7 @@ $result_trees{'index_special_region'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
                         'line_nr' => 24
@@ -524,6 +526,7 @@ $result_trees{'index_special_region'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
                     'line_nr' => 30
@@ -680,6 +683,7 @@ $result_trees{'index_special_region'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 37
@@ -1535,6 +1539,7 @@ $result_trees{'index_special_region'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 74
@@ -1625,6 +1630,7 @@ $result_trees{'index_special_region'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 79
diff --git a/tp/t/results/indices/index_special_region_no_insertcopying.pl 
b/tp/t/results/indices/index_special_region_no_insertcopying.pl
index 29c3e3bd6e..c38e523c9b 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -217,6 +217,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
                         'line_nr' => 9
@@ -498,6 +499,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
                         'line_nr' => 24
@@ -524,6 +526,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
                     'line_nr' => 30
@@ -1617,6 +1620,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
             'line_nr' => 79
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
index 6f682da5c5..875e9cb15f 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
@@ -217,6 +217,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
                         'line_nr' => 9
@@ -498,6 +499,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
                         'line_nr' => 24
@@ -524,6 +526,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
                     'line_nr' => 30
@@ -1617,6 +1620,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
             'line_nr' => 79
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
index 724c96967a..dd75c0d4f6 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
@@ -217,6 +217,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
                         'line_nr' => 9
@@ -498,6 +499,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
                         'line_nr' => 24
@@ -524,6 +526,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
                     'line_nr' => 30
@@ -1617,6 +1620,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
             'line_nr' => 79
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
index ae274fb0ac..4187667885 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
@@ -217,6 +217,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
                         'line_nr' => 9
@@ -498,6 +499,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 
'index_special_region_no_insertcopying.texi',
                         'line_nr' => 24
@@ -524,6 +526,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 
'index_special_region_no_insertcopying.texi',
                     'line_nr' => 30
@@ -1617,6 +1620,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region_no_insertcopying.texi',
             'line_nr' => 79
diff --git a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
index 048bda4d0e..740845a6be 100644
--- a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
@@ -217,6 +217,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
                         'line_nr' => 9
@@ -498,6 +499,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
                         'line_nr' => 24
@@ -524,6 +526,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
                     'line_nr' => 30
@@ -680,6 +683,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 37
@@ -1535,6 +1539,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 74
@@ -1625,6 +1630,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 79
diff --git a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
index 13c9f93bd3..713a3f2c67 100644
--- a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
@@ -217,6 +217,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
                         'line_nr' => 9
@@ -498,6 +499,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
                         'line_nr' => 24
@@ -524,6 +526,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
                     'line_nr' => 30
@@ -680,6 +683,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 37
@@ -1535,6 +1539,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 74
@@ -1625,6 +1630,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 79
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
index 4960697bd6..503b8b3e65 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
@@ -217,6 +217,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
                         'line_nr' => 9
@@ -498,6 +499,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'file_name' => 'index_special_region.texi',
                         'line_nr' => 24
@@ -524,6 +526,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'file_name' => 'index_special_region.texi',
                     'line_nr' => 30
@@ -680,6 +683,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 37
@@ -1535,6 +1539,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 74
@@ -1625,6 +1630,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_special_region.texi',
             'line_nr' => 79
diff --git a/tp/t/results/indices/index_table.pl 
b/tp/t/results/indices/index_table.pl
index 46fe302bd8..9c429e34f7 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -6101,6 +6101,7 @@ $result_trees{'index_table'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_table.texi',
             'line_nr' => 186
diff --git a/tp/t/results/indices/index_table_chapter_no_node.pl 
b/tp/t/results/indices/index_table_chapter_no_node.pl
index 9fa3164e98..d6fbb90aaa 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -6101,6 +6101,7 @@ $result_trees{'index_table_chapter_no_node'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'index_table.texi',
             'line_nr' => 186
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index c7ec10a119..9ba4bcf9a0 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -576,6 +576,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 23
           }
@@ -761,6 +762,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 32
           }
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
index 919ab88c9d..d6d77fda7a 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
@@ -94,6 +94,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'info' => {
                         'spaces_before_argument' => {
                           'text' => '
@@ -272,6 +273,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 17
           }
@@ -456,6 +458,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 26
           }
diff --git a/tp/t/results/indices/unknown_printindex.pl 
b/tp/t/results/indices/unknown_printindex.pl
index 109b774355..b93991db27 100644
--- a/tp/t/results/indices/unknown_printindex.pl
+++ b/tp/t/results/indices/unknown_printindex.pl
@@ -21,6 +21,7 @@ $result_trees{'unknown_printindex'} = {
             }
           ],
           'cmdname' => 'printindex',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/info_tests/before_node_and_section.pl 
b/tp/t/results/info_tests/before_node_and_section.pl
index 0e2b298194..67f3b8b341 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -101,6 +101,7 @@ $result_trees{'before_node_and_section'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
@@ -339,6 +340,7 @@ $result_trees{'before_node_and_section'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 15
               }
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index 3f65be9e50..14188de29f 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -181,6 +181,7 @@ $result_trees{'error_in_footnote'} = {
                             }
                           ],
                           'cmdname' => 'footnote',
+                          'extra' => {},
                           'source_info' => {
                             'line_nr' => 10
                           }
diff --git a/tp/t/results/info_tests/nested_footnotes_separate.pl 
b/tp/t/results/info_tests/nested_footnotes_separate.pl
index 767620de1a..4f3ccaca25 100644
--- a/tp/t/results/info_tests/nested_footnotes_separate.pl
+++ b/tp/t/results/info_tests/nested_footnotes_separate.pl
@@ -113,6 +113,7 @@ $result_trees{'nested_footnotes_separate'} = {
                             }
                           ],
                           'cmdname' => 'footnote',
+                          'extra' => {},
                           'source_info' => {
                             'line_nr' => 6
                           }
@@ -129,6 +130,7 @@ $result_trees{'nested_footnotes_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index a0e1d4dd8e..ad4e094d8f 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -2642,6 +2642,7 @@ $result_trees{'test_index'} = {
             }
           ],
           'cmdname' => 'chapheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/init_files_tests/customize_special_element.pl 
b/tp/t/results/init_files_tests/customize_special_element.pl
index c91256985f..b2373671e5 100644
--- a/tp/t/results/init_files_tests/customize_special_element.pl
+++ b/tp/t/results/init_files_tests/customize_special_element.pl
@@ -67,6 +67,7 @@ $result_trees{'customize_special_element'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
@@ -80,6 +81,7 @@ $result_trees{'customize_special_element'} = {
                 }
               ],
               'cmdname' => 'shortcontents',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 5
               }
@@ -336,6 +338,7 @@ $result_trees{'customize_special_element'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 17
               }
diff --git a/tp/t/results/init_files_tests/customize_translations.pl 
b/tp/t/results/init_files_tests/customize_translations.pl
index 466d322336..b991470b08 100644
--- a/tp/t/results/init_files_tests/customize_translations.pl
+++ b/tp/t/results/init_files_tests/customize_translations.pl
@@ -30,6 +30,7 @@ $result_trees{'customize_translations'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/init_files_tests/documentation_examples.pl 
b/tp/t/results/init_files_tests/documentation_examples.pl
index e32328af4d..a7fde5b9a6 100644
--- a/tp/t/results/init_files_tests/documentation_examples.pl
+++ b/tp/t/results/init_files_tests/documentation_examples.pl
@@ -356,6 +356,7 @@ $result_trees{'documentation_examples'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 11
               }
@@ -379,6 +380,7 @@ $result_trees{'documentation_examples'} = {
             }
           ],
           'cmdname' => 'titlefont',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 12
           }
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index 22f2de93e2..3e1446fb23 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -35,6 +35,7 @@ $result_trees{'center'} = {
                     }
                   ],
                   'cmdname' => 'titlefont',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -79,6 +80,7 @@ $result_trees{'center'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl 
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index f009c6fe38..5b576fbe54 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -82,6 +82,7 @@ $result_trees{'footnote_in_ref'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'source_info' => {
                         'line_nr' => 3
                       }
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index 62113b82d6..f78a3dd174 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -196,6 +196,7 @@ $result_trees{'in_table'} = {
                                 }
                               ],
                               'cmdname' => 'titlefont',
+                              'extra' => {},
                               'source_info' => {
                                 'line_nr' => 9
                               }
@@ -240,6 +241,7 @@ $result_trees{'in_table'} = {
                                 }
                               ],
                               'cmdname' => 'footnote',
+                              'extra' => {},
                               'source_info' => {
                                 'line_nr' => 9
                               }
@@ -315,6 +317,7 @@ $result_trees{'in_table'} = {
                             }
                           ],
                           'cmdname' => 'footnote',
+                          'extra' => {},
                           'source_info' => {
                             'line_nr' => 10
                           }
diff --git a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl 
b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
index 410aa63c86..38c35aac00 100644
--- a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
@@ -119,6 +119,7 @@ $result_trees{'node_in_copying_not_closed'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 9
           }
diff --git a/tp/t/results/invalid_nestings/on_block_command_line.pl 
b/tp/t/results/invalid_nestings/on_block_command_line.pl
index 1095e43495..442a1880e6 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -56,6 +56,7 @@ $result_trees{'on_block_command_line'} = {
                     }
                   ],
                   'cmdname' => 'titlefont',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -95,6 +96,7 @@ $result_trees{'on_block_command_line'} = {
                             }
                           ],
                           'cmdname' => 'titlefont',
+                          'extra' => {},
                           'source_info' => {
                             'line_nr' => 2
                           }
@@ -194,6 +196,7 @@ $result_trees{'on_block_command_line'} = {
                     }
                   ],
                   'cmdname' => 'titlefont',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 5
                   }
@@ -238,6 +241,7 @@ $result_trees{'on_block_command_line'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 5
                   }
diff --git a/tp/t/results/invalid_nestings/on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/on_index_entry_line.pl
index c9a8c6be30..1d283f77c5 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -35,6 +35,7 @@ $result_trees{'on_index_entry_line'} = {
                     }
                   ],
                   'cmdname' => 'titlefont',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -79,6 +80,7 @@ $result_trees{'on_index_entry_line'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl 
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index b96b287436..416ad79624 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -35,6 +35,7 @@ $result_trees{'on_itemize_line'} = {
                     }
                   ],
                   'cmdname' => 'titlefont',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -79,6 +80,7 @@ $result_trees{'on_itemize_line'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/invalid_nestings/on_node_line.pl 
b/tp/t/results/invalid_nestings/on_node_line.pl
index b4e9fdf291..4e8eb190e2 100644
--- a/tp/t/results/invalid_nestings/on_node_line.pl
+++ b/tp/t/results/invalid_nestings/on_node_line.pl
@@ -164,6 +164,7 @@ $result_trees{'on_node_line'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index edfae37bf5..261303a572 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -39,6 +39,7 @@ $result_trees{'on_section_line'} = {
                 }
               ],
               'cmdname' => 'titlefont',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 1
               }
@@ -83,6 +84,7 @@ $result_trees{'on_section_line'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/invalid_nestings/on_subheading_line.pl 
b/tp/t/results/invalid_nestings/on_subheading_line.pl
index 9ce96866a5..5aec50ff11 100644
--- a/tp/t/results/invalid_nestings/on_subheading_line.pl
+++ b/tp/t/results/invalid_nestings/on_subheading_line.pl
@@ -38,6 +38,7 @@ $result_trees{'on_subheading_line'} = {
                     }
                   ],
                   'cmdname' => 'titlefont',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -82,6 +83,7 @@ $result_trees{'on_subheading_line'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
                   }
@@ -121,6 +123,7 @@ $result_trees{'on_subheading_line'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/invalid_nestings/recursive_copying.pl 
b/tp/t/results/invalid_nestings/recursive_copying.pl
index a28bce0734..e6fbf9d9a8 100644
--- a/tp/t/results/invalid_nestings/recursive_copying.pl
+++ b/tp/t/results/invalid_nestings/recursive_copying.pl
@@ -91,6 +91,7 @@ $result_trees{'recursive_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 8
           }
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index 7878c9aa3e..2ff2332457 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -151,6 +151,7 @@ $result_trees{'appendix_translated'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 8
           }
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl 
b/tp/t/results/languages/multiple_documentlanguage.pl
index 8edf4b823e..97a3960fd5 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -657,6 +657,7 @@ $result_trees{'multiple_documentlanguage'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 21
           }
@@ -905,6 +906,7 @@ $result_trees{'multiple_documentlanguage'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 29
           }
diff --git a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
index e63bb91389..6e5d9029bf 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
@@ -274,6 +274,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 13
           }
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
index 2180e51be9..a80ddef90b 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
@@ -193,6 +193,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 10
                   }
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
index e28aed58d8..a57a71d053 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
@@ -165,6 +165,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 9
                   }
@@ -383,6 +384,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 20
           }
diff --git a/tp/t/results/latex_tests/custom_heading_with_include.pl 
b/tp/t/results/latex_tests/custom_heading_with_include.pl
index 8d77273450..b401116a77 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include.pl
@@ -169,6 +169,7 @@ $result_trees{'custom_heading_with_include'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 7
           }
diff --git a/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl 
b/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
index fda383fd3a..5f540cdaab 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
@@ -182,6 +182,7 @@ $result_trees{'custom_heading_with_include_in_command'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 7
           }
diff --git a/tp/t/results/latex_tests/error_in_sectioning_command.pl 
b/tp/t/results/latex_tests/error_in_sectioning_command.pl
index dc8d0123af..b5dffd98a7 100644
--- a/tp/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tp/t/results/latex_tests/error_in_sectioning_command.pl
@@ -20,6 +20,7 @@ $result_trees{'error_in_sectioning_command'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index 079938dd4b..8b49438e8a 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -133,6 +133,7 @@ $result_trees{'titlepage_classical'} = {
                     }
                   ],
                   'cmdname' => 'subtitle',
+                  'extra' => {},
                   'info' => {
                     'spaces_before_argument' => {
                       'text' => ' '
@@ -160,6 +161,7 @@ $result_trees{'titlepage_classical'} = {
                     }
                   ],
                   'cmdname' => 'subtitle',
+                  'extra' => {},
                   'info' => {
                     'spaces_before_argument' => {
                       'text' => ' '
@@ -283,6 +285,7 @@ $result_trees{'titlepage_classical'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 16
                   }
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index 21f5ed8b65..2d481e47eb 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -37,6 +37,7 @@ $result_trees{'titlepage_no_title'} = {
                     }
                   ],
                   'cmdname' => 'titlefont',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 2
                   }
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index f2d25efc56..816eeaee1b 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -145,6 +145,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                     }
                   ],
                   'cmdname' => 'subtitle',
+                  'extra' => {},
                   'info' => {
                     'spaces_before_argument' => {
                       'text' => ' '
@@ -178,6 +179,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                     }
                   ],
                   'cmdname' => 'subtitle',
+                  'extra' => {},
                   'info' => {
                     'spaces_before_argument' => {
                       'text' => ' '
@@ -350,6 +352,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                             }
                           ],
                           'cmdname' => 'footnote',
+                          'extra' => {},
                           'source_info' => {
                             'line_nr' => 10
                           }
@@ -426,6 +429,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 22
                   }
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index 71f07bc021..a621aa67ad 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index 0a03586d23..fe69216d13 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_chapter'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index 273890d8b4..ba8132025d 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_chapter_no_header'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl 
b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
index babe2f7490..1479c7fa6a 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index d0585ad69e..ff349c8ad0 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_chapter_vertical'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index 041ef6c253..09249d5b01 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_no_header'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index 8d9d8cbb64..c89e227bab 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_no_header_vertical'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index ea6f367ef0..2e155a7060 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_node'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index 8156e89903..763abe8580 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_node_no_header'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_node_no_header_vertical.pl 
b/tp/t/results/layout/navigation_node_no_header_vertical.pl
index 43cb8d7146..c1a18b2be1 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index 9858555b91..1182fbbd09 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_node_vertical'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index 463cdc9af7..0a4ad3d4c6 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_section'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index 4f2d66ab55..aab8cf37fb 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_section_no_header'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_section_no_header_vertical.pl 
b/tp/t/results/layout/navigation_section_no_header_vertical.pl
index 2ca9f46975..ef5842ccc7 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index d373552ff9..c2ee8900c5 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_section_vertical'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_test_misc_file_collision.pl 
b/tp/t/results/layout/navigation_test_misc_file_collision.pl
index fdd45635a4..7918d89110 100644
--- a/tp/t/results/layout/navigation_test_misc_file_collision.pl
+++ b/tp/t/results/layout/navigation_test_misc_file_collision.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_test_misc_file_collision'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index 58fbda27f8..e74bec028d 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -798,6 +798,7 @@ $result_trees{'navigation_vertical'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
             'line_nr' => 54
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 222f30bbd6..1422398ebf 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -108,6 +108,7 @@ $result_trees{'no_monolithic'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
                 'line_nr' => 6
@@ -362,6 +363,7 @@ $result_trees{'no_monolithic'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
             'line_nr' => 19
@@ -376,6 +378,7 @@ $result_trees{'no_monolithic'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
             'line_nr' => 20
diff --git a/tp/t/results/layout/no_monolithic_only_toc_out.pl 
b/tp/t/results/layout/no_monolithic_only_toc_out.pl
index 794b1d55a2..98b6be8d17 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -108,6 +108,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
                 'line_nr' => 6
@@ -362,6 +363,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
             'line_nr' => 19
@@ -376,6 +378,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
             'line_nr' => 20
diff --git a/tp/t/results/macro/complex_argument.pl 
b/tp/t/results/macro/complex_argument.pl
index 64f5f411a8..b8cf38b6b6 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -401,6 +401,7 @@ macroseven defined
                 }
               ],
               'cmdname' => 'headings',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl 
b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
index e80f1084c4..aac910059f 100644
--- a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
@@ -197,6 +197,7 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} 
= {
                   }
                 }
               ],
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 6
               }
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 23062faef9..0ff7c7842f 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -273,6 +273,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -826,6 +827,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'headings',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -4281,6 +4283,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 179,
             'macro' => 'contentsmacro'
@@ -4600,6 +4603,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @resultmacro{}
 '
@@ -4863,6 +4867,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 206,
             'macro' => 'contentsmacro'
@@ -4958,6 +4963,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 211,
             'macro' => 'shortcontentsmacro'
diff --git a/tp/t/results/menu/commands_in_nodedescriptionblock.pl 
b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
index b3f8fc7f90..660c78367b 100644
--- a/tp/t/results/menu/commands_in_nodedescriptionblock.pl
+++ b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
@@ -397,6 +397,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 17
                   }
diff --git a/tp/t/results/menu/detailmenu.pl b/tp/t/results/menu/detailmenu.pl
index 4dbbdda47a..d4090cfb2d 100644
--- a/tp/t/results/menu/detailmenu.pl
+++ b/tp/t/results/menu/detailmenu.pl
@@ -180,6 +180,7 @@ $result_trees{'detailmenu'} = {
                   }
                 }
               ],
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/menu/detailmenu_in_description.pl 
b/tp/t/results/menu/detailmenu_in_description.pl
index 13c5edc19c..4d68c27bbc 100644
--- a/tp/t/results/menu/detailmenu_in_description.pl
+++ b/tp/t/results/menu/detailmenu_in_description.pl
@@ -165,6 +165,7 @@ $result_trees{'detailmenu_in_description'} = {
                   }
                 }
               ],
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index 2cf8267429..f571dac342 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -277,6 +277,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   }
                 }
               ],
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 8
               }
@@ -452,6 +453,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   }
                 }
               ],
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 12
               }
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 3af98946aa..69e5f932fb 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -139,6 +139,7 @@ $result_trees{'detailmenu_unknown_node'} = {
                   }
                 }
               ],
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index aa7fb6f8ad..b12fb876dd 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -139,6 +139,7 @@ $result_trees{'entry_after_detailmenu'} = {
                   }
                 }
               ],
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
@@ -319,6 +320,7 @@ $result_trees{'entry_after_detailmenu'} = {
                   }
                 }
               ],
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 12
               }
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index add2e6cc42..4823d5be9c 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -384,6 +384,7 @@ $result_trees{'submenu_in_example'} = {
                         }
                       ],
                       'cmdname' => 'subheading',
+                      'extra' => {},
                       'info' => {
                         'spaces_before_argument' => {
                           'text' => ' '
diff --git a/tp/t/results/misc_commands/also_not_line.pl 
b/tp/t/results/misc_commands/also_not_line.pl
index e84f22a186..e0de7c1d23 100644
--- a/tp/t/results/misc_commands/also_not_line.pl
+++ b/tp/t/results/misc_commands/also_not_line.pl
@@ -243,6 +243,7 @@ $result_trees{'also_not_line'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl 
b/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
index b89771fd40..03b85ef396 100644
--- a/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
+++ b/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
@@ -27,6 +27,7 @@ $result_trees{'author_outside_titlepage_quotation'} = {
             }
           ],
           'cmdname' => 'author',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/misc_commands/clickstyle.pl 
b/tp/t/results/misc_commands/clickstyle.pl
index 465d7699a2..c70146a5a3 100644
--- a/tp/t/results/misc_commands/clickstyle.pl
+++ b/tp/t/results/misc_commands/clickstyle.pl
@@ -17,6 +17,7 @@ $result_trees{'clickstyle'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @result
 '
@@ -69,6 +70,7 @@ $result_trees{'clickstyle'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => '@equiv
 '
diff --git a/tp/t/results/misc_commands/clickstyle_and_comments.pl 
b/tp/t/results/misc_commands/clickstyle_and_comments.pl
index f6d08b22c8..423a8c8563 100644
--- a/tp/t/results/misc_commands/clickstyle_and_comments.pl
+++ b/tp/t/results/misc_commands/clickstyle_and_comments.pl
@@ -17,6 +17,7 @@ $result_trees{'clickstyle_and_comments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => '@comment a
 '
@@ -33,6 +34,7 @@ $result_trees{'clickstyle_and_comments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @comment b
 '
@@ -43,6 +45,7 @@ $result_trees{'clickstyle_and_comments'} = {
         },
         {
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' nocmd@comment c
 '
@@ -53,6 +56,7 @@ $result_trees{'clickstyle_and_comments'} = {
         },
         {
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' more than one word @comment d
 '
@@ -69,6 +73,7 @@ $result_trees{'clickstyle_and_comments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @result@comment e
 '
@@ -85,6 +90,7 @@ $result_trees{'clickstyle_and_comments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @result   @comment f
 '
@@ -101,6 +107,7 @@ $result_trees{'clickstyle_and_comments'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @result on the same line @comment g
 '
diff --git a/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl 
b/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl
index 3fd298c399..3aab58a957 100644
--- a/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl
+++ b/tp/t/results/misc_commands/clickstyle_no_end_of_line.pl
@@ -17,6 +17,7 @@ $result_trees{'clickstyle_no_end_of_line'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @result'
           },
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 27568e9512..8ae3b692ed 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -618,6 +618,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     }
                   ],
                   'cmdname' => 'codequoteundirected',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 31,
                     'macro' => 'allquotes'
@@ -636,6 +637,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     }
                   ],
                   'cmdname' => 'codequotebacktick',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 31,
                     'macro' => 'allquotes'
@@ -1384,6 +1386,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     }
                   ],
                   'cmdname' => 'insertcopying',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 35
                   }
@@ -1931,6 +1934,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             }
           ],
           'cmdname' => 'codequoteundirected',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 45,
             'macro' => 'allquotes'
@@ -1949,6 +1953,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             }
           ],
           'cmdname' => 'codequotebacktick',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 45,
             'macro' => 'allquotes'
@@ -3020,6 +3025,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     }
                   ],
                   'cmdname' => 'codequoteundirected',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'allquotes'
@@ -3038,6 +3044,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                     }
                   ],
                   'cmdname' => 'codequotebacktick',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 48,
                     'macro' => 'allquotes'
diff --git 
a/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl 
b/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
index 05afbcbf54..ea8726f870 100644
--- a/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
+++ b/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
@@ -29,6 +29,7 @@ $result_trees{'command_not_closed_in_documentencoding'} = {
             }
           ],
           'cmdname' => 'documentencoding',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index a018618f59..4687f810dc 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -389,6 +389,7 @@ $result_trees{'comment_space_command_on_line'} = {
             }
           ],
           'cmdname' => 'heading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/misc_commands/contents.pl 
b/tp/t/results/misc_commands/contents.pl
index 69a0b7522f..cef6b48296 100644
--- a/tp/t/results/misc_commands/contents.pl
+++ b/tp/t/results/misc_commands/contents.pl
@@ -37,6 +37,7 @@ $result_trees{'contents'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 2
           }
@@ -64,6 +65,7 @@ $result_trees{'contents'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 3
           }
@@ -86,6 +88,7 @@ $result_trees{'contents'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 5
           }
@@ -111,6 +114,7 @@ $result_trees{'contents'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 7
           }
@@ -132,6 +136,7 @@ $result_trees{'contents'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 8
           }
@@ -153,6 +158,7 @@ $result_trees{'contents'} = {
             }
           ],
           'cmdname' => 'summarycontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 9
           }
diff --git a/tp/t/results/misc_commands/empty_documentencoding.pl 
b/tp/t/results/misc_commands/empty_documentencoding.pl
index f202fff79c..9969f024eb 100644
--- a/tp/t/results/misc_commands/empty_documentencoding.pl
+++ b/tp/t/results/misc_commands/empty_documentencoding.pl
@@ -22,6 +22,7 @@ $result_trees{'empty_documentencoding'} = {
             }
           ],
           'cmdname' => 'documentencoding',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl 
b/tp/t/results/misc_commands/footnote_in_center.pl
index 28f2604160..ad60df7271 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -209,6 +209,7 @@ $result_trees{'footnote_in_center'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 1
                   }
diff --git a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl 
b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
index df738a0031..70c7841cd7 100644
--- a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
+++ b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
@@ -27,6 +27,7 @@ $result_trees{'incorrect_allowcodebreaks_argument'} = {
             }
           ],
           'cmdname' => 'allowcodebreaks',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/misc_commands/invalid_clickstyle.pl 
b/tp/t/results/misc_commands/invalid_clickstyle.pl
index 711503b803..9a9e49a789 100644
--- a/tp/t/results/misc_commands/invalid_clickstyle.pl
+++ b/tp/t/results/misc_commands/invalid_clickstyle.pl
@@ -22,6 +22,7 @@ $result_trees{'invalid_clickstyle'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @result on the same line
 '
@@ -74,6 +75,7 @@ $result_trees{'invalid_clickstyle'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @nocmd
 '
@@ -120,6 +122,7 @@ $result_trees{'invalid_clickstyle'} = {
         },
         {
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' something
 '
diff --git a/tp/t/results/misc_commands/invalid_kbdinputstyle.pl 
b/tp/t/results/misc_commands/invalid_kbdinputstyle.pl
index db110841ba..1278ccfbd2 100644
--- a/tp/t/results/misc_commands/invalid_kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/invalid_kbdinputstyle.pl
@@ -32,6 +32,7 @@ $result_trees{'invalid_kbdinputstyle'} = {
                 }
               ],
               'cmdname' => 'kbdinputstyle',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/misc_commands/many_lines.pl 
b/tp/t/results/misc_commands/many_lines.pl
index 964a28f070..2520c70c04 100644
--- a/tp/t/results/misc_commands/many_lines.pl
+++ b/tp/t/results/misc_commands/many_lines.pl
@@ -100,6 +100,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'headings',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
@@ -441,6 +442,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'kbdinputstyle',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
@@ -694,6 +696,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'firstparagraphindent',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
@@ -724,6 +727,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'exampleindent',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
diff --git a/tp/t/results/misc_commands/no_empty_line_between_headings.pl 
b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
index c2a2ce47ca..b76a7561d9 100644
--- a/tp/t/results/misc_commands/no_empty_line_between_headings.pl
+++ b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
@@ -47,6 +47,7 @@ $result_trees{'no_empty_line_between_headings'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/misc_commands/text_before_line_command.pl 
b/tp/t/results/misc_commands/text_before_line_command.pl
index 485329fcf6..daf9fd03fc 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -142,6 +142,7 @@ $result_trees{'text_before_line_command'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 6
           }
diff --git a/tp/t/results/moresectioning/anchor_in_footnote.pl 
b/tp/t/results/moresectioning/anchor_in_footnote.pl
index 0ed7911d55..781839e7a3 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote.pl
@@ -112,6 +112,7 @@ $result_trees{'anchor_in_footnote'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
index e2750d3429..4140908fe8 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
@@ -146,6 +146,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 5
               }
diff --git 
a/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
index 9542906c63..e884293782 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
@@ -151,6 +151,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 5
               }
diff --git a/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
index 90732efe39..af7c3bcc43 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
@@ -117,6 +117,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
diff --git a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl 
b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
index 816b330678..88b0becc73 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
@@ -307,6 +307,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -591,6 +592,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
diff --git a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl 
b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
index 3b4e955e61..c5b832e281 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
@@ -315,6 +315,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               }
             ],
             'cmdname' => 'subheading',
+            'extra' => {},
             'info' => {
               'spaces_before_argument' => {
                 'text' => ' '
@@ -599,6 +600,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               }
             ],
             'cmdname' => 'subheading',
+            'extra' => {},
             'info' => {
               'spaces_before_argument' => {
                 'text' => ' '
diff --git a/tp/t/results/moresectioning/complex.pl 
b/tp/t/results/moresectioning/complex.pl
index 449831338b..15f25356aa 100644
--- a/tp/t/results/moresectioning/complex.pl
+++ b/tp/t/results/moresectioning/complex.pl
@@ -2253,6 +2253,7 @@ $result_trees{'complex'} = [
               }
             ],
             'cmdname' => 'contents',
+            'extra' => {},
             'source_info' => {
               'file_name' => 'complex_sectioning_case.texi',
               'line_nr' => 84
diff --git a/tp/t/results/moresectioning/complex_split_at_node.pl 
b/tp/t/results/moresectioning/complex_split_at_node.pl
index cf2dd96880..ef6d32ec48 100644
--- a/tp/t/results/moresectioning/complex_split_at_node.pl
+++ b/tp/t/results/moresectioning/complex_split_at_node.pl
@@ -2263,6 +2263,7 @@ $result_trees{'complex_split_at_node'} = [
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'complex_sectioning_case.texi',
             'line_nr' => 84
diff --git a/tp/t/results/moresectioning/contents.pl 
b/tp/t/results/moresectioning/contents.pl
index 37501b6753..d3512c0b17 100644
--- a/tp/t/results/moresectioning/contents.pl
+++ b/tp/t/results/moresectioning/contents.pl
@@ -413,6 +413,7 @@ $result_trees{'contents'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 23
           }
diff --git a/tp/t/results/moresectioning/contents_and_shortcontents.pl 
b/tp/t/results/moresectioning/contents_and_shortcontents.pl
index 31bf0b6e08..a193e81ffe 100644
--- a/tp/t/results/moresectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/moresectioning/contents_and_shortcontents.pl
@@ -413,6 +413,7 @@ $result_trees{'contents_and_shortcontents'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 23
           }
@@ -431,6 +432,7 @@ $result_trees{'contents_and_shortcontents'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 25
           }
diff --git 
a/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl 
b/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
index 669222a0a9..b4cac01184 100644
--- a/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
+++ b/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
@@ -18,6 +18,7 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/moresectioning/contents_at_end_document.pl 
b/tp/t/results/moresectioning/contents_at_end_document.pl
index 71b565a0f9..97744031db 100644
--- a/tp/t/results/moresectioning/contents_at_end_document.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document.pl
@@ -109,6 +109,7 @@ $result_trees{'contents_at_end_document'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 6
           }
diff --git a/tp/t/results/moresectioning/contents_at_end_document_after_node.pl 
b/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
index 5a69ed5387..0a2397e7ce 100644
--- a/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
@@ -268,6 +268,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 12
           }
diff --git a/tp/t/results/moresectioning/contents_in_document.pl 
b/tp/t/results/moresectioning/contents_in_document.pl
index 6452b04856..e1e1504966 100644
--- a/tp/t/results/moresectioning/contents_in_document.pl
+++ b/tp/t/results/moresectioning/contents_in_document.pl
@@ -74,6 +74,7 @@ $result_trees{'contents_in_document'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 4
           }
diff --git a/tp/t/results/moresectioning/lowered_subsubsection.pl 
b/tp/t/results/moresectioning/lowered_subsubsection.pl
index ac323463bf..d19aadc1e2 100644
--- a/tp/t/results/moresectioning/lowered_subsubsection.pl
+++ b/tp/t/results/moresectioning/lowered_subsubsection.pl
@@ -1037,6 +1037,7 @@ $result_trees{'lowered_subsubsection'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 45
           }
diff --git a/tp/t/results/moresectioning/no_element.pl 
b/tp/t/results/moresectioning/no_element.pl
index 07eb0f6f68..248a55c1e8 100644
--- a/tp/t/results/moresectioning/no_element.pl
+++ b/tp/t/results/moresectioning/no_element.pl
@@ -283,6 +283,7 @@ $result_trees{'no_element'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 13
               }
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index b14ff90216..02c20fde09 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -215,6 +215,7 @@ $result_trees{'placed_things_before_element'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 9
               }
diff --git 
a/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl 
b/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
index 13e438fb25..2c2d76c22e 100644
--- a/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
@@ -215,6 +215,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = 
{
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 9
               }
diff --git a/tp/t/results/moresectioning/placed_things_before_node.pl 
b/tp/t/results/moresectioning/placed_things_before_node.pl
index dc127d91d0..7031cf0a3b 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -218,6 +218,7 @@ $result_trees{'placed_things_before_node'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 9
               }
diff --git a/tp/t/results/moresectioning/raiselowersections.pl 
b/tp/t/results/moresectioning/raiselowersections.pl
index 921544a5e4..6afd096da3 100644
--- a/tp/t/results/moresectioning/raiselowersections.pl
+++ b/tp/t/results/moresectioning/raiselowersections.pl
@@ -1461,6 +1461,7 @@ $result_trees{'raiselowersections'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 35
           }
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_info.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
index e7bf62bd22..2869877162 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
@@ -90,6 +90,7 @@ $result_trees{'section_in_unnumbered_info'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
             'line_nr' => 5
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
index a1c7b8fbf3..f1e89660b7 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
@@ -90,6 +90,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'file_name' => 'section_in_unnumbered_text.texi',
             'line_nr' => 5
diff --git a/tp/t/results/moresectioning/shortcontents.pl 
b/tp/t/results/moresectioning/shortcontents.pl
index dbfea51401..941572f09c 100644
--- a/tp/t/results/moresectioning/shortcontents.pl
+++ b/tp/t/results/moresectioning/shortcontents.pl
@@ -413,6 +413,7 @@ $result_trees{'shortcontents'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 23
           }
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index 819c1cfdfb..51354f489f 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -338,6 +338,7 @@ $result_trees{'ref_in_multitable'} = {
                                 }
                               ],
                               'cmdname' => 'footnote',
+                              'extra' => {},
                               'source_info' => {
                                 'line_nr' => 11
                               }
diff --git a/tp/t/results/paragraph/close_paragraph_command.pl 
b/tp/t/results/paragraph/close_paragraph_command.pl
index 9cbc416ba3..57c3de2b26 100644
--- a/tp/t/results/paragraph/close_paragraph_command.pl
+++ b/tp/t/results/paragraph/close_paragraph_command.pl
@@ -29,6 +29,7 @@ $result_trees{'close_paragraph_command'} = {
             }
           ],
           'cmdname' => 'titlefont',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/paragraph/no_paragraph_commands.pl 
b/tp/t/results/paragraph/no_paragraph_commands.pl
index b0a3bbb45c..676c8ddf02 100644
--- a/tp/t/results/paragraph/no_paragraph_commands.pl
+++ b/tp/t/results/paragraph/no_paragraph_commands.pl
@@ -28,6 +28,7 @@ $result_trees{'no_paragraph_commands'} = {
             }
           ],
           'cmdname' => 'titlefont',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/paragraph/paragraph_command.pl 
b/tp/t/results/paragraph/paragraph_command.pl
index 4dcc47af5a..64bf5304fb 100644
--- a/tp/t/results/paragraph/paragraph_command.pl
+++ b/tp/t/results/paragraph/paragraph_command.pl
@@ -240,6 +240,7 @@ $result_trees{'paragraph_command'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 14
               }
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
index 6d11135706..86da5f7bd9 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
@@ -222,6 +222,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 9
                   }
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
index 3c63b04776..12bb7a0e84 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
@@ -208,6 +208,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 8
               }
diff --git a/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl 
b/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
index 546bfaff67..da6bb30fa4 100644
--- a/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
+++ b/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
@@ -290,6 +290,7 @@ $result_trees{'characters_and_commands_in_var'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 8
               }
diff --git a/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl 
b/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
index 4baca964fd..d063f09bda 100644
--- a/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
+++ b/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
@@ -90,6 +90,7 @@ $result_trees{'insert_copying_and_paragraph'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 6
           }
diff --git a/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl 
b/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl
index 1c70e5dc90..04e111cf4e 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl
@@ -36,6 +36,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 2
               }
@@ -64,6 +65,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 3
               }
@@ -88,6 +90,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 3
               }
@@ -126,6 +129,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 5
               }
@@ -150,6 +154,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 5
               }
@@ -178,6 +183,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 6
               }
@@ -219,6 +225,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 8
               }
@@ -250,6 +257,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 9
               }
@@ -281,6 +289,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 10
               }
@@ -322,6 +331,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 12
               }
@@ -353,6 +363,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 13
               }
@@ -384,6 +395,7 @@ $result_trees{'punctuation_and_footnotes'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 14
               }
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl 
b/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
index ab8afce2d7..547556554d 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
@@ -68,6 +68,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 3
               }
@@ -96,6 +97,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
@@ -120,6 +122,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 4
               }
@@ -158,6 +161,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 6
               }
@@ -182,6 +186,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 6
               }
@@ -210,6 +215,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 7
               }
@@ -251,6 +257,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 9
               }
@@ -282,6 +289,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 10
               }
@@ -313,6 +321,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 11
               }
@@ -354,6 +363,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 13
               }
@@ -385,6 +395,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 14
               }
@@ -416,6 +427,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 15
               }
diff --git a/tp/t/results/plaintext_tests/transparent_text.pl 
b/tp/t/results/plaintext_tests/transparent_text.pl
index 400dcd2882..55eca9f631 100644
--- a/tp/t/results/plaintext_tests/transparent_text.pl
+++ b/tp/t/results/plaintext_tests/transparent_text.pl
@@ -31,6 +31,7 @@ $result_trees{'transparent_text'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/preformatted/insertcopying_in_example.pl 
b/tp/t/results/preformatted/insertcopying_in_example.pl
index f1b3b7ff91..eea39818cb 100644
--- a/tp/t/results/preformatted/insertcopying_in_example.pl
+++ b/tp/t/results/preformatted/insertcopying_in_example.pl
@@ -32,6 +32,7 @@ $result_trees{'insertcopying_in_example'} = {
                 }
               ],
               'cmdname' => 'insertcopying',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl 
b/tp/t/results/preformatted/titlefont_in_example.pl
index 6b28da56fd..48ae15e89f 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -35,6 +35,7 @@ $result_trees{'titlefont_in_example'} = {
                 }
               ],
               'cmdname' => 'titlefont',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/quotation/footnote_in_quotation_with_arg.pl 
b/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
index 545b2a7b12..9dc8cbe266 100644
--- a/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
+++ b/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
@@ -50,6 +50,7 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
                     }
                   ],
                   'cmdname' => 'footnote',
+                  'extra' => {},
                   'source_info' => {
                     'line_nr' => 2
                   }
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index 9a390a8a19..bdaa2e4e87 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -199,6 +199,7 @@ $result_trees{'anchor_in_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 13
           }
@@ -217,6 +218,7 @@ $result_trees{'anchor_in_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 15
           }
diff --git a/tp/t/results/regions/anchor_in_copying_in_footnote.pl 
b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
index 3c05b061ff..e0b79f5b0e 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -81,6 +81,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
+                      'extra' => {},
                       'info' => {
                         'spaces_before_argument' => {
                           'text' => '
@@ -220,6 +221,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 14
           }
@@ -238,6 +240,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 16
           }
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index d79833f692..aeb8b4e356 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -168,6 +168,7 @@ $result_trees{'ref_in_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 8
           }
diff --git a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl 
b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
index 6eb897ded1..0a3e25fe1b 100644
--- a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
+++ b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
@@ -234,6 +234,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 11
           }
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 58294e1592..b230996944 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -190,6 +190,7 @@ $result_trees{'today_in_copying'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 10
           }
diff --git a/tp/t/results/sectioning/chapter_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_before_and_after_part.pl
index a7607f3684..c561a53ea3 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -91,6 +91,7 @@ $result_trees{'chapter_before_and_after_part'} = [
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 7
           }
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 59879615b1..1379ad9550 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -341,6 +341,7 @@ $result_trees{'chapter_between_nodes'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 18
           }
diff --git a/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl 
b/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
index 51583b4be6..89f5ace444 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
@@ -336,6 +336,7 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 18
           }
diff --git a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
index 089bf3c540..1c6ed35546 100644
--- a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
@@ -284,6 +284,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 14
           }
diff --git a/tp/t/results/sectioning/contents_and_parts.pl 
b/tp/t/results/sectioning/contents_and_parts.pl
index 9ce59cadef..95f5532096 100644
--- a/tp/t/results/sectioning/contents_and_parts.pl
+++ b/tp/t/results/sectioning/contents_and_parts.pl
@@ -544,6 +544,7 @@ $result_trees{'contents_and_parts'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 23
           }
@@ -557,6 +558,7 @@ $result_trees{'contents_and_parts'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 24
           }
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index 8431ba48eb..42f2497ced 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -152,6 +152,7 @@ $result_trees{'contents_in_html_text'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 9
           }
@@ -165,6 +166,7 @@ $result_trees{'contents_in_html_text'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 10
           }
diff --git a/tp/t/results/sectioning/contents_with_only_top_node.pl 
b/tp/t/results/sectioning/contents_with_only_top_node.pl
index 8de28b2d3d..01567058fd 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -58,6 +58,7 @@ $result_trees{'contents_with_only_top_node'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 4
           }
diff --git a/tp/t/results/sectioning/lone_contents.pl 
b/tp/t/results/sectioning/lone_contents.pl
index ae29ab1026..a83c17c7ec 100644
--- a/tp/t/results/sectioning/lone_contents.pl
+++ b/tp/t/results/sectioning/lone_contents.pl
@@ -20,6 +20,7 @@ $result_trees{'lone_contents'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index afb1775a21..105f256275 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -20,6 +20,7 @@ $result_trees{'no_argument_and_contents'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl 
b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
index dcecdeeaf3..1d60c58989 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -342,6 +342,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 18
           }
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index 99f4443294..6faff1d6c7 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -85,6 +85,7 @@ $result_trees{'section_before_part'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 7baf4d4aa6..f9d74469d1 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -30,6 +30,7 @@ $result_trees{'section_below_unnumbered'} = {
                 }
               ],
               'cmdname' => 'contents',
+              'extra' => {},
               'source_info' => {
                 'line_nr' => 2
               }
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index dcc3928a23..17ab5f6903 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -92,6 +92,7 @@ $result_trees{'unnumbered_before_top_node'} = [
               }
             ],
             'cmdname' => 'titlefont',
+            'extra' => {},
             'source_info' => {
               'line_nr' => 6
             }
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index f9231272ca..1bf54056c6 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -198,6 +198,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'subheading',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -486,6 +487,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'headings',
+          'extra' => {},
           'info' => {
             'spaces_before_argument' => {
               'text' => ' '
@@ -3393,6 +3395,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 131
           }
@@ -3608,6 +3611,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => ' @value{result_macro}
 '
@@ -3658,6 +3662,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'contents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 145
           }
@@ -3719,6 +3724,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'shortcontents',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 148
           }
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index d681fb89f4..a2a3861979 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -92,6 +92,7 @@ $result_trees{'commands_and_spaces'} = {
             }
           ],
           'cmdname' => 'clickstyle',
+          'extra' => {},
           'info' => {
             'arg_line' => '  @arrow
 '
@@ -1262,6 +1263,7 @@ $result_trees{'commands_and_spaces'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => '  '
diff --git a/tp/t/results/xml_tests/comments_on_misc_command_line.pl 
b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
index e63f92701f..f7b39aeab1 100644
--- a/tp/t/results/xml_tests/comments_on_misc_command_line.pl
+++ b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
@@ -151,6 +151,7 @@ $result_trees{'comments_on_misc_command_line'} = {
             }
           ],
           'cmdname' => 'insertcopying',
+          'extra' => {},
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/xml_tests/image_inline_or_not.pl 
b/tp/t/results/xml_tests/image_inline_or_not.pl
index dbe1eb9c14..ce9f720aa3 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -1055,6 +1055,7 @@ $result_trees{'image_inline_or_not'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => '
@@ -1128,6 +1129,7 @@ $result_trees{'image_inline_or_not'} = {
                 }
               ],
               'cmdname' => 'footnote',
+              'extra' => {},
               'info' => {
                 'spaces_before_argument' => {
                   'text' => '
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 3a6cb1ac20..05ae514508 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -393,7 +393,9 @@ sub new_test($;$$$)
 my @contents_keys = ('contents', 'args', 'parent', 'source_info',
   'node_content', 'invalid_nesting', 'info', 'text_arg',
   'node_description', 'node_long_description', 'is_target',
-  'tree_document_descriptor', 'unit_contents', 'output_units_descriptor');
+  'unit_contents', 'global_command_number',
+  # only set with the XS parser
+  'tree_document_descriptor', 'output_units_descriptor');
 my @menus_keys = ('menu_directions', 'menus', 'menu_up_hash');
 # 'section_number' is kept in other results as it may be the only clue
 # to know which section element it is.
@@ -411,7 +413,7 @@ my %avoided_keys_tree;
 my @avoided_keys_tree = (@sections_keys, @menus_keys, @node_keys,
     'float_number', 'tree_unit_directions', 'directions',
     'associated_unit',
-    'parent',
+    'parent', 'global_command_number',
     # only set with the XS parser
     'tree_document_descriptor', 'output_units_descriptor');
 foreach my $avoided_key(@avoided_keys_tree) {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]