texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Con


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/Convert/TextContent.pm, tp/Texinfo/ParserNonXS.pm, tp/Texinfo/Structuring.pm, tp/Texinfo/XS/misc.c (xs_abort_empty_line), tp/Texinfo/XS/parsetexi/convert.c (expand_cmd_args_to_texi) (convert_to_texinfo_internal), tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command), tp/Texinfo/XS/parsetexi/parser.c (abort_empty_line) (isolate_last_space_internal): move spaces_before_ [...]
Date: Wed, 16 Nov 2022 16:46:32 -0500

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 1f939629a0 * tp/Texinfo/Convert/Converter.pm, 
tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, 
tp/Texinfo/Convert/TextContent.pm, tp/Texinfo/ParserNonXS.pm, 
tp/Texinfo/Structuring.pm, tp/Texinfo/XS/misc.c (xs_abort_empty_line), 
tp/Texinfo/XS/parsetexi/convert.c (expand_cmd_args_to_texi) 
(convert_to_texinfo_internal), tp/Texinfo/XS/parsetexi/handle_commands.c 
(handle_line_command), tp/Texinfo/XS/parsetexi/parser.c (abort_empty_line) 
(isolate_last_space_internal) [...]
1f939629a0 is described below

commit 1f939629a04f42da0d28b3b6e20053998e641645
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Nov 16 22:46:09 2022 +0100

    * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/Texinfo.pm,
    tp/Texinfo/Convert/TexinfoMarkup.pm,
    tp/Texinfo/Convert/TextContent.pm, tp/Texinfo/ParserNonXS.pm,
    tp/Texinfo/Structuring.pm, tp/Texinfo/XS/misc.c (xs_abort_empty_line),
    tp/Texinfo/XS/parsetexi/convert.c (expand_cmd_args_to_texi)
    (convert_to_texinfo_internal),
    tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command),
    tp/Texinfo/XS/parsetexi/parser.c (abort_empty_line)
    (isolate_last_space_internal): move spaces_before_argument and
    spaces_after_argument from extra to info key element hash.
    
    * tp/Texinfo/XS/parsetexi/extra.c (lookup_associated_info)
    (lookup_extra, lookup_info): add lookup_associated_info to lookup in
    an associated information structure.  Add wrappers for the info and
    extra structures.
    
    * tp/Texinfo/Convert/DocBook.pm (_convert): check 'args' and not
    'extra' to determine if there is a @quotation argument.
    
    * tp/Texinfo/ParserNonXS.pm (_end_line): remove extra element key if
    empty after removing incorrect command_as_argument.  Avoid
    autovivification.
---
 ChangeLog                                          |  25 +
 tp/Texinfo/Common.pm                               |   2 +-
 tp/Texinfo/Convert/Converter.pm                    |   6 +-
 tp/Texinfo/Convert/DocBook.pm                      |  37 +-
 tp/Texinfo/Convert/Texinfo.pm                      |  40 +-
 tp/Texinfo/Convert/TexinfoMarkup.pm                |  33 +-
 tp/Texinfo/Convert/TextContent.pm                  |   4 +-
 tp/Texinfo/ParserNonXS.pm                          |  76 +--
 tp/Texinfo/Structuring.pm                          |   8 +-
 tp/Texinfo/Transformations.pm                      |   6 +-
 tp/Texinfo/XS/misc.c                               |  16 +-
 tp/Texinfo/XS/parsetexi/convert.c                  |   8 +-
 tp/Texinfo/XS/parsetexi/extra.c                    |  16 +-
 tp/Texinfo/XS/parsetexi/handle_commands.c          |   4 +-
 tp/Texinfo/XS/parsetexi/parser.c                   |  16 +-
 tp/Texinfo/XS/parsetexi/parser.h                   |   1 +
 tp/t/results/alias/alias_table_command.pl          |  22 +-
 tp/t/results/alias/bad_line.pl                     |   8 +-
 tp/t/results/alias/block_command_alias.pl          |  14 +-
 tp/t/results/alias/simple.pl                       |  14 +-
 tp/t/results/columnfractions/empty.pl              |  10 +-
 tp/t/results/columnfractions/empty_comment.pl      |  12 +-
 tp/t/results/columnfractions/good.pl               |  14 +-
 tp/t/results/columnfractions/good_comment.pl       |  12 +-
 tp/t/results/columnfractions/good_space_comment.pl |  16 +-
 tp/t/results/columnfractions/invalid.pl            |  12 +-
 tp/t/results/columnfractions/not_fraction.pl       |  12 +-
 tp/t/results/columnfractions/out_of_multitable.pl  |   4 +-
 .../something_before_columnfractions.pl            |  14 +-
 tp/t/results/columnfractions/wrong_command.pl      |  12 +-
 .../command_conditionals_user_defined.pl           |  24 +-
 .../conditionals/empty_ifset_in_ifset_set.pl       |   8 +-
 tp/t/results/conditionals/end_ifset_in_format.pl   |  16 +-
 .../conditionals/false_format_not_closed.pl        |   2 +-
 tp/t/results/conditionals/ifclear_in_ifset_set.pl  |  12 +-
 tp/t/results/conditionals/ignore_not_closed.pl     |   2 +-
 tp/t/results/conditionals/ignored_in_ifset.pl      |  18 +-
 .../conditionals/inlinefmtifelse_nesting.pl        |   2 +-
 .../inlineiffmtifelse_not_closed_three_arg.pl      |   2 +-
 tp/t/results/conditionals/macro_in_ifset.pl        |   6 +-
 tp/t/results/conditionals/macro_in_ifset_set.pl    |  12 +-
 tp/t/results/conditionals/many_conditionals.pl     |  16 +-
 tp/t/results/conditionals/nested_ifset_ifclear.pl  |   6 +-
 tp/t/results/conditionals/nested_ignore.pl         |  24 +-
 .../conditionals/user_defined_txiinternalvalue.pl  |   6 +-
 .../results/converters_tests/at_commands_in_raw.pl |  77 ++-
 tp/t/results/converters_tests/combined_fonts.pl    |  45 +-
 tp/t/results/converters_tests/complex_nestings.pl  |  91 ++-
 .../converters_tests/definition_commands.pl        | 419 ++++++++++----
 .../email_table_command_as_argument.pl             |  16 +-
 .../converters_tests/enumerate_above_ten.pl        |  12 +-
 .../results/converters_tests/footnote_no_number.pl |  31 +-
 .../footnote_no_number_separate.pl                 |  31 +-
 tp/t/results/converters_tests/form_feeds.pl        |  81 ++-
 .../converters_tests/frenchspacing_and_code.pl     | 106 ++--
 tp/t/results/converters_tests/image_formatting.pl  |  39 +-
 .../index_entry_in_preformatted.pl                 |  59 +-
 tp/t/results/converters_tests/inline.pl            |  20 +-
 tp/t/results/converters_tests/inline_expand_tex.pl |   4 +-
 tp/t/results/converters_tests/inlinefmtifelse.pl   |   8 +-
 .../results/converters_tests/inlineifsetifclear.pl |   4 +-
 tp/t/results/converters_tests/line_breaks.pl       |  52 +-
 tp/t/results/converters_tests/non_empty_part.pl    | 115 ++--
 .../non_empty_part_no_top_node_output.pl           | 115 ++--
 .../converters_tests/normal_font_in_monospace.pl   |   8 +-
 .../printindex_merged_indices_code_style.pl        | 103 ++--
 .../results/converters_tests/raw_block_commands.pl |  40 +-
 .../raw_block_commands_expand_tex.pl               |  40 +-
 .../converters_tests/ref_error_formatting.pl       |  26 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl | 170 ++++--
 .../references_to_top_no_top_output.pl             |  97 +++-
 tp/t/results/converters_tests/refs_formatting.pl   |  44 +-
 .../converters_tests/simplest_no_node_section.pl   |   6 +-
 .../some_at_commands_in_ref_nodes.pl               |  40 +-
 tp/t/results/converters_tests/sp_in_example.pl     |  38 +-
 .../converters_tests/spaces_in_empty_node_names.pl |  38 +-
 .../converters_tests/spaces_in_node_names.pl       |  40 +-
 .../table_in_display_in_example.pl                 |  32 +-
 .../table_in_example_in_display.pl                 |  32 +-
 .../converters_tests/test_deftypefnnewline.pl      | 161 ++++--
 tp/t/results/converters_tests/test_sp.pl           |  30 +-
 .../converters_tests/things_before_setfilename.pl  |  89 ++-
 .../things_before_setfilename_no_element.pl        |  58 +-
 tp/t/results/converters_tests/top_in_ref.pl        |  37 +-
 tp/t/results/coverage/block_commands.pl            |  31 +-
 tp/t/results/coverage/cartouche.pl                 |   6 +-
 tp/t/results/coverage/cartouche_in_example.pl      |  16 +-
 tp/t/results/coverage/cartouche_in_quotation.pl    |  16 +-
 tp/t/results/coverage/center.pl                    |   4 +-
 tp/t/results/coverage/command_in_end.pl            |  58 +-
 .../command_in_end_expanded_raw_command_after.pl   |   8 +-
 ...mand_in_end_expanded_raw_command_empty_after.pl |   8 +-
 .../command_in_end_expanded_raw_in_command.pl      |   8 +-
 ..._in_end_expanded_raw_one_char_before_command.pl |   8 +-
 ..._in_end_expanded_raw_one_char_not_in_command.pl |   8 +-
 ..._in_end_expanded_raw_two_char_before_command.pl |   8 +-
 ..._in_end_expanded_raw_two_char_not_in_command.pl |   8 +-
 .../command_in_end_ignored_raw_command_after.pl    |   8 +-
 .../command_in_end_ignored_raw_in_command.pl       |   2 +-
 ...d_in_end_ignored_raw_one_char_before_command.pl |   2 +-
 ...d_in_end_ignored_raw_one_char_not_in_command.pl |   2 +-
 ...d_in_end_ignored_raw_two_char_before_command.pl |   2 +-
 ...d_in_end_ignored_raw_two_char_not_in_command.pl |   2 +-
 tp/t/results/coverage/commands.pl                  |  13 +-
 tp/t/results/coverage/commands_in_math.pl          |  32 +-
 tp/t/results/coverage/comment_on_cartouche_line.pl |   8 +-
 tp/t/results/coverage/comment_on_group_line.pl     |   8 +-
 tp/t/results/coverage/def.pl                       |  68 ++-
 tp/t/results/coverage/delcomment.pl                |   6 +-
 tp/t/results/coverage/displaymath.pl               |  32 +-
 .../end_bad_end_argument_and_superfluous_arg.pl    |   8 +-
 tp/t/results/coverage/exdent_and_commands.pl       |  28 +-
 tp/t/results/coverage/exdent_and_formats.pl        | 168 +++---
 tp/t/results/coverage/flushleft_flushright.pl      |  16 +-
 .../coverage/flushleft_flushright_in_quotation.pl  |  24 +-
 tp/t/results/coverage/flushright_example_nested.pl |  32 +-
 tp/t/results/coverage/flushright_not_closed.pl     |   2 +-
 .../coverage/formats_only_title_comments.pl        |  60 +-
 tp/t/results/coverage/formats_only_titles.pl       |  56 +-
 tp/t/results/coverage/formats_titles.pl            |  66 ++-
 .../coverage/group_beginning_and_end_on_line.pl    |   8 +-
 tp/t/results/coverage/group_not_closed.pl          |   2 +-
 tp/t/results/coverage/hyphenation.pl               |   2 +-
 tp/t/results/coverage/indentedblock.pl             |   8 +-
 tp/t/results/coverage/insertcopying.pl             |  16 +-
 tp/t/results/coverage/invalid_U.pl                 |   4 +-
 tp/t/results/coverage/item_container.pl            |  30 +-
 tp/t/results/coverage/math.pl                      |   2 +-
 tp/t/results/coverage/multitable.pl                |  34 +-
 tp/t/results/coverage/nested_block_commands.pl     | 192 ++++---
 tp/t/results/coverage/preformatted.pl              |  34 +-
 .../coverage/punctuation_in_line_commands.pl       | 106 ++--
 tp/t/results/coverage/quotation_author.pl          |  20 +-
 tp/t/results/coverage/raggedright.pl               |   8 +-
 tp/t/results/coverage/setfilename_in_paragraph.pl  |   6 +-
 .../coverage/spaces_after_braced_command.pl        |   2 +-
 tp/t/results/coverage/symbol_after_block.pl        | 152 +++--
 tp/t/results/coverage/symbol_after_command.pl      |  26 +-
 tp/t/results/coverage/table.pl                     |  72 ++-
 tp/t/results/coverage/table_command_comment.pl     |  12 +-
 tp/t/results/coverage/test_errormsg.pl             |   2 +-
 tp/t/results/coverage/titlefont_in_center.pl       |   4 +-
 tp/t/results/coverage/verbatiminclude.pl           |   6 +-
 tp/t/results/coverage_braces/abbr_acronym.pl       |   2 +-
 tp/t/results/coverage_braces/caption_not_closed.pl |  15 +-
 .../coverage_braces/contain_plain_text_nestings.pl |  57 +-
 tp/t/results/coverage_braces/empty_images.pl       |   4 +-
 .../results/coverage_braces/empty_line_in_email.pl |   2 +-
 tp/t/results/coverage_braces/empty_ref.pl          |   6 +-
 .../coverage_braces/empty_second_email_argument.pl |   4 +-
 .../footnote_ending_on_empty_line.pl               |   2 +-
 tp/t/results/coverage_braces/footnote_no_node.pl   |   6 +-
 .../results/coverage_braces/footnote_not_closed.pl |   2 +-
 .../coverage_braces/form_feed_in_brace_commands.pl |   8 +-
 .../format_on_first_footnote_line.pl               |  16 +-
 .../results/coverage_braces/heading_in_footnote.pl |  13 +-
 .../coverage_braces/inforef_too_much_args.pl       |  16 +-
 tp/t/results/coverage_braces/kbd.pl                |  16 +-
 .../math_leading_trailing_spaces.pl                |   2 +-
 tp/t/results/coverage_braces/nested_args.pl        |   6 +-
 tp/t/results/coverage_braces/nested_in_sc.pl       |   2 +-
 .../one_argument_leading_trailing_spaces.pl        |   4 +-
 tp/t/results/coverage_braces/recursive_acronym.pl  |   2 +-
 .../recursive_acronym_definition.pl                |   6 +-
 tp/t/results/coverage_braces/ref_empty_node.pl     |  14 +-
 tp/t/results/coverage_braces/space_in_anchor.pl    |   2 +-
 tp/t/results/coverage_braces/space_in_footnote.pl  |   2 +-
 tp/t/results/coverage_braces/space_in_image.pl     |  10 +-
 tp/t/results/coverage_braces/test_image.pl         |  93 ++--
 tp/t/results/coverage_braces/too_much_args.pl      |   2 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |  40 +-
 .../two_footnotes_in_nodes_separate.pl             |  46 +-
 tp/t/results/coverage_braces/uref_in_ref.pl        |   8 +-
 .../uref_with_commands_characters.pl               |   2 +-
 tp/t/results/coverage_braces/verb_in_xref.pl       |  14 +-
 tp/t/results/def/all_commands.pl                   | 216 +++++---
 tp/t/results/def/all_commands_delimiters.pl        | 376 ++++++++-----
 .../def/all_commands_delimiters_printindex.pl      | 418 ++++++++------
 tp/t/results/def/all_commands_printindex.pl        | 258 +++++----
 tp/t/results/def/all_empty_def.pl                  |  72 ++-
 tp/t/results/def/ampchar.pl                        |   8 +-
 tp/t/results/def/code_in_def.pl                    |   8 +-
 tp/t/results/def/def_defx_mismatch.pl              |  12 +-
 tp/t/results/def/defx_after_comment.pl             |  10 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |  20 +-
 tp/t/results/def/defx_after_empty_line.pl          |  10 +-
 .../def/defx_after_empty_line_in_example.pl        |  20 +-
 tp/t/results/def/defx_after_paragraph_end.pl       |  10 +-
 .../def/defx_after_preformatted_with_text.pl       |  20 +-
 tp/t/results/def/defx_after_text.pl                |  10 +-
 tp/t/results/def/defx_in_example.pl                |  20 +-
 tp/t/results/def/double_command.pl                 |  24 +-
 tp/t/results/def/empty_def_arguments.pl            |  28 +-
 tp/t/results/def/empty_def_command.pl              |  20 +-
 tp/t/results/def/empty_deftype.pl                  |  32 +-
 tp/t/results/def/empty_deftypeop_name.pl           |   8 +-
 tp/t/results/def/end_of_line_end_file.pl           |   2 +-
 tp/t/results/def/end_of_line_protect_at_end.pl     |   2 +-
 tp/t/results/def/end_of_lines_protected.pl         |   8 +-
 .../def/end_of_lines_protected_in_footnote.pl      |  10 +-
 tp/t/results/def/inter_item_commands_in_def.pl     |  32 +-
 .../def/inter_item_commands_in_def_in_example.pl   |  40 +-
 tp/t/results/def/leading_space_in_def_arg.pl       |  12 +-
 tp/t/results/def/no_category_or_no_name.pl         |  32 +-
 tp/t/results/def/not_closed.pl                     |   8 +-
 tp/t/results/def/omit_def_space.pl                 |  27 +-
 tp/t/results/def/protected_brace.pl                |   8 +-
 tp/t/results/def/ref_in_def.pl                     |  24 +-
 tp/t/results/def/space_in_def_for_index.pl         |  42 +-
 tp/t/results/def/wrong_braces_simple.pl            |  72 ++-
 tp/t/results/def/wrong_braces_with_end_of_lines.pl |  20 +-
 .../docbook_tests/between_node_and_section.pl      |  48 +-
 ...pty_quotation_with_arg_followed_by_quotation.pl |  18 +-
 .../docbook_tests/multiple_documentlanguage.pl     |  96 +++-
 .../docbook_tests/special_docbook_unnumbered.pl    |  88 ++-
 tp/t/results/float/anchor_in_caption.pl            |  31 +-
 tp/t/results/float/cindex_in_caption.pl            |  43 +-
 .../results/float/comment_space_comand_in_float.pl |  31 +-
 tp/t/results/float/complex_float.pl                | 230 +++++---
 tp/t/results/float/empty_caption.pl                |  34 +-
 tp/t/results/float/empty_label_no_space.pl         |  15 +-
 tp/t/results/float/empty_label_no_space_comment.pl |  13 +-
 tp/t/results/float/empty_label_with_space.pl       |  15 +-
 .../float/empty_label_with_space_comment.pl        |  17 +-
 tp/t/results/float/empty_listoffloats.pl           |   2 +-
 .../float/empty_listoffloats_with_floats.pl        |  44 +-
 tp/t/results/float/float_copying.pl                | 105 ++--
 tp/t/results/float/float_with_at_commands.pl       |  19 +-
 tp/t/results/float/footnote_in_caption.pl          |  31 +-
 .../results/float/footnote_in_caption_and_error.pl |  31 +-
 tp/t/results/float/listoffloats_with_commands.pl   |   6 +-
 .../float/numbering_captions_listoffloats.pl       | 491 +++++++++++-----
 tp/t/results/float/ref_to_float.pl                 |  26 +-
 tp/t/results/float/simple.pl                       |  11 +-
 tp/t/results/formats_encodings/accent.pl           |  22 +-
 .../formats_encodings/accent_enable_encoding.pl    |  22 +-
 tp/t/results/formats_encodings/accentenc.pl        |  28 +-
 .../formats_encodings/accentenc_enable_encoding.pl |  28 +-
 .../formats_encodings/at_commands_in_refs.pl       | 488 +++++++++++-----
 .../at_commands_in_refs_latin1.pl                  | 500 ++++++++++++-----
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 500 ++++++++++++-----
 .../char_latin1_latin1_in_refs.pl                  | 158 ++++--
 .../formats_encodings/char_latin1_utf8_in_refs.pl  | 158 ++++--
 .../char_latin2_latin2_in_refs.pl                  |  64 ++-
 .../documentencoding_utf8_and_insertions.pl        |  14 +-
 .../formats_encodings/japanese_shift_jis.pl        |  87 ++-
 .../manual_simple_latin1_with_error.pl             |  43 +-
 .../manual_simple_utf8_with_error.pl               |  37 +-
 .../no_documentencoding_and_insertions.pl          |   8 +-
 tp/t/results/formats_encodings/sample_utf8.pl      | 147 +++--
 tp/t/results/formats_encodings/weird_accents.pl    |  37 +-
 .../weird_accents_disable_encoding.pl              |  37 +-
 tp/t/results/formatting/cond.pl                    |  34 +-
 .../results/formatting/cond_ifhtml_ifinfo_iftex.pl |  34 +-
 tp/t/results/formatting/cond_info.pl               |  34 +-
 .../formatting/cond_info_ifhtml_ifinfo_iftex.pl    |  34 +-
 .../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl      |  34 +-
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |  34 +-
 tp/t/results/formatting/cond_xml.pl                |  34 +-
 tp/t/results/formatting/defcondx_Dbar.pl           |  18 +-
 tp/t/results/formatting/defcondx_Ubar.pl           |  14 +-
 .../formatting/direntry_dircategory_info_split.pl  |  82 ++-
 .../formatting/documentlanguage_set_option.pl      |  39 +-
 .../formatting/documentlanguage_set_option_info.pl |  38 +-
 .../formatting/documentlanguage_set_unknown.pl     |  39 +-
 tp/t/results/formatting/float_copying.pl           | 131 +++--
 .../formatting/simplest_test_date_in_header.pl     |  18 +-
 tp/t/results/formatting/simplest_test_prefix.pl    |  18 +-
 .../formatting/simplest_test_prefix_info.pl        |  18 +-
 .../formatting/split_for_format_not_split.pl       |  18 +-
 tp/t/results/formatting/split_nocopying.pl         |  46 +-
 tp/t/results/formatting/split_nocopying_split.pl   |  46 +-
 tp/t/results/formatting/texi_bib_example.pl        | 123 ++--
 tp/t/results/formatting/texi_cond.pl               |  34 +-
 tp/t/results/formatting/texi_glossary.pl           | 112 ++--
 tp/t/results/heading/heading_in_copying.pl         |  34 +-
 tp/t/results/heading/heading_in_example.pl         |  12 +-
 tp/t/results/heading/heading_in_quotation.pl       |  12 +-
 .../html_tests/acronym_in_node_and_section.pl      |  59 +-
 .../character_number_leading_toc_stoc.pl           |  24 +-
 tp/t/results/html_tests/check_htmlxref.pl          |  63 ++-
 .../html_tests/check_htmlxref_ignore_ref_top_up.pl |  63 ++-
 tp/t/results/html_tests/check_htmlxref_menu.pl     |  63 ++-
 .../html_tests/check_htmlxref_no_use_nodes.pl      |  63 ++-
 tp/t/results/html_tests/commands_in_abbr.pl        |  12 +-
 tp/t/results/html_tests/commands_in_alt.pl         |   8 +-
 .../deftypefnnewline_for_copying_after.pl          |  52 +-
 .../deftypefnnewline_for_copying_before.pl         |  52 +-
 tp/t/results/html_tests/documentdescription.pl     |  14 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |  22 +-
 ...lines_at_beginning_no_setfilename_no_element.pl |   4 +-
 ...otnotestyle_separate_html_text_no_monolithic.pl |  37 +-
 .../html_tests/footnotestyle_separate_late.pl      |  57 +-
 tp/t/results/html_tests/html_in_copying.pl         |  38 +-
 .../results/html_tests/index_and_node_same_name.pl |  30 +-
 tp/t/results/html_tests/index_below.pl             |  33 +-
 tp/t/results/html_tests/itemize_arguments.pl       | 346 +++++++-----
 .../itemize_arguments_enable_encoding.pl           | 346 +++++++-----
 tp/t/results/html_tests/mathjax_with_texinfo.pl    |   8 +-
 .../mathjax_with_texinfo_enable_encoding.pl        |   8 +-
 .../html_tests/mathjax_with_texinfo_html_text.pl   |   8 +-
 .../mathjax_with_texinfo_no_convert_to_latex.pl    |   8 +-
 tp/t/results/html_tests/raw_html.pl                |   8 +-
 tp/t/results/html_tests/redirection_same_labels.pl | 102 +++-
 tp/t/results/html_tests/ref_in_preformatted.pl     |  32 +-
 tp/t/results/html_tests/shortcontents_no_top.pl    |  18 +-
 tp/t/results/html_tests/shorttitlepage.pl          |  33 +-
 tp/t/results/html_tests/simple_menu.pl             | 107 ++--
 tp/t/results/html_tests/simple_menu_in_example.pl  |  44 +-
 tp/t/results/html_tests/split_html_text.pl         |  34 +-
 tp/t/results/html_tests/test_accents_sc_default.pl |  31 +-
 .../html_tests/test_accents_sc_default_latin1.pl   |  37 +-
 .../html_tests/test_accents_sc_default_usascii.pl  |  37 +-
 .../html_tests/test_accents_sc_enable_encoding.pl  |  31 +-
 .../test_accents_sc_enable_encoding_latin1.pl      |  37 +-
 ...st_accents_sc_enable_encoding_to_utf8_latin1.pl |  37 +-
 ...t_accents_sc_enable_encoding_to_utf8_usascii.pl |  37 +-
 .../test_accents_sc_enable_encoding_usascii.pl     |  37 +-
 .../html_tests/test_accents_sc_to_utf8_latin1.pl   |  37 +-
 .../test_accents_sc_use_numeric_entity.pl          |  31 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |  52 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |  52 +-
 tp/t/results/html_tests/tex_expanded_in_copying.pl |  16 +-
 .../text_before_top_and_contents_after_title.pl    |  28 +-
 ...t_before_top_and_summarycontents_after_title.pl |  28 +-
 tp/t/results/html_tests/titles.pl                  |  33 +-
 .../html_tests/uref_accented_letter_ascii.pl       |   6 +-
 .../html_tests/uref_accented_letter_latin1.pl      |   6 +-
 tp/t/results/html_tests/utf8_default.pl            |   6 +-
 tp/t/results/html_tests/utf8_enable_encoding.pl    |   6 +-
 .../html_tests/utf8_enable_encoding_no_use_iso.pl  |   6 +-
 .../utf8_enable_encoding_use_numeric_entity.pl     |   6 +-
 tp/t/results/html_tests/utf8_use_numeric_entity.pl |   6 +-
 .../verbatim_in_multitable_in_example.pl           |  38 +-
 tp/t/results/html_tests/xml_protected_in_verb.pl   |  14 +-
 tp/t/results/htmlxref/htmlxref.pl                  | 226 +++++---
 tp/t/results/htmlxref/htmlxref_nodes.pl            | 226 +++++---
 tp/t/results/htmlxref/htmlxref_only_mono.pl        | 226 +++++---
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  | 226 +++++---
 tp/t/results/htmlxref/htmlxref_only_split.pl       | 226 +++++---
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl | 226 +++++---
 tp/t/results/include/cpp_line_latin1.pl            |  23 +-
 tp/t/results/include/cpp_lines.pl                  |  62 ++-
 tp/t/results/include/include_at_end_line.pl        |   4 +-
 .../include_setfilename_on_setfilename_line.pl     |  14 +-
 tp/t/results/include/include_with_setfilename.pl   |   6 +-
 .../macro_and_commands_in_early_commands.pl        |  64 ++-
 .../results/include/macro_definition_in_include.pl |   6 +-
 tp/t/results/include/macro_in_early_commands.pl    |  70 ++-
 tp/t/results/include/value_expansion_in_include.pl |  30 +-
 .../include/verbatiminclude_and_encoding.pl        |  12 +-
 .../include/verbatiminclude_and_encoding_latin1.pl |  12 +-
 tp/t/results/indices/complex_recursive_synindex.pl | 140 +++--
 tp/t/results/indices/def_existing_index.pl         |   4 +-
 tp/t/results/indices/def_syn_indices.pl            | 181 ++++--
 ...default_cp_index_and_one_letter_syncodeindex.pl |  36 +-
 tp/t/results/indices/double_index_entry.pl         |  48 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |  67 ++-
 tp/t/results/indices/double_syncodeindex.pl        |  48 +-
 tp/t/results/indices/empty_cindex_entry.pl         |  17 +-
 tp/t/results/indices/empty_index_entry.pl          |  33 +-
 tp/t/results/indices/empty_string_index_entry.pl   |  57 +-
 tp/t/results/indices/encoding_index_ascii.pl       | 370 +++++++++----
 .../encoding_index_ascii_enable_encoding.pl        | 370 +++++++++----
 tp/t/results/indices/encoding_index_latin1.pl      | 370 +++++++++----
 .../encoding_index_latin1_enable_encoding.pl       | 370 +++++++++----
 tp/t/results/indices/encoding_index_utf8.pl        | 370 +++++++++----
 .../indices/encoding_index_utf8_enable_encoding.pl | 370 +++++++++----
 tp/t/results/indices/explicit_sort_key.pl          |  54 +-
 tp/t/results/indices/ftable_vtable.pl              |  90 ++-
 .../indices/ignored_sort_char_empty_entries.pl     |  48 +-
 tp/t/results/indices/image_lines_count.pl          | Bin 7068 -> 7191 bytes
 tp/t/results/indices/image_text_lines_count.pl     | Bin 7563 -> 7686 bytes
 tp/t/results/indices/index_entries_locations.pl    |  42 +-
 .../indices/index_entry_before_first_node.pl       | Bin 7417 -> 7540 bytes
 tp/t/results/indices/index_entry_before_node.pl    |  44 +-
 tp/t/results/indices/index_entry_in_footnote.pl    | Bin 8837 -> 8992 bytes
 .../index_entry_in_footnote_different_node_end.pl  |  42 +-
 .../indices/index_entry_in_footnote_separate.pl    |  48 +-
 .../multiple_index_text_sortas_seeentry_seealso.pl |  50 +-
 tp/t/results/indices/print_merged_index.pl         |  22 +-
 tp/t/results/indices/printindex_before_document.pl |   6 +-
 .../indices/printindex_index_entry_in_copying.pl   | 102 ++--
 ...rintindex_index_entry_in_copying_in_footnote.pl |  62 ++-
 ...ndex_index_entry_in_copying_no_insertcopying.pl | 102 ++--
 .../indices/printindex_with_space_before.pl        | Bin 6659 -> 6782 bytes
 tp/t/results/indices/recursive_synindex.pl         |  20 +-
 .../indices/same_index_entry_merged_indices.pl     |  45 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |  73 ++-
 tp/t/results/indices/same_seealso_seeentry.pl      |  79 ++-
 tp/t/results/indices/seealso_duplicate.pl          |  42 +-
 tp/t/results/indices/seeentry.pl                   |  62 ++-
 tp/t/results/indices/sorted_subentries.pl          | 299 ++++++----
 tp/t/results/indices/subentries.pl                 | 158 ++++--
 tp/t/results/indices/subentry_and_sortas.pl        |  62 ++-
 tp/t/results/indices/subentry_and_sortas_spaces.pl |  82 ++-
 tp/t/results/indices/syncode_index_print_both.pl   |  61 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |  48 +-
 tp/t/results/indices/transparent_sort_chars.pl     |  42 +-
 tp/t/results/indices/unknown_printindex.pl         |   2 +-
 tp/t/results/indices/unknown_synindex.pl           |   2 +-
 .../indices/unknown_then_known_index_entry.pl      |  12 +-
 tp/t/results/indices/w_lines_count.pl              |  27 +-
 tp/t/results/indices/wrong_synindex.pl             |   8 +-
 tp/t/results/info_tests/anchor_and_spaces.pl       |  22 +-
 tp/t/results/info_tests/anchor_in_command.pl       |  12 +-
 tp/t/results/info_tests/before_node_and_section.pl |  60 +-
 tp/t/results/info_tests/center_flush.pl            |  20 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |  60 +-
 .../info_tests/colons_in_index_entries_and_node.pl |  82 ++-
 .../colons_in_index_entries_and_node_no_quoting.pl |  82 ++-
 tp/t/results/info_tests/def_in_copying.pl          |  66 ++-
 .../direntry_dircategory_and_commands.pl           |  46 +-
 tp/t/results/info_tests/empty_caption.pl           |  31 +-
 tp/t/results/info_tests/empty_copying_not_ended.pl |   2 +-
 tp/t/results/info_tests/encoding_us_ascii.pl       |  18 +-
 .../end_of_line_command_in_node_lines.pl           |  68 ++-
 tp/t/results/info_tests/error_in_footnote.pl       |  37 +-
 tp/t/results/info_tests/file_only_png.pl           | Bin 4112 -> 4169 bytes
 tp/t/results/info_tests/float_long_captions.pl     |  44 +-
 tp/t/results/info_tests/float_without_type.pl      |  33 +-
 tp/t/results/info_tests/image_and_punctuation.pl   | Bin 8011 -> 8068 bytes
 .../info_tests/image_and_spaces_formatting.pl      |  12 +-
 tp/t/results/info_tests/image_extension.pl         | Bin 5220 -> 5277 bytes
 tp/t/results/info_tests/image_in_paragraph.pl      | Bin 3565 -> 3622 bytes
 tp/t/results/info_tests/image_not_found.pl         |  12 +-
 tp/t/results/info_tests/image_quotes.pl            | Bin 3125 -> 3182 bytes
 tp/t/results/info_tests/image_text_encoded.pl      |   6 +-
 tp/t/results/info_tests/index_entry_at_end_node.pl |  68 ++-
 .../info_tests/invalid_node_name_no_warning.pl     |  44 +-
 .../info_tests/invalid_node_name_warning.pl        |  44 +-
 tp/t/results/info_tests/known_encoding.pl          |  18 +-
 .../info_tests/multiline_image_and_align.pl        |  96 ++--
 .../multitable_anchor_and_index_entry.pl           |  58 +-
 .../info_tests/nested_footnotes_separate.pl        |  18 +-
 .../info_tests/nested_multitable_anchor_index.pl   |  54 +-
 tp/t/results/info_tests/no_node_but_top.pl         |   6 +-
 tp/t/results/info_tests/no_top_node.pl             |  12 +-
 tp/t/results/info_tests/note_in_strong.pl          |  12 +-
 .../info_tests/note_in_strong_end_of_line.pl       |  12 +-
 tp/t/results/info_tests/novalidate_empty_refs.pl   |  28 +-
 tp/t/results/info_tests/only_documentencoding.pl   |   4 +-
 .../info_tests/paragraphindent_and_preamble.pl     |  36 +-
 .../info_tests/paragraphindent_asis_first.pl       |   6 +-
 .../paragraphindent_in_preamble_and_in_document.pl |  42 +-
 .../info_tests/paragraphindent_none_first.pl       |   6 +-
 .../info_tests/paragraphindent_not_in_preamble.pl  |  36 +-
 tp/t/results/info_tests/pxref_test.pl              |  16 +-
 tp/t/results/info_tests/quote_node_names_info.pl   | 129 +++--
 tp/t/results/info_tests/ref_tests.pl               |  20 +-
 tp/t/results/info_tests/space_at_menu_end.pl       |  16 +-
 tp/t/results/info_tests/space_in_menu.pl           |  40 +-
 tp/t/results/info_tests/space_in_setfilename.pl    |  18 +-
 tp/t/results/info_tests/split_no_copying.pl        |  46 +-
 .../info_tests/split_test_before_first_node.pl     |  46 +-
 .../split_test_before_first_node_no_empty_line.pl  |  46 +-
 tp/t/results/info_tests/test_index.pl              | 216 +++++---
 tp/t/results/info_tests/text_before_node.pl        |  38 +-
 tp/t/results/info_tests/top_node_normalization.pl  |  16 +-
 .../info_tests/two_paragraphindent_in_preamble.pl  |  42 +-
 ..._paragraphindent_in_preamble_and_in_document.pl |  48 +-
 tp/t/results/info_tests/unknown_encoding.pl        |  18 +-
 tp/t/results/info_tests/xref_test.pl               |  14 +-
 .../init_files_tests/customize_special_element.pl  |  58 +-
 .../init_files_tests/customize_translations.pl     | 101 +++-
 .../init_files_tests/documentation_examples.pl     |  44 +-
 ...acro_defined_txiinternalvalue_in_translation.pl |  12 +-
 .../init_files_tests/modified_translation.pl       |  12 +-
 tp/t/results/init_files_tests/redefined_need.pl    |   6 +-
 .../init_files_tests/undefined_node_filename.pl    |  15 +-
 tp/t/results/invalid_nestings/bad_style_nesting.pl |   8 +-
 tp/t/results/invalid_nestings/bad_tab_nesting.pl   |  12 +-
 .../results/invalid_nestings/block_not_matching.pl |  34 +-
 .../invalid_nestings/cartouche_in_style_command.pl |   8 +-
 tp/t/results/invalid_nestings/center.pl            | 114 ++--
 .../invalid_nestings/def_in_style_command.pl       |   8 +-
 .../def_not_closed_in_menu_description.pl          |  10 +-
 .../invalid_nestings/enumerate_in_style_command.pl |  12 +-
 .../invalid_nestings/example_in_style_command.pl   |   8 +-
 .../invalid_nestings/float_in_style_command.pl     |  13 +-
 .../flushright_in_style_command.pl                 |   8 +-
 tp/t/results/invalid_nestings/footnote_in_ref.pl   |  14 +-
 .../formats_not_closed_in_example.pl               |  20 +-
 tp/t/results/invalid_nestings/ignore_in_xref.pl    |  22 +-
 tp/t/results/invalid_nestings/ignored_text.pl      |   2 +-
 tp/t/results/invalid_nestings/in_errormsg.pl       |  18 +-
 tp/t/results/invalid_nestings/in_table.pl          | 104 ++--
 tp/t/results/invalid_nestings/item_in_ref.pl       |  22 +-
 .../item_tab_outside_of_table_lists.pl             |   4 +-
 .../itemx_in_itemize_enumerate_in_table.pl         |  40 +-
 .../invalid_nestings/menu_in_style_command.pl      |  16 +-
 .../multitable_in_style_command.pl                 |  12 +-
 .../invalid_nestings/multitable_item_in_index.pl   |  18 +-
 tp/t/results/invalid_nestings/node_in_copying.pl   |  14 +-
 .../invalid_nestings/node_in_copying_not_closed.pl |  24 +-
 .../invalid_nestings/node_on_index_entry_line.pl   |  14 +-
 .../invalid_nestings/on_block_command_line.pl      |  24 +-
 tp/t/results/invalid_nestings/on_def_line.pl       |  24 +-
 .../invalid_nestings/on_index_entry_line.pl        |   8 +-
 tp/t/results/invalid_nestings/on_itemize_line.pl   |  22 +-
 tp/t/results/invalid_nestings/on_node_line.pl      |  18 +-
 tp/t/results/invalid_nestings/on_section_line.pl   |   8 +-
 .../results/invalid_nestings/on_subheading_line.pl |   6 +-
 tp/t/results/invalid_nestings/quotation_in_ref.pl  |  22 +-
 .../invalid_nestings/quotation_in_style_command.pl |   8 +-
 tp/t/results/invalid_nestings/raw_block_on_line.pl |   4 +-
 tp/t/results/invalid_nestings/recursive_copying.pl |   8 +-
 tp/t/results/invalid_nestings/ref_in_anchor.pl     |  12 +-
 tp/t/results/invalid_nestings/ref_in_ref.pl        |  12 +-
 .../results/invalid_nestings/section_in_copying.pl |   8 +-
 .../invalid_nestings/section_in_flushright.pl      |   8 +-
 .../invalid_nestings/section_in_footnote.pl        |   8 +-
 tp/t/results/invalid_nestings/section_in_math.pl   |  14 +-
 .../section_in_nested_block_commands.pl            |  18 +-
 tp/t/results/invalid_nestings/section_in_table.pl  |  16 +-
 .../invalid_nestings/section_on_def_line.pl        |   8 +-
 .../invalid_nestings/section_on_defx_line.pl       |  12 +-
 .../section_on_index_entry_line.pl                 |   8 +-
 .../style_not_closed_before_first_node.pl          |  12 +-
 .../style_not_closed_in_block_command.pl           |   8 +-
 .../style_not_closed_in_table_line.pl              |  20 +-
 .../style_not_closed_no_newline_root_commands.pl   |  40 +-
 .../style_not_closed_root_commands.pl              |  40 +-
 tp/t/results/invalid_nestings/tab_in_index.pl      |  18 +-
 tp/t/results/invalid_nestings/table_in_code.pl     |  16 +-
 .../table_not_closed_in_menu_comment.pl            |  18 +-
 .../table_not_closed_in_menu_description.pl        |  18 +-
 .../results/invalid_nestings/table_on_item_line.pl |  24 +-
 .../unclosed_verb_end_of_line_on_misc_line.pl      |   2 +-
 .../invalid_nestings/unclosed_verb_on_misc_line.pl |   2 +-
 .../unclosed_verb_on_section_line.pl               |   4 +-
 tp/t/results/invalid_nestings/verbatim_in_ref.pl   |  22 +-
 tp/t/results/itemize/accent_argument.pl            |  20 +-
 tp/t/results/itemize/asis_as_itemize_argument.pl   |  12 +-
 tp/t/results/itemize/bad_enumerate_arguments.pl    |  60 +-
 .../itemize/comment_first_on_enumerate_line.pl     |  10 +-
 .../itemize/comment_first_on_itemize_line.pl       |  10 +-
 tp/t/results/itemize/empty_accent_argument.pl      |  28 +-
 tp/t/results/itemize/enumerate_and_empty_lines.pl  |  48 +-
 tp/t/results/itemize/enumerate_argument.pl         |  36 +-
 tp/t/results/itemize/enumerate_argument_item.pl    |  36 +-
 tp/t/results/itemize/enumerate_in_example.pl       |  16 +-
 tp/t/results/itemize/enumerate_letters.pl          |  12 +-
 .../results/itemize/headitem_itemx_in_enumerate.pl |  12 +-
 tp/t/results/itemize/headitem_itemx_in_itemize.pl  |  12 +-
 .../itemize/inter_item_commands_in_enumerate.pl    | 121 ++--
 .../itemize/inter_item_commands_in_itemize.pl      |  87 ++-
 tp/t/results/itemize/itemize_and_empty_lines.pl    | 130 +++--
 tp/t/results/itemize/itemize_in_example.pl         |  62 ++-
 .../itemize/itemize_line_commands_with_brace.pl    |  24 +-
 tp/t/results/itemize/itemize_long_item.pl          |  42 +-
 tp/t/results/itemize/not_closed_item.pl            |   2 +-
 tp/t/results/itemize/not_closed_itemize.pl         |   2 +-
 tp/t/results/itemize/table_in_itemize.pl           |  30 +-
 tp/t/results/itemize/w_argument.pl                 |  12 +-
 tp/t/results/languages/appendix_translated.pl      |  34 +-
 tp/t/results/languages/command_translated.pl       |  28 +-
 tp/t/results/languages/multiple.pl                 |  87 ++-
 tp/t/results/languages/multiple_in_preamble.pl     |  81 ++-
 .../languages/multiple_in_preamble_before_node.pl  |  73 ++-
 tp/t/results/languages/multiple_lang_chapters.pl   | 176 ++++--
 .../languages/multiple_lang_chapters_latex.pl      | 176 ++++--
 .../languages/multiple_lang_chapters_texi2html.pl  | 170 ++++--
 tp/t/results/languages/simple.pl                   |  26 +-
 tp/t/results/languages/unknown_language.pl         |  34 +-
 tp/t/results/languages/unknown_region.pl           |  26 +-
 tp/t/results/latex_tests/anchor_before_top.pl      |  31 +-
 tp/t/results/latex_tests/anchor_in_copying.pl      |  39 +-
 .../anchor_in_copying_insertcopying_chap.pl        |  39 +-
 .../anchor_in_copying_insertcopying_titlepage.pl   |  51 +-
 ...chor_in_copying_insertcopying_titlepage_chap.pl |  51 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |  55 +-
 tp/t/results/latex_tests/brace_in_index.pl         |  34 +-
 tp/t/results/latex_tests/custom_headings.pl        |  65 ++-
 tp/t/results/latex_tests/enumerate_arguments.pl    |  72 ++-
 .../latex_tests/error_in_sectioning_command.pl     |  31 +-
 tp/t/results/latex_tests/example_in_cartouche.pl   |  24 +-
 tp/t/results/latex_tests/float_and_refs.pl         | 157 ++++--
 tp/t/results/latex_tests/fonttextsize.pl           |  83 ++-
 tp/t/results/latex_tests/indices.pl                |  81 ++-
 .../informative_commands_in_top_node.pl            |  47 +-
 tp/t/results/latex_tests/nested_enumerate.pl       |  32 +-
 tp/t/results/latex_tests/nested_itemize.pl         |  32 +-
 .../no_titlepage_and_setchapternewpage_odd.pl      |   6 +-
 .../no_titlepage_and_setchapternewpage_on.pl       |   6 +-
 tp/t/results/latex_tests/node_before_top.pl        |  37 +-
 tp/t/results/latex_tests/pagesizes.pl              |  57 +-
 tp/t/results/latex_tests/pagetype.pl               |  37 +-
 .../setchapternewpage_on_odd_titlepage.pl          |  20 +-
 tp/t/results/latex_tests/settitle_and_headings.pl  |  16 +-
 tp/t/results/latex_tests/shorttitlepage.pl         |  35 +-
 .../three_setchapternewpage_on_odd_off.pl          |  18 +-
 tp/t/results/latex_tests/titlepage_and_headings.pl |   8 +-
 .../titlepage_and_setchapternewpage_odd.pl         |  14 +-
 .../titlepage_and_setchapternewpage_on.pl          |  14 +-
 tp/t/results/latex_tests/titlepage_classical.pl    |  71 ++-
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |  43 +-
 tp/t/results/latex_tests/titlepage_long_title.pl   |  43 +-
 tp/t/results/latex_tests/titlepage_no_author.pl    |  43 +-
 tp/t/results/latex_tests/titlepage_no_title.pl     |  45 +-
 .../titlepage_with_commands_classical.pl           |  79 ++-
 .../latex_tests/top_no_sectioning_command.pl       |  23 +-
 .../latex_tests/two_setchapternewpage_odd_on.pl    |  12 +-
 .../latex_tests/two_setchapternewpage_on_odd.pl    |  12 +-
 tp/t/results/latex_tests/vbar_in_index.pl          |  12 +-
 .../results/latex_tests/verbatim_in_smallformat.pl |  16 +-
 tp/t/results/layout/navigation.pl                  |  94 +++-
 tp/t/results/layout/navigation_chapter.pl          |  94 +++-
 .../results/layout/navigation_chapter_no_header.pl |  94 +++-
 .../navigation_chapter_no_header_vertical.pl       |  94 +++-
 tp/t/results/layout/navigation_chapter_vertical.pl |  94 +++-
 tp/t/results/layout/navigation_no_header.pl        |  94 +++-
 .../layout/navigation_no_header_vertical.pl        |  94 +++-
 tp/t/results/layout/navigation_node.pl             |  94 +++-
 tp/t/results/layout/navigation_node_no_header.pl   |  94 +++-
 .../layout/navigation_node_no_header_vertical.pl   |  94 +++-
 tp/t/results/layout/navigation_node_vertical.pl    |  94 +++-
 tp/t/results/layout/navigation_section.pl          |  94 +++-
 .../results/layout/navigation_section_no_header.pl |  94 +++-
 .../navigation_section_no_header_vertical.pl       |  94 +++-
 tp/t/results/layout/navigation_section_vertical.pl |  94 +++-
 tp/t/results/layout/navigation_vertical.pl         |  94 +++-
 tp/t/results/layout/no_monolithic.pl               |  58 +-
 tp/t/results/macro/arg_body_expansion_order.pl     |  24 +-
 tp/t/results/macro/arg_not_closed.pl               |   6 +-
 tp/t/results/macro/backslash_in_arg.pl             |  48 +-
 tp/t/results/macro/bad_argument.pl                 |  24 +-
 tp/t/results/macro/bad_formal_arg.pl               |  24 +-
 .../macro/bad_macro_name_with_underscore.pl        |   6 +-
 tp/t/results/macro/complete_macro_for_end.pl       |  12 +-
 tp/t/results/macro/complex_argument.pl             |  48 +-
 tp/t/results/macro/double_macro_definition.pl      |  12 +-
 tp/t/results/macro/double_recursive_macro_call.pl  |  12 +-
 tp/t/results/macro/empty_end.pl                    |   4 +-
 tp/t/results/macro/empty_macro_argument.pl         |  12 +-
 tp/t/results/macro/empty_macro_in_text_no_arg.pl   |  12 +-
 tp/t/results/macro/empty_macro_no_arg.pl           |   6 +-
 tp/t/results/macro/expand_two_same.pl              |   6 +-
 tp/t/results/macro/expansion_order.pl              |  12 +-
 tp/t/results/macro/form_feeds.pl                   |  12 +-
 tp/t/results/macro/ifclear_in_macro.pl             |   6 +-
 tp/t/results/macro/ifset_and_end_isef_in_macro.pl  |  12 +-
 tp/t/results/macro/ifset_in_macro.pl               |   6 +-
 tp/t/results/macro/ifset_in_macro_set.pl           |   6 +-
 tp/t/results/macro/ignored_macro_definition.pl     |   6 +-
 tp/t/results/macro/implicit_quoting_one_arg.pl     |   6 +-
 tp/t/results/macro/implicit_quoting_recursion.pl   |   6 +-
 tp/t/results/macro/include_after_empty_line_arg.pl |   6 +-
 tp/t/results/macro/leading_spaces_no_ignore.pl     |   6 +-
 tp/t/results/macro/line_after_recursive_call.pl    |   6 +-
 tp/t/results/macro/macro_expands_to_empty.pl       |   6 +-
 tp/t/results/macro/macro_expansion.pl              |  52 +-
 tp/t/results/macro/macro_for_end.pl                |  14 +-
 .../macro/macro_for_ignored_line_command.pl        |   6 +-
 tp/t/results/macro/macro_in_accent.pl              |  12 +-
 tp/t/results/macro/macro_in_brace_command.pl       |  24 +-
 tp/t/results/macro/macro_in_end_argument.pl        |  14 +-
 tp/t/results/macro/macro_in_ifset.pl               |   6 +-
 tp/t/results/macro/macro_in_ifset_end_in_arg.pl    |  12 +-
 tp/t/results/macro/macro_in_index_commands.pl      | 114 ++--
 .../macro/macro_in_invalid_documentencoding.pl     |  12 +-
 tp/t/results/macro/macro_in_macro_arg.pl           |  18 +-
 tp/t/results/macro/macro_in_macro_arg_simpler.pl   |  12 +-
 tp/t/results/macro/macro_in_menu.pl                |  44 +-
 tp/t/results/macro/macro_in_misc_commands.pl       | 402 +++++++++-----
 tp/t/results/macro/macro_name_with_digit.pl        |  12 +-
 tp/t/results/macro/macro_name_with_hyphen.pl       |   6 +-
 tp/t/results/macro/macro_no_arg_bad_expansion.pl   |   6 +-
 tp/t/results/macro/macro_no_arg_expansion.pl       |   6 +-
 tp/t/results/macro/macro_one_arg_end_of_file.pl    |   6 +-
 .../macro_with_error_at_end_line_after_macro.pl    |   8 +-
 tp/t/results/macro/macro_zero.pl                   |   6 +-
 tp/t/results/macro/nested_macro_call.pl            |  12 +-
 tp/t/results/macro/no_macrobody.pl                 |   6 +-
 tp/t/results/macro/paragraph_and_macro.pl          |  18 +-
 tp/t/results/macro/protect_comma_macro_line.pl     |   6 +-
 tp/t/results/macro/protect_in_body.pl              |   6 +-
 tp/t/results/macro/protect_in_body_line_arg.pl     |   6 +-
 tp/t/results/macro/protect_in_body_one_arg.pl      |   6 +-
 tp/t/results/macro/recursive_call_in_argument.pl   |   6 +-
 tp/t/results/macro/recursive_call_in_macro.pl      |   6 +-
 tp/t/results/macro/redefine_texinfo_macro.pl       |   6 +-
 tp/t/results/macro/simple_imbricated_macro.pl      |  18 +-
 tp/t/results/macro/space_macro_after_end.pl        |  14 +-
 .../macro/space_macro_after_end_verbatim.pl        |  14 +-
 tp/t/results/macro/text_before_after.pl            |   6 +-
 tp/t/results/macro/too_much_args.pl                |   6 +-
 tp/t/results/macro/two_macros_on_a_line.pl         |  12 +-
 .../results/macro/unknown_macro_on_line_command.pl |   4 +-
 tp/t/results/macro/zero_argument.pl                |  10 +-
 tp/t/results/menu/bad_beginning.pl                 |   6 +-
 .../menu/block_commands_in_menu_description.pl     |  64 ++-
 tp/t/results/menu/comment_on_menu_line.pl          |  34 +-
 tp/t/results/menu/dash_in_menu.pl                  |   8 +-
 tp/t/results/menu/detailmenu.pl                    |  16 +-
 tp/t/results/menu/detailmenu_in_description.pl     |  16 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        | 136 +++--
 tp/t/results/menu/detailmenu_unknown_node.pl       |  28 +-
 .../menu/direntry_dircategory_after_first_node.pl  |  34 +-
 tp/t/results/menu/empty_menu_description.pl        |  16 +-
 tp/t/results/menu/empty_menu_entry_name.pl         |  22 +-
 tp/t/results/menu/entry_after_detailmenu.pl        |  48 +-
 tp/t/results/menu/example_in_menu_comment.pl       |  16 +-
 tp/t/results/menu/example_in_menu_description.pl   |  32 +-
 tp/t/results/menu/formats_in_menu.pl               |  56 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |  26 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |  16 +-
 tp/t/results/menu/menu_entry_name.pl               |   8 +-
 tp/t/results/menu/menu_entry_name_comment.pl       |   8 +-
 tp/t/results/menu/menu_entry_no_entry.pl           |   8 +-
 tp/t/results/menu/menu_entry_no_entry_location.pl  |   8 +-
 tp/t/results/menu/menu_entry_node.pl               |   8 +-
 tp/t/results/menu/menu_entry_node_comments.pl      |   8 +-
 tp/t/results/menu/menu_in_deffn.pl                 |  28 +-
 tp/t/results/menu/menu_in_example.pl               |  44 +-
 .../menu/menu_no_closed_after_empty_line.pl        |   2 +-
 .../results/menu/menu_no_closed_entry_beginning.pl |   2 +-
 tp/t/results/menu/menu_no_closed_in_description.pl |   2 +-
 tp/t/results/menu/menu_no_closed_in_entry.pl       |   2 +-
 tp/t/results/menu/menu_no_closed_star.pl           |   2 +-
 tp/t/results/menu/menu_node_unterminated.pl        |  20 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |  24 +-
 tp/t/results/menu/menu_title_before_entries.pl     |  24 +-
 .../results/menu/missing_detailmenu_on_subnodes.pl | 120 ++--
 tp/t/results/menu/multiple_menus.pl                |  24 +-
 tp/t/results/menu/no_colon_in_menu.pl              |  20 +-
 tp/t/results/menu/reference_to_external_manual.pl  |  16 +-
 tp/t/results/menu/sc_in_menu.pl                    |  48 +-
 tp/t/results/menu/simple.pl                        |   8 +-
 tp/t/results/menu/simple_no_menu.pl                |   8 +-
 .../menu/space_and_commands_in_menu_node.pl        |  40 +-
 tp/t/results/menu/submenu_in_example.pl            |  72 ++-
 tp/t/results/menu/verb_in_menu_description.pl      |  24 +-
 tp/t/results/misc_commands/also_not_line.pl        |   8 +-
 .../author_outside_titlepage_quotation.pl          |   4 +-
 tp/t/results/misc_commands/bad_documentlanguage.pl |  22 +-
 .../codequoteundirected_codequotebacktick.pl       | 163 ++++--
 .../misc_commands/command_in_heading_footing.pl    |   4 +-
 .../misc_commands/command_line_in_paragraph.pl     |   6 +-
 .../command_not_closed_in_documentencoding.pl      |   4 +-
 .../misc_commands/comment_space_command_on_line.pl |  97 +++-
 .../misc_commands/defindex_too_much_args.pl        |   2 +-
 tp/t/results/misc_commands/definfoenclose.pl       |  18 +-
 .../misc_commands/definfoenclose_nestings.pl       |  10 +-
 .../misc_commands/definfoenclose_with_empty_arg.pl |   6 +-
 tp/t/results/misc_commands/double_exdent.pl        |  22 +-
 tp/t/results/misc_commands/empty_center.pl         |   2 +-
 .../results/misc_commands/empty_center_with_arg.pl |   4 +-
 .../misc_commands/empty_documentencoding.pl        |   2 +-
 tp/t/results/misc_commands/footnote_in_center.pl   |  28 +-
 .../misc_commands/heading_command_in_commands.pl   |  28 +-
 .../incorrect_allowcodebreaks_argument.pl          |   5 +-
 tp/t/results/misc_commands/indent_in_quotation.pl  |   8 +-
 tp/t/results/misc_commands/index_entries.pl        |  18 +-
 .../misc_commands/invalid_documentencoding.pl      |  54 +-
 .../results/misc_commands/invalid_kbdinputstyle.pl |   4 +-
 tp/t/results/misc_commands/kbdinputstyle.pl        |  48 +-
 .../misc_commands/kbdinputstyle_in_table.pl        | 240 +++++---
 tp/t/results/misc_commands/many_lines.pl           | 148 +++--
 .../no_empty_line_between_headings.pl              |  23 +-
 .../misc_commands/noindent_after_smallexample.pl   |   8 +-
 tp/t/results/misc_commands/ref_in_center.pl        |  39 +-
 tp/t/results/misc_commands/setfilename.pl          |  24 +-
 tp/t/results/misc_commands/simple.pl               |   4 +-
 tp/t/results/misc_commands/sp.pl                   |  22 +-
 .../misc_commands/synindex_too_much_args.pl        |   4 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |  68 ++-
 .../misc_commands/text_before_line_command.pl      |  40 +-
 tp/t/results/morecoverage/formatting_fr.pl         | 329 +++++++----
 tp/t/results/morecoverage/texi_formatting.pl       | 329 +++++++----
 tp/t/results/moreindices/double_index_entry.pl     |  48 +-
 tp/t/results/moreindices/index_no_node.pl          | 160 ++++--
 tp/t/results/moreindices/index_split.pl            | 354 ++++++++----
 tp/t/results/moreindices/index_split_nodes.pl      | 354 ++++++++----
 tp/t/results/moreindices/nodes_before_top.pl       | 238 +++++---
 .../nodes_before_top_and_sections_monolithic.pl    | 293 ++++++----
 .../moreindices/nodes_before_top_no_nodes.pl       | 238 +++++---
 tp/t/results/moreindices/nodes_before_top_nodes.pl | 238 +++++---
 tp/t/results/moreindices/split_chapter_index.pl    | 172 ++++--
 tp/t/results/moresectioning/equivalent_nodes.pl    |  59 +-
 .../moresectioning/equivalent_nodes_no_node.pl     |  59 +-
 .../moresectioning/more_sections_than_nodes.pl     | 154 ++++--
 tp/t/results/moresectioning/node_footnote_end.pl   |  70 ++-
 .../moresectioning/node_footnote_separated.pl      |  70 ++-
 .../moresectioning/node_footnote_use_node.pl       |  70 ++-
 .../nodes_after_top_before_chapter.pl              |  48 +-
 ...s_after_top_before_chapter_use_nodes_chapter.pl |  48 +-
 .../nodes_after_top_before_section.pl              |  48 +-
 .../nodes_after_top_before_section_use_nodes.pl    |  48 +-
 ...s_after_top_before_section_use_nodes_chapter.pl |  48 +-
 .../moresectioning/placed_things_before_element.pl |  44 +-
 tp/t/results/moresectioning/sectioning_frames.pl   | 229 +++++---
 .../results/moresectioning/top_node_up_explicit.pl |  50 +-
 .../results/moresectioning/top_node_up_implicit.pl |  46 +-
 .../moresectioning/two_footnotes_in_nodes.pl       |  46 +-
 .../two_footnotes_in_nodes_separated.pl            |  46 +-
 tp/t/results/multitable/empty_headitem.pl          |  16 +-
 tp/t/results/multitable/empty_item_tab.pl          |  32 +-
 .../multitable/empty_multitable_with_cells.pl      |   8 +-
 .../inter_item_commands_in_multitable.pl           |  58 +-
 .../multitable/multitable_begin_with_tab.pl        |  24 +-
 ...ultitable_bracketed_no_inter_space_prototype.pl |  12 +-
 ...titable_bracketed_prototype_empty_not_closed.pl |  12 +-
 ...bracketed_prototype_empty_not_closed_comment.pl |  10 +-
 ..._bracketed_prototype_empty_spaces_not_closed.pl |  12 +-
 ...ed_prototype_empty_spaces_not_closed_comment.pl |  12 +-
 .../multitable_bracketed_prototype_not_closed.pl   |  12 +-
 ...table_bracketed_prototype_not_closed_comment.pl |  10 +-
 ...bracketed_prototype_not_closed_space_comment.pl |  10 +-
 .../multitable_empty_bracketed_prototype.pl        |  12 +-
 tp/t/results/multitable/multitable_figure_space.pl |  12 +-
 tp/t/results/multitable/multitable_in_example.pl   |  18 +-
 tp/t/results/multitable/multitable_not_closed.pl   |   6 +-
 .../multitable/multitable_not_closed_item.pl       |   6 +-
 .../multitable/multitable_not_closed_item_tab.pl   |   6 +-
 .../multitable_one_column_too_much_cells.pl        |  12 +-
 .../multitable_two_columns_too_much_cells.pl       |  16 +-
 .../multitable/multitable_with_empty_item_tab.pl   |  16 +-
 .../results/multitable/not_letters_in_prototype.pl |  12 +-
 tp/t/results/multitable/paragraph_in_cells.pl      |  10 +-
 .../results/multitable/prototype_brace_no_brace.pl |  12 +-
 .../multitable/prototype_brace_no_brace_comment.pl |  10 +-
 tp/t/results/multitable/prototype_no_brace.pl      |  12 +-
 tp/t/results/multitable/ref_in_multitable.pl       |  16 +-
 tp/t/results/multitable/w_in_multitable.pl         |  12 +-
 tp/t/results/paragraph/close_paragraph_command.pl  |   6 +-
 tp/t/results/paragraph/commands_in_flushright.pl   | 117 ++--
 tp/t/results/paragraph/comment_in_quotation.pl     |  16 +-
 tp/t/results/paragraph/paragraph_command.pl        |   6 +-
 .../paragraph/paragraph_count_and_example.pl       |   8 +-
 tp/t/results/paragraph/paragraph_indent_asis.pl    |  14 +-
 .../plaintext_tests/U_with_utf8_enable_encoding.pl |   6 +-
 .../accents_in_var_enable_encoding.pl              |   6 +-
 tp/t/results/plaintext_tests/all_spaces.pl         |  18 +-
 .../at_commands_glued_in_example.pl                |  24 +-
 .../at_commands_glued_in_paragraph.pl              |  16 +-
 .../plaintext_tests/chinese_mixed_with_en.pl       |  28 +-
 .../plaintext_tests/del_quote_linebreaking.pl      |  12 +-
 tp/t/results/plaintext_tests/east_asian_in_w.pl    |   6 +-
 .../plaintext_tests/empty_line_in_example_end.pl   |   8 +-
 .../plaintext_tests/empty_multitable_in_itemize.pl |  18 +-
 tp/t/results/plaintext_tests/expanded_tex.pl       |   8 +-
 .../flushright_not_closed_and_format.pl            |  10 +-
 tp/t/results/plaintext_tests/html_expanded.pl      |   8 +-
 .../insert_copying_and_paragraph.pl                |   8 +-
 .../plaintext_tests/isolated_html_expanded.pl      |   8 +-
 .../itemize_in_headitem_in_example.pl              |  40 +-
 tp/t/results/plaintext_tests/japanese_utf8.pl      |  86 ++-
 .../plaintext_tests/line_passed_and_formats.pl     | 242 +++++---
 .../plaintext_tests/lone_braces_in_inlineraw.pl    |   2 +-
 .../plaintext_tests/long_uref_after_item.pl        |   8 +-
 .../plaintext_tests/multiline_image_and_align.pl   |  24 +-
 tp/t/results/plaintext_tests/multitable.pl         |  60 +-
 .../multitable_in_example_extraneous_tab.pl        |  20 +-
 .../plaintext_tests/nested_code_commands.pl        |  16 +-
 .../plaintext_tests/nested_indentedblock.pl        |  32 +-
 tp/t/results/plaintext_tests/nested_multitable.pl  |  24 +-
 .../plaintext_tests/no_empty_line_after_section.pl |  30 +-
 .../no_punctuation_commands_frenchspacing.pl       |   6 +-
 tp/t/results/plaintext_tests/non_break_spaces.pl   |  18 +-
 tp/t/results/plaintext_tests/paragraphindent.pl    |  18 +-
 .../plaintext_tests/protect_spaces_on_line.pl      |  12 +-
 .../plaintext_tests/punctuation_abbr_acronym.pl    |   8 +-
 .../punctuation_and_code_style_commands_utf8.pl    |   6 +-
 .../punctuation_and_footnotes_frenchspacing.pl     |   6 +-
 .../punctuation_and_upper_case_commands_utf8.pl    |   6 +-
 .../punctuation_commands_frenchspacing.pl          |   6 +-
 .../plaintext_tests/punctuation_frenchspacing.pl   |   6 +-
 .../punctuation_sc_accents_ascii_punct.pl          |  31 +-
 .../punctuation_sc_accents_ascii_punct_latin1.pl   |  37 +-
 .../punctuation_sc_accents_ascii_punct_usascii.pl  |  37 +-
 .../punctuation_sc_accents_default.pl              |  31 +-
 .../punctuation_sc_accents_default_latin1.pl       |  37 +-
 .../punctuation_sc_accents_default_usascii.pl      |  37 +-
 .../punctuation_sc_accents_disable_encoding.pl     |  31 +-
 ...nctuation_sc_accents_disable_encoding_latin1.pl |  37 +-
 ...ctuation_sc_accents_disable_encoding_usascii.pl |  37 +-
 ...uation_sc_accents_to_utf8_ascii_punct_latin1.pl |  37 +-
 ...ation_sc_accents_to_utf8_ascii_punct_usascii.pl |  37 +-
 .../punctuation_sc_accents_to_utf8_latin1.pl       |  37 +-
 .../punctuation_sc_accents_to_utf8_usascii.pl      |  37 +-
 tp/t/results/plaintext_tests/quote_node_names.pl   | 129 +++--
 .../sc_with_utf8_enable_encoding.pl                |   6 +-
 .../plaintext_tests/settitle_and_empty_top.pl      |   6 +-
 .../sp_with_text_before_in_example.pl              |  14 +-
 .../plaintext_tests/star_at_command_formatting.pl  |  22 +-
 .../plaintext_tests/tab_in_table_in_example.pl     |  24 +-
 .../results/plaintext_tests/tab_item_in_example.pl |   8 +-
 .../plaintext_tests/xref_quote_long_item.pl        |  20 +-
 tp/t/results/preformatted/caption_in_example.pl    |  23 +-
 .../comment_example_and_blank_lines.pl             |  32 +-
 tp/t/results/preformatted/comments_in_example.pl   |  24 +-
 tp/t/results/preformatted/def_in_example.pl        |  16 +-
 tp/t/results/preformatted/empty_line.pl            |   8 +-
 .../preformatted/empty_line_style_command.pl       |   8 +-
 .../preformatted/example_at_commands_arguments.pl  |  10 +-
 tp/t/results/preformatted/example_class.pl         |  10 +-
 .../preformatted/example_empty_arguments.pl        |  34 +-
 .../example_invalid_at_commands_arguments.pl       |  16 +-
 tp/t/results/preformatted/example_multi_class.pl   |  16 +-
 .../preformatted/insertcopying_in_example.pl       |   8 +-
 .../preformatted/nested_example_and_comment.pl     |  48 +-
 tp/t/results/preformatted/nested_formats.pl        |  32 +-
 tp/t/results/preformatted/page_in_example.pl       |   8 +-
 tp/t/results/preformatted/quote_dash_in_display.pl |   8 +-
 tp/t/results/preformatted/quote_dash_in_example.pl |   8 +-
 .../preformatted/text_on_display_command_line.pl   |  44 +-
 .../preformatted/text_on_example_command_line.pl   |  44 +-
 tp/t/results/preformatted/titlefont_in_example.pl  |   8 +-
 .../results/quotation/comment_on_quotation_line.pl |   8 +-
 tp/t/results/quotation/empty_quotation.pl          |  38 +-
 .../quotation/footnote_in_quotation_with_arg.pl    |  10 +-
 .../quotation/only_comment_on_quotation_line.pl    |   8 +-
 tp/t/results/quotation/quotation_and_author.pl     |  46 +-
 .../quotation/quotation_author_in_example.pl       |  22 +-
 .../quotation_beginning_and_end_on_line.pl         |   8 +-
 .../space_at_commands_end_quotation_line.pl        |  18 +-
 tp/t/results/quotation/standard_quotations.pl      |  60 +-
 tp/t/results/raw/beginning_and_end_on_line.pl      |  24 +-
 tp/t/results/raw/braces_in_tex.pl                  |  24 +-
 tp/t/results/raw/displaymath.pl                    |  16 +-
 tp/t/results/raw/displaymath_not_closed.pl         |   2 +-
 tp/t/results/raw/inline_in_example.pl              |  14 +-
 tp/t/results/raw/inline_missing_first_arg.pl       |   2 +-
 tp/t/results/raw/inlinefmt.pl                      |   4 +-
 tp/t/results/raw/inlinefmt_with_empty_line.pl      |   4 +-
 tp/t/results/raw/inlineraw.pl                      |   4 +-
 tp/t/results/raw/inlineraw_with_empty_line.pl      |   4 +-
 tp/t/results/raw/lone_braces_in_html.pl            |  16 +-
 tp/t/results/raw/misc_raw.pl                       |  26 +-
 tp/t/results/raw/misc_raw_comments.pl              |  26 +-
 tp/t/results/raw/nested_macros.pl                  |  18 +-
 tp/t/results/raw/raw_commands_and_end_of_lines.pl  | 144 +++--
 tp/t/results/raw/raw_expanded_in_style.pl          |   8 +-
 tp/t/results/raw/raw_in_example.pl                 |  40 +-
 tp/t/results/raw/raw_in_para.pl                    |  24 +-
 tp/t/results/raw/raw_in_style.pl                   |   8 +-
 tp/t/results/raw/raw_not_closed.pl                 |   2 +-
 tp/t/results/raw/space_before_end.pl               |  24 +-
 tp/t/results/raw/spurious_arg_on_line.pl           |  30 +-
 tp/t/results/raw/tex_not_closed.pl                 |   2 +-
 tp/t/results/raw/verbatim_and_verbatiminclude.pl   | 114 ++--
 tp/t/results/raw/verbatim_in_brace_command.pl      |   8 +-
 tp/t/results/raw/verbatim_not_closed.pl            |   2 +-
 tp/t/results/regions/anchor_in_copying.pl          |  23 +-
 .../regions/anchor_in_copying_in_footnote.pl       |  25 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |  37 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |  37 +-
 tp/t/results/regions/copying_not_closed.pl         |   2 +-
 tp/t/results/regions/double_copying.pl             |  16 +-
 .../results/regions/double_titlepage_not_closed.pl |   4 +-
 tp/t/results/regions/format_in_titlepage.pl        |  28 +-
 .../regions/format_in_titlepage_titlepage.pl       |  28 +-
 tp/t/results/regions/ref_in_copying.pl             |  48 +-
 .../regions/ref_in_copying_insert_in_chapter.pl    |  62 ++-
 tp/t/results/regions/today_in_copying.pl           |  31 +-
 tp/t/results/sectioning/a_comma_after_node.pl      |  14 +-
 tp/t/results/sectioning/anchor_in_footnote.pl      |  40 +-
 .../sectioning/anchor_in_footnote_separate.pl      |  46 +-
 tp/t/results/sectioning/anchor_zero.pl             |  12 +-
 tp/t/results/sectioning/at_commands_in_node.pl     |  10 +-
 .../sectioning/automatic_menu_referencing_node.pl  |  44 +-
 .../sectioning/chapter_before_and_after_part.pl    |  22 +-
 tp/t/results/sectioning/chapter_before_part.pl     |  14 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |  46 +-
 .../chapter_node_before_and_after_part.pl          |  48 +-
 tp/t/results/sectioning/chapter_sections.pl        |  56 +-
 .../sectioning/character_and_spaces_in_node.pl     |  44 +-
 .../sectioning/character_and_spaces_in_refs.pl     | 120 ++--
 .../sectioning/character_and_spaces_in_refs_out.pl | 127 +++--
 tp/t/results/sectioning/complex.pl                 | 274 ++++++---
 tp/t/results/sectioning/complex_split_at_node.pl   | 272 ++++++---
 tp/t/results/sectioning/contents.pl                |  67 ++-
 .../sectioning/contents_and_shortcontents.pl       |  67 ++-
 .../sectioning/contents_at_document_begin.pl       |  34 +-
 .../results/sectioning/contents_at_end_document.pl |  34 +-
 .../contents_at_end_document_after_node.pl         |  44 +-
 tp/t/results/sectioning/contents_in_document.pl    |  34 +-
 tp/t/results/sectioning/contents_in_html_text.pl   |  24 +-
 tp/t/results/sectioning/contents_no_section.pl     |  18 +-
 .../sectioning/contents_with_only_top_node.pl      |  12 +-
 .../results/sectioning/double_node_anchor_float.pl |  73 ++-
 tp/t/results/sectioning/double_part.pl             |  63 ++-
 tp/t/results/sectioning/double_top.pl              |  14 +-
 tp/t/results/sectioning/double_top_in_menu.pl      |  22 +-
 tp/t/results/sectioning/double_top_section.pl      |  12 +-
 tp/t/results/sectioning/email_in_node.pl           |  22 +-
 tp/t/results/sectioning/empty_anchor.pl            |   2 +-
 tp/t/results/sectioning/empty_node.pl              |  12 +-
 .../sectioning/empty_nodes_with_commands.pl        |  20 +-
 tp/t/results/sectioning/empty_ref_arg.pl           |  30 +-
 tp/t/results/sectioning/empty_top_node_up.pl       |  32 +-
 tp/t/results/sectioning/equivalent_labels.pl       |  30 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |  24 +-
 .../results/sectioning/explicit_node_directions.pl |  37 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |  55 +-
 tp/t/results/sectioning/hole_in_sectioning.pl      |  30 +-
 .../in_menu_only_special_ascii_spaces_node.pl      |  41 +-
 .../sectioning/in_menu_only_special_spaces_node.pl |  99 +++-
 tp/t/results/sectioning/internal_top_node_up.pl    |  35 +-
 tp/t/results/sectioning/lone_Top_node.pl           |  40 +-
 tp/t/results/sectioning/loop_nodes.pl              |  70 ++-
 tp/t/results/sectioning/lowered_subsubsection.pl   | 149 +++--
 tp/t/results/sectioning/loweredheading.pl          |  13 +-
 tp/t/results/sectioning/menutextorder.pl           | 131 +++--
 .../results/sectioning/more_sections_than_nodes.pl | 148 +++--
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  88 ++-
 tp/t/results/sectioning/next_no_prev_to_node.pl    |  34 +-
 .../results/sectioning/no_argument_and_contents.pl |  12 +-
 tp/t/results/sectioning/no_element.pl              |  38 +-
 tp/t/results/sectioning/no_menu.pl                 |  56 +-
 tp/t/results/sectioning/node.pl                    |  10 +-
 tp/t/results/sectioning/node_empty_direction.pl    |  12 +-
 tp/t/results/sectioning/node_line_arguments.pl     |  64 ++-
 tp/t/results/sectioning/node_nested_parentheses.pl |  16 +-
 .../sectioning/node_part_chapter_after_chapter.pl  |  72 ++-
 .../sectioning/node_part_chapter_after_top.pl      |  54 +-
 tp/t/results/sectioning/node_referenced_in_ref.pl  |  30 +-
 .../node_sectop_before_chapter_no_node.pl          |  34 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |  44 +-
 tp/t/results/sectioning/node_too_much_args.pl      |  12 +-
 .../node_up_direction_for_top_with_manual.pl       |   8 +-
 tp/t/results/sectioning/node_up_external_node.pl   |  30 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |  71 ++-
 .../nodes_after_top_before_chapter_nodes.pl        |  47 +-
 .../nodes_after_top_before_chapter_not_split.pl    |  42 +-
 ...ore_chapter_not_split_no_use_node_directions.pl |  42 +-
 .../nodes_after_top_before_chapter_sections.pl     |  44 +-
 .../nodes_after_top_before_section_nodes.pl        |  47 +-
 .../nodes_after_top_before_section_sections.pl     |  44 +-
 tp/t/results/sectioning/nodes_before_after_top.pl  |  49 +-
 .../sectioning/nodes_before_after_top_xref.pl      |  61 +-
 tp/t/results/sectioning/nodes_before_top.pl        |  72 ++-
 .../nodes_no_node_top_explicit_directions.pl       |  26 +-
 .../non_automatic_internal_top_node_up.pl          |  49 +-
 .../non_automatic_top_node_up_and_url.pl           |  49 +-
 .../sectioning/non_automatic_top_node_up_url.pl    |  43 +-
 tp/t/results/sectioning/novalidate.pl              |  16 +-
 .../one_node_explicit_directions_anchor.pl         |   8 +-
 tp/t/results/sectioning/one_subsection.pl          |   6 +-
 tp/t/results/sectioning/one_subsection_and_node.pl |  22 +-
 .../results/sectioning/only_special_spaces_node.pl |  87 ++-
 tp/t/results/sectioning/part_before_chapter.pl     |  15 +-
 tp/t/results/sectioning/part_before_section.pl     |  15 +-
 tp/t/results/sectioning/part_before_top.pl         |  15 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |  54 +-
 tp/t/results/sectioning/part_chapter_appendix.pl   |  19 +-
 tp/t/results/sectioning/part_node_after_top.pl     |  43 +-
 tp/t/results/sectioning/part_node_before_top.pl    |  46 +-
 .../sectioning/part_node_chapter_after_top.pl      |  68 ++-
 .../sectioning/part_node_chapter_appendix.pl       |  63 ++-
 .../sectioning/part_node_chapter_node_appendix.pl  |  72 ++-
 .../sectioning/part_node_node_part_appendix.pl     |  82 ++-
 tp/t/results/sectioning/part_node_part_appendix.pl |  73 ++-
 .../sectioning/part_node_part_node_appendix.pl     |  82 ++-
 .../sectioning/placed_things_before_element.pl     |  33 +-
 .../sectioning/placed_things_before_node.pl        |  49 +-
 .../sectioning/protected_node_parentheses.pl       |  32 +-
 tp/t/results/sectioning/raiselowersections.pl      | 126 +++--
 tp/t/results/sectioning/rec_nodes.pl               |  78 ++-
 tp/t/results/sectioning/ref_to_top.pl              |  22 +-
 .../reference_to_only_special_spaces_node.pl       |  56 +-
 .../sectioning/section_before_after_top_node.pl    |  34 +-
 .../section_before_after_top_node_last_node.pl     |  35 +-
 tp/t/results/sectioning/section_before_chapter.pl  |  12 +-
 tp/t/results/sectioning/section_before_part.pl     |  12 +-
 tp/t/results/sectioning/section_before_top.pl      |  40 +-
 .../sectioning/section_before_top_no_node.pl       |  12 +-
 .../results/sectioning/section_below_unnumbered.pl |  64 ++-
 .../sectioning/section_below_unnumbered_no_top.pl  |  12 +-
 .../sectioning/section_chapter_before_top.pl       |  18 +-
 .../sectioning/section_chapter_before_top_nodes.pl |  64 ++-
 .../sectioning/section_in_unnumbered_info.pl       | 616 +++++++++++++++------
 .../sectioning/section_in_unnumbered_plaintext.pl  | 616 +++++++++++++++------
 .../results/sectioning/section_node_before_part.pl |  28 +-
 .../results/sectioning/sectioning_part_appendix.pl |  78 ++-
 .../sectioning/sectioning_part_appendix_no_top.pl  |  71 ++-
 tp/t/results/sectioning/sections.pl                |   6 +-
 tp/t/results/sectioning/sections_test.pl           |  67 ++-
 .../sectioning/sections_test_no_use_nodes.pl       |  67 ++-
 ...ctions_test_no_use_nodes_use_node_directions.pl |  67 ++-
 tp/t/results/sectioning/semi_auto.pl               |  82 ++-
 .../setfilename_on_top_and_after_node.pl           |  32 +-
 tp/t/results/sectioning/shortcontents.pl           |  67 ++-
 tp/t/results/sectioning/space_in_node.pl           |  40 +-
 tp/t/results/sectioning/special_spaces_in_nodes.pl |  95 +++-
 tp/t/results/sectioning/top_chapter_sections.pl    |  63 ++-
 .../sectioning/top_no_argument_and_content.pl      |   2 +-
 .../results/sectioning/top_no_argument_and_node.pl |  17 +-
 .../sectioning/top_no_argument_and_top_node.pl     |  17 +-
 .../sectioning/top_node_no_menu_direction.pl       |  24 +-
 tp/t/results/sectioning/top_node_part_top.pl       |  28 +-
 tp/t/results/sectioning/top_node_up_url.pl         |  35 +-
 tp/t/results/sectioning/top_part_chapter.pl        |  22 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |  23 +-
 .../sectioning/top_without_node_sections.pl        |  27 +-
 tp/t/results/sectioning/topic_guide.pl             | 156 ++++--
 .../transliterated_split_equivalent_nodes.pl       |  44 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  64 ++-
 .../sectioning/two_nodes_between_chapters.pl       |  74 ++-
 .../sectioning/two_unnumbered_no_argument.pl       |   4 +-
 tp/t/results/sectioning/unknown_node_in_menu.pl    |  20 +-
 .../sectioning/unnumbered_before_node_top_top.pl   |  27 +-
 tp/t/results/sectioning/unnumbered_before_top.pl   |  12 +-
 .../sectioning/unnumbered_before_top_node.pl       |  17 +-
 tp/t/results/sectioning/unnumbered_no_argument.pl  |   2 +-
 .../unnumbered_top_without_node_nodes.pl           |  40 +-
 .../unnumbered_top_without_node_sections.pl        |  43 +-
 tp/t/results/transformations/master_menu_fr.pl     |  78 ++-
 tp/t/results/value/set_flag_command_equivalent.pl  |  12 +-
 tp/t/results/value/set_in_item_missing_line.pl     |  34 +-
 tp/t/results/value/set_on_item_line.pl             |  40 +-
 tp/t/results/value/value_in_index_commands.pl      |  72 ++-
 .../value/value_in_invalid_documentencoding.pl     |   6 +-
 tp/t/results/value/value_in_misc_commands.pl       | 186 ++++---
 tp/t/results/value/value_in_node.pl                |  66 ++-
 tp/t/results/value/value_node_directions.pl        |  58 +-
 .../value_and_macro/comma_value_in_macro_arg.pl    |   6 +-
 tp/t/results/value_and_macro/macro_in_value.pl     |   6 +-
 .../results/value_and_macro/value_in_macro_body.pl |   6 +-
 .../value_and_macro/value_in_macro_formal_arg.pl   |   6 +-
 .../brace_commands_spaces_end_of_lines.pl          |  12 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      | 174 +++---
 tp/t/results/xml_tests/comments_end_lines.pl       | 121 ++--
 .../xml_tests/comments_on_block_command_lines.pl   | 239 +++++---
 .../xml_tests/comments_on_misc_command_line.pl     |  36 +-
 tp/t/results/xml_tests/image_inline_or_not.pl      |  92 ++-
 tp/t/results/xml_tests/macro_and_args.pl           |  12 +-
 tp/t/results/xml_tests/node_and_bye.pl             |   8 +-
 tp/t/results/xml_tests/node_no_section.pl          |  12 +-
 tp/t/results/xml_tests/raw.pl                      |  16 +-
 tp/t/results/xml_tests/raw_and_comments.pl         |  20 +-
 tp/t/results/xml_tests/spaces_info_lost.pl         |  18 +-
 tp/t/results/xtable/accent_on_table_line.pl        |  40 +-
 tp/t/results/xtable/block_commands_in_table.pl     | 156 ++++--
 .../xtable/comment_and_itemx_before_item.pl        |  16 +-
 .../results/xtable/definfoenclose_on_table_line.pl |  26 +-
 tp/t/results/xtable/empty_item_itemx.pl            |  34 +-
 tp/t/results/xtable/headitem_in_table.pl           |  16 +-
 .../results/xtable/inter_item_commands_in_table.pl | 303 ++++++----
 .../inter_item_commands_in_table_in_example.pl     |  42 +-
 .../xtable/invalid_command_and_brace_in_table.pl   |  12 +-
 tp/t/results/xtable/itemx_before_item.pl           |  16 +-
 tp/t/results/xtable/long_item.pl                   |  20 +-
 .../xtable/no_arg_brace_command_on_table_line.pl   |  16 +-
 tp/t/results/xtable/no_argument_for_table.pl       |  12 +-
 tp/t/results/xtable/table_nested.pl                | 206 ++++---
 tp/t/results/xtable/text_between_item_itemx.pl     |  20 +-
 tp/t/results/xtable/title_and_itemx_before_item.pl |  16 +-
 1149 files changed, 34258 insertions(+), 16558 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af8ffb4be1..61d04c0e4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2022-11-16  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/Texinfo.pm,
+       tp/Texinfo/Convert/TexinfoMarkup.pm,
+       tp/Texinfo/Convert/TextContent.pm, tp/Texinfo/ParserNonXS.pm,
+       tp/Texinfo/Structuring.pm, tp/Texinfo/XS/misc.c (xs_abort_empty_line),
+       tp/Texinfo/XS/parsetexi/convert.c (expand_cmd_args_to_texi)
+       (convert_to_texinfo_internal),
+       tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command),
+       tp/Texinfo/XS/parsetexi/parser.c (abort_empty_line)
+       (isolate_last_space_internal): move spaces_before_argument and
+       spaces_after_argument from extra to info key element hash.
+
+       * tp/Texinfo/XS/parsetexi/extra.c (lookup_associated_info)
+       (lookup_extra, lookup_info): add lookup_associated_info to lookup in
+       an associated information structure.  Add wrappers for the info and
+       extra structures.
+
+       * tp/Texinfo/Convert/DocBook.pm (_convert): check 'args' and not
+       'extra' to determine if there is a @quotation argument.
+
+       * tp/Texinfo/ParserNonXS.pm (_end_line): remove extra element key if
+       empty after removing incorrect command_as_argument.  Avoid
+       autovivification.
+
 2022-11-15  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm,
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 340e5b1a0f..607b61d5ca 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -2408,7 +2408,7 @@ sub debug_hash
 use Data::Dumper;
 
 my @kept_keys = ('contents', 'cmdname', 'type', 'text', 'args',
-  'extra', 'def_role', 'spaces_before_argument',
+  'extra', 'info', 'def_role', 'spaces_before_argument',
   'spaces_after_argument', 'comment_at_end', 'index_entry'
 );
 my %kept_keys;
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 194195894d..2103a45765 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1311,9 +1311,9 @@ sub format_comment_or_return_end_line($$)
 
   if ($comment) {
     $end_line = $self->convert_tree($comment);
-  } elsif ($element->{'args'} and $element->{'args'}->[-1]->{'extra'}
-      and $element->{'args'}->[-1]->{'extra'}->{'spaces_after_argument'}) {
-    my $text = $element->{'args'}->[-1]->{'extra'}->{'spaces_after_argument'};
+  } elsif ($element->{'args'} and $element->{'args'}->[-1]->{'info'}
+      and $element->{'args'}->[-1]->{'info'}->{'spaces_after_argument'}) {
+    my $text = $element->{'args'}->[-1]->{'info'}->{'spaces_after_argument'};
     if (chomp($text)) {
       $end_line = "\n";
     } else {
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 976fcd4fb2..18a611cef4 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -733,9 +733,10 @@ sub _convert($$;$)
                or $element->{'parent'}->{'cmdname'} eq 'enumerate')) {
         $result .= "<listitem>";
         if ($element->{'parent'}->{'cmdname'} eq 'itemize'
-            and $element->{'parent'}->{'extra'}
-            and !($element->{'parent'}->{'extra'}->{'command_as_argument'}
-                  and 
$element->{'parent'}->{'extra'}->{'command_as_argument'}->{'cmdname'} eq 
'bullet')
+            and !($element->{'parent'}->{'extra'}
+                  and $element->{'parent'}->{'extra'}->{'command_as_argument'}
+                  and $element->{'parent'}->{'extra'}->{'command_as_argument'}
+                                                      ->{'cmdname'} eq 
'bullet')
             and $element->{'parent'}->{'args'}
             and $element->{'parent'}->{'args'}->[0]) {
           $self->{'pending_prepend'}
@@ -1523,21 +1524,21 @@ sub _convert($$;$)
               }
             }
           }
-          if ($element->{'args'} and $element->{'args'}->[0]
-              and $element->{'args'}->[0]->{'contents'}
-              and @{$element->{'args'}->[0]->{'contents'}}) {
-            my $quotation_arg_text
-              = Texinfo::Convert::Text::convert_to_text(
-                 $element->{'args'}->[0],
-                 
{Texinfo::Convert::Text::copy_options_for_convert_text($self)});
-            if ($docbook_special_quotations{lc($quotation_arg_text)}) {
-              $format_element = lc($quotation_arg_text);
-            } else {
-              $self->{'pending_prepend'}
-                = $self->_convert($self->gdt('@b{{quotation_arg}:} ',
-                              {'quotation_arg' =>
-                    $element->{'args'}->[0]->{'contents'}}));
-            }
+        }
+        if ($element->{'args'} and $element->{'args'}->[0]
+            and $element->{'args'}->[0]->{'contents'}
+            and @{$element->{'args'}->[0]->{'contents'}}) {
+          my $quotation_arg_text
+            = Texinfo::Convert::Text::convert_to_text(
+               $element->{'args'}->[0],
+               {Texinfo::Convert::Text::copy_options_for_convert_text($self)});
+          if ($docbook_special_quotations{lc($quotation_arg_text)}) {
+            $format_element = lc($quotation_arg_text);
+          } else {
+            $self->{'pending_prepend'}
+              = $self->_convert($self->gdt('@b{{quotation_arg}:} ',
+                            {'quotation_arg' =>
+                  $element->{'args'}->[0]->{'contents'}}));
           }
         }
         $format_element = 'blockquote' if (!defined($format_element));
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index cb45517663..0acfb339a4 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -128,9 +128,9 @@ sub convert_to_texinfo($;$)
         and ($element->{'type'} eq 'bracketed'
              or $element->{'type'} eq 'bracketed_def_content')) {
       $result .= '{';
-      if ($element->{'extra'}
-          and $element->{'extra'}->{'spaces_before_argument'}) {
-         $result .= $element->{'extra'}->{'spaces_before_argument'};
+      if ($element->{'info'}
+          and $element->{'info'}->{'spaces_before_argument'}) {
+         $result .= $element->{'info'}->{'spaces_before_argument'};
       }
     }
     if (defined($element->{'contents'})) {
@@ -138,8 +138,8 @@ sub convert_to_texinfo($;$)
         $result .= convert_to_texinfo($child, $expand_replaced);
       }
     }
-    if ($element->{'extra'} and 
$element->{'extra'}->{'spaces_after_argument'}) {
-      $result .= $element->{'extra'}->{'spaces_after_argument'};
+    if ($element->{'info'} and $element->{'info'}->{'spaces_after_argument'}) {
+      $result .= $element->{'info'}->{'spaces_after_argument'};
     }
     if ($element->{'extra'} and $element->{'extra'}->{'comment_at_end'}) {
       $result .= convert_to_texinfo($element->{'extra'}->{'comment_at_end'},
@@ -172,25 +172,25 @@ sub _expand_cmd_args_to_texi($;$) {
          and ($def_commands{$cmdname}
               or $block_commands{$cmdname} eq 'multitable')
          and $cmd->{'args'}) {
-     $result .= $cmd->{'extra'}->{'spaces_before_argument'}
-       if $cmd->{'extra'} and $cmd->{'extra'}->{'spaces_before_argument'};
+     $result .= $cmd->{'info'}->{'spaces_before_argument'}
+       if $cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'};
      foreach my $arg (@{$cmd->{'args'}}) {
         $result .= convert_to_texinfo($arg, $expand_replaced);
     }
   # arg_line set for line_commands with type special
   } elsif (($cmd->{'extra'} or $cmdname eq 'macro' or $cmdname eq 'rmacro')
            and defined($cmd->{'extra'}->{'arg_line'})) {
-    $result .= $cmd->{'extra'}->{'spaces_before_argument'}
-      if $cmd->{'extra'} and $cmd->{'extra'}->{'spaces_before_argument'};
+    $result .= $cmd->{'info'}->{'spaces_before_argument'}
+      if $cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'};
     $result .= $cmd->{'extra'}->{'arg_line'};
   } elsif (($block_commands{$cmdname} or $cmdname eq 'node')
             and defined($cmd->{'args'})) {
-    $result .= $cmd->{'extra'}->{'spaces_before_argument'}
-      if $cmd->{'extra'} and $cmd->{'extra'}->{'spaces_before_argument'};
+    $result .= $cmd->{'info'}->{'spaces_before_argument'}
+      if $cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'};
     foreach my $arg (@{$cmd->{'args'}}) {
       next if $arg->{'type'} and $ignored_types{$arg->{'type'}};
-      if ($arg->{'extra'} and $arg->{'extra'}->{'spaces_before_argument'}) {
-        $result .= $arg->{'extra'}->{'spaces_before_argument'};
+      if ($arg->{'info'} and $arg->{'info'}->{'spaces_before_argument'}) {
+        $result .= $arg->{'info'}->{'spaces_before_argument'};
       }
       $result .= convert_to_texinfo($arg);
       $result .= ',';
@@ -205,9 +205,9 @@ sub _expand_cmd_args_to_texi($;$) {
     if ($cmdname eq 'verb') {
       $result .= $cmd->{'extra'}->{'delimiter'};
     }
-    if ($cmd->{'extra'}
-        and $cmd->{'extra'}->{'spaces_before_argument'}) {
-      $result .= $cmd->{'extra'}->{'spaces_before_argument'};
+    if ($cmd->{'info'}
+        and $cmd->{'info'}->{'spaces_before_argument'}) {
+      $result .= $cmd->{'info'}->{'spaces_before_argument'};
     }
     my $arg_nr = 0;
     foreach my $arg (@{$cmd->{'args'}}) {
@@ -216,8 +216,8 @@ sub _expand_cmd_args_to_texi($;$) {
         $result .= ',' if ($arg_nr);
         $arg_nr++;
       }
-      if ($arg->{'extra'} and $arg->{'extra'}->{'spaces_before_argument'}) {
-        $result .= $arg->{'extra'}->{'spaces_before_argument'};
+      if ($arg->{'info'} and $arg->{'info'}->{'spaces_before_argument'}) {
+        $result .= $arg->{'info'}->{'spaces_before_argument'};
       }
       $result .= convert_to_texinfo($arg);
     }
@@ -226,8 +226,8 @@ sub _expand_cmd_args_to_texi($;$) {
     }
     $result .= '}' if ($braces);
   } else {
-    $result .= $cmd->{'extra'}->{'spaces_before_argument'}
-      if $cmd->{'extra'} and $cmd->{'extra'}->{'spaces_before_argument'};
+    $result .= $cmd->{'info'}->{'spaces_before_argument'}
+      if $cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'};
   }
   $result .= '{'.$cmd->{'info'}->{'flag'}.'}' if ($cmdname eq 'value');
   return $result;
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index c75d51208a..58f8af8794 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -456,10 +456,10 @@ sub _protect_in_spaces_attribute_text($)
 sub _leading_spaces_arg($)
 {
   my $element = shift;
-  if ($element->{'extra'} and $element->{'extra'}->{'spaces_before_argument'}
-      and $element->{'extra'}->{'spaces_before_argument'} ne '') {
+  if ($element->{'info'} and $element->{'info'}->{'spaces_before_argument'}
+      and $element->{'info'}->{'spaces_before_argument'} ne '') {
     return ['spaces', _protect_in_spaces_attribute_text(
-                            $element->{'extra'}->{'spaces_before_argument'})];
+                            $element->{'info'}->{'spaces_before_argument'})];
   } else {
     return ();
   }
@@ -474,10 +474,10 @@ sub _end_line_spaces
 
   my $end_spaces = '';
   if ($element->{'args'}->[-1]
-      and $element->{'args'}->[-1]->{'extra'}
-      and $element->{'args'}->[-1]->{'extra'}->{'spaces_after_argument'}) {
+      and $element->{'args'}->[-1]->{'info'}
+      and $element->{'args'}->[-1]->{'info'}->{'spaces_after_argument'}) {
     # spaces and form feeds only, protection is needed for form feeds
-    my $spaces = 
$element->{'args'}->[-1]->{'extra'}->{'spaces_after_argument'};
+    my $spaces = $element->{'args'}->[-1]->{'info'}->{'spaces_after_argument'};
     chomp $spaces;
     $end_spaces = $self->txi_markup_protect_text($spaces);
   }
@@ -504,9 +504,9 @@ sub _trailing_spaces_arg($)
 {
   my $element = shift;
   
-  if ($element->{'extra'} and
-      $element->{'extra'}->{'spaces_after_argument'}) {
-    my $spaces = $element->{'extra'}->{'spaces_after_argument'};
+  if ($element->{'info'} and
+      $element->{'info'}->{'spaces_after_argument'}) {
+    my $spaces = $element->{'info'}->{'spaces_after_argument'};
     chomp($spaces);
     if ($spaces ne '') {
       return ['trailingspaces', _protect_in_spaces_attribute_text($spaces)];
@@ -1062,10 +1062,11 @@ sub _convert($$;$)
           pop @{$self->{'document_context'}->[-1]->{'monospace'}}
             if (defined($in_monospace_not_normal));
 
-          if ($element->{'args'}->[$arg_index]->{'extra'}
-              and 
$element->{'args'}->[$arg_index]->{'extra'}->{'spaces_after_argument'}) {
+          if ($element->{'args'}->[$arg_index]->{'info'}
+              and $element->{'args'}->[$arg_index]
+                                      ->{'info'}->{'spaces_after_argument'}) {
             $arg .= $element->{'args'}->[$arg_index]
-                   ->{'extra'}->{'spaces_after_argument'};
+                   ->{'info'}->{'spaces_after_argument'};
           }
 
           if (!defined($main_cmdname) or $arg ne '' or scalar(@$attribute) > 
0) {
@@ -1435,10 +1436,10 @@ sub _convert($$;$)
     if ($element->{'type'} eq 'def_line') {
       if ($element->{'cmdname'}) {
         my $leading_spaces_attribute_spec = [];
-        if ($element->{'extra'}
-            and $element->{'extra'}->{'spaces_before_argument'}
-            and $element->{'extra'}->{'spaces_before_argument'} ne '') {
-          my $leading_spaces = $element->{'extra'}->{'spaces_before_argument'};
+        if ($element->{'info'}
+            and $element->{'info'}->{'spaces_before_argument'}
+            and $element->{'info'}->{'spaces_before_argument'} ne '') {
+          my $leading_spaces = $element->{'info'}->{'spaces_before_argument'};
           # may happen without any argument, remove as a \n is added below
           $leading_spaces =~ s/\n//;
           $leading_spaces_attribute_spec = [['spaces',
diff --git a/tp/Texinfo/Convert/TextContent.pm 
b/tp/Texinfo/Convert/TextContent.pm
index ee93ac2504..1052b15f7e 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -158,9 +158,9 @@ sub _convert($$)
       $result .= _convert($self, $arg);
       if ($arg->{'type'}
           and $arg->{'type'} eq 'block_line_arg'
-          and $arg->{'extra'} and $arg->{'extra'}->{'spaces_after_argument'}
+          and $arg->{'info'} and $arg->{'info'}->{'spaces_after_argument'}
           and $result =~ /\S/) {
-        $result .= $arg->{'extra'}->{'spaces_after_argument'};
+        $result .= $arg->{'info'}->{'spaces_after_argument'};
       }
     }
   }
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 8a354ecca0..b17d0fa4c0 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2397,12 +2397,12 @@ sub _abort_empty_line {
     } elsif ($spaces_element->{'type'} eq 'internal_spaces_after_command'
              or $spaces_element->{'type'} eq 
'internal_spaces_before_argument') {
       # Remove element from main tree. It will still be referenced in
-      # the 'extra' hash as 'spaces_before_argument'.
+      # the 'info' hash as 'spaces_before_argument'.
       _pop_element_from_contents($current);
       my $owning_element
         = $spaces_element->{'extra'}->{'spaces_associated_command'};
-      #$owning_element->{'extra'} = {} if (! $owning_element->{'extra'});
-      $owning_element->{'extra'}->{'spaces_before_argument'}
+      #$owning_element->{'info'} = {} if (! $owning_element->{'info'});
+      $owning_element->{'info'}->{'spaces_before_argument'}
         = $spaces_element->{'text'};
     }
 
@@ -2458,14 +2458,14 @@ sub _isolate_last_space
     _isolate_trailing_space($current, 'space_at_end_menu_node');
   } else {
     # Store final spaces in 'spaces_after_argument'.
-    #$current->{'extra'} = {} if (!$current->{'extra'});
+    #$current->{'info'} = {} if (!$current->{'info'});
     if ($current->{'contents'}->[-1]->{'text'} !~ /\S/) {
-      $current->{'extra'}->{'spaces_after_argument'}
+      $current->{'info'}->{'spaces_after_argument'}
                  = $current->{'contents'}->[-1]->{'text'};
       _pop_element_from_contents($current);
     } else {
       $current->{'contents'}->[-1]->{'text'} =~ s/(\s+)$//;
-      $current->{'extra'}->{'spaces_after_argument'} = $1;
+      $current->{'info'}->{'spaces_after_argument'} = $1;
     }
   }
 }
@@ -3200,6 +3200,9 @@ sub _end_line($$$)
               $current->{'extra'}->{'command_as_argument'}->{'cmdname'},
               $current->{'cmdname'});
           delete $current->{'extra'}->{'command_as_argument'};
+          if (scalar(keys(%{$current->{'extra'}})) == 0) {
+            delete $current->{'extra'};
+          }
         }
       } elsif ($current->{'cmdname'} eq 'itemize'
                and $current->{'extra'}
@@ -3219,6 +3222,9 @@ sub _end_line($$$)
                 or (defined($arg->{'text'}) and $arg->{'text'} !~ /\S/))) {
             delete $current->{'extra'}->{'command_as_argument'}->{'type'};
             delete $current->{'extra'}->{'command_as_argument'};
+            if (scalar(keys(%{$current->{'extra'}})) == 0) {
+              delete $current->{'extra'};
+            }
             last;
           }
         }
@@ -3236,6 +3242,9 @@ sub _end_line($$$)
               $current->{'extra'}->{'command_as_argument'}->{'cmdname'},
               $current->{'cmdname'});
         delete $current->{'extra'}->{'command_as_argument'};
+        if (scalar(keys(%{$current->{'extra'}})) == 0) {
+          delete $current->{'extra'};
+        }
       }
       if ($current->{'cmdname'} eq 'itemize') {
         if ((!$current->{'args'}
@@ -3594,7 +3603,8 @@ sub _end_line($$$)
         $self->_pop_context(['ct_line'], $source_info, $current, 'for 
multitable');
         $current = $current->{'parent'};
         $current->{'extra'}->{'max_columns'} = 0;
-        if (defined($misc_cmd->{'extra'}->{'misc_args'})) {
+        if ($misc_cmd->{'extra'}
+            and defined($misc_cmd->{'extra'}->{'misc_args'})) {
           $current->{'extra'}->{'max_columns'}
               = scalar(@{$misc_cmd->{'extra'}->{'misc_args'}});
           $current->{'extra'}->{'columnfractions'} = $misc_cmd;
@@ -4816,11 +4826,11 @@ sub _process_remaining_on_line($$$$)
           $misc = {'cmdname' => $command,
                    'parent' => $current,
                    'source_info' => $source_info,
-                   'extra' => {'misc_args' => [$arg],
-                               'spaces_before_argument' => ' '}};
+                   'extra' => {'misc_args' => [$arg],},
+                   'info' => {'spaces_before_argument' => ' '}};
           my $misc_line_args = {'type' => 'line_arg',
                  'parent' => $misc,
-                 'extra' => {'spaces_after_argument' => "\n"}};
+                 'info' => {'spaces_after_argument' => "\n"}};
           $misc->{'args'} = [$misc_line_args];
           $misc_line_args->{'contents'} = [
             { 'text' => $arg,
@@ -5297,7 +5307,7 @@ sub _process_remaining_on_line($$$$)
           $line =~ s/([^\S\f\n]*)//;
           $current->{'type'} = 'brace_command_context';
           # internal_spaces_before_argument is a transient internal type,
-          # which should end up in extra spaces_before_argument.
+          # which should end up in info spaces_before_argument.
           push @{$current->{'contents'}}, {
             'type' => 'internal_spaces_before_argument',
             'text' => $1,
@@ -5311,7 +5321,7 @@ sub _process_remaining_on_line($$$$)
               and ($brace_commands{$command} eq 'arguments'
                    or $brace_commands{$command} eq 'inline')) {
             # internal_spaces_before_argument is a transient internal type,
-            # which should end up in extra spaces_before_argument.
+            # which should end up in info spaces_before_argument.
             push @{$current->{'contents'}}, {
                         'type' => 'internal_spaces_before_argument',
                         'text' => '',
@@ -5340,7 +5350,7 @@ sub _process_remaining_on_line($$$$)
           if ($current->{'parent'}->{'parent'}->{'type'}
               and $current->{'parent'}->{'parent'}->{'type'} eq 'def_line');
         # internal_spaces_before_argument is a transient internal type,
-        # which should end up in extra spaces_before_argument.
+        # which should end up in info spaces_before_argument.
         push @{$current->{'contents'}},
             {'type' => 'internal_spaces_before_argument',
              'text' => '',
@@ -5728,7 +5738,7 @@ sub _process_remaining_on_line($$$$)
            { 'type' => $type, 'parent' => $current, 'contents' => [] };
       $current = $current->{'args'}->[-1];
       # internal_spaces_before_argument is a transient internal type,
-      # which should end up in extra spaces_before_argument.
+      # which should end up in info spaces_before_argument.
       push @{$current->{'contents'}},
              {'type' => 'internal_spaces_before_argument',
               'text' => '',
@@ -7348,6 +7358,25 @@ C<@value> tree element argument string is in I<flag>.  
Only for a C<@value>
 command that is not expanded because there is no corresponding value set, as
 only those are present in the tree.
 
+=item spaces_after_argument
+
+A reference to spaces after @-command arguments before a comma, a closing
+brace or at end of line, for some @-commands and bracketed content type
+with opening brace, and line commands and block command lines taking Texinfo
+as argument and comma delimited arguments.  Depending on the @-command,
+the I<spaces_after_argument> is associated with the @-command element, or
+with each argument element.
+
+=item spaces_before_argument
+
+A reference to spaces following the opening brace of some @-commands with 
braces
+and bracketed content type, spaces following @-commands for line commands and
+block command taking Texinfo as argument, and spaces following comma delimited
+arguments.  For context brace commands, line commands and block commands,
+I<spaces_before_argument> is associated with the @-command element, for other
+brace commands and for spaces after comma, it is associated with each argument
+element.
+
 =back
 
 =head2 Information available in the C<extra> key
@@ -7391,25 +7420,6 @@ For accent commands with spaces following the @-command, 
like:
 there is a I<spaces> key which holds the spaces appearing after
 the command.
 
-=item spaces_after_argument
-
-A reference to spaces after @-command arguments before a comma, a closing
-brace or at end of line, for some @-commands and bracketed content type
-with opening brace, and line commands and block command lines taking Texinfo
-as argument and comma delimited arguments.  Depending on the @-command,
-the I<spaces_after_argument> is associated with the @-command element, or
-with each argument element.
-
-=item spaces_before_argument
-
-A reference to spaces following the opening brace of some @-commands with 
braces
-and bracketed content type, spaces following @-commands for line commands and
-block command taking Texinfo as argument, and spaces following comma delimited
-arguments.  For context brace commands, line commands and block commands,
-I<spaces_before_argument> is associated with the @-command element, for other
-brace commands and for spaces after comma, it is associated with each argument
-element.
-
 =item text_arg
 
 The string correspond to the line after the @-command for @-commands
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 3ad0691e63..e25d0833a2 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1669,7 +1669,7 @@ sub new_block_command($$$)
 
   my $new_block = {'cmdname' => $command_name, 'parent' => $parent};
   $new_block->{'args'} = [{'type' => 'block_line_arg', 'parent' => $new_block,
-                           'extra' => { 'spaces_after_argument' => "\n",}}];
+                           'info' => { 'spaces_after_argument' => "\n",}}];
 
   foreach my $content (@$block_contents) {
     confess("new_block_command: undef \$block_contents content")
@@ -1678,10 +1678,10 @@ sub new_block_command($$$)
   }
 
   my $end = {'cmdname' => 'end', 'parent' => $new_block,
-             'extra' => {'spaces_before_argument' => ' ',
-                         'text_arg' => $command_name}};
+             'info' => {'spaces_before_argument' => ' ',},
+             'extra' => {'text_arg' => $command_name}};
   $end->{'args'} = [{'type' => 'line_arg', 'parent' => $end,
-                     'extra' => {'spaces_after_argument' => "\n"}}];
+                     'info' => {'spaces_after_argument' => "\n"}}];
   push @{$end->{'args'}->[0]->{'contents'}},
          {'text' => $command_name, 'parent' => $end->{'args'}->[0]};
 
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index 482f340ecb..145d79d37c 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -132,7 +132,7 @@ sub fill_gaps_in_sectioning($)
               'text' => "\n",
               'parent' => $new_section->{'args'}->[0]
              }];
-          $new_section->{'args'}->[0]->{'extra'}
+          $new_section->{'args'}->[0]->{'info'}
             = {'spaces_before_argument' => ' '};
           $new_section->{'args'}->[0]->{'contents'}->[0]->{'args'}
              = [{'type' => 'brace_command_arg',
@@ -256,10 +256,10 @@ sub _new_node($$$$)
     $node = {'cmdname' => 'node',
              'args' => [
                {'type' => 'line_arg',
-                'extra' =>
+                'info' =>
                     {'spaces_after_argument' => $spaces_after_argument}}
              ],
-             'extra' => {'spaces_before_argument' => ' '}};
+             'info' => {'spaces_before_argument' => ' '}};
     my $node_line_arg = $node->{'args'}->[0];
     $node_line_arg->{'parent'} = $node;
     $node_line_arg->{'extra'}->{'comment_at_end'} = $comment_at_end
diff --git a/tp/Texinfo/XS/misc.c b/tp/Texinfo/XS/misc.c
index b1963a8706..30d1431d94 100644
--- a/tp/Texinfo/XS/misc.c
+++ b/tp/Texinfo/XS/misc.c
@@ -182,7 +182,7 @@ delete_type:
     {
       STRLEN len;
       HV *owning_elt = 0;
-      HV *command_extra = 0;
+      HV *command_info = 0;
       HV *test_extra = 0;
       char *ptr;
 
@@ -191,25 +191,25 @@ delete_type:
       if (av_len(contents_array) + 1 == 0)
         hv_delete (current, "contents", strlen ("contents"), G_DISCARD);
 
-      /* add spaces to associated element extra "spaces_before_argument" */
+      /* add spaces to associated element info "spaces_before_argument" */
       svp = hv_fetch (spaces_elt, "extra", strlen ("extra"), 0);
       test_extra = (HV *) SvRV (*svp);
       svp = hv_fetch (test_extra, "spaces_associated_command",
                       strlen ("spaces_associated_command"), 0);
       owning_elt = (HV *) SvRV (*svp);
 
-      svp = hv_fetch (owning_elt, "extra", strlen ("extra"), 0);
+      svp = hv_fetch (owning_elt, "info", strlen ("info"), 0);
       if (svp)
-        command_extra = (HV *) SvRV (*svp);
+        command_info = (HV *) SvRV (*svp);
       else
         {
-          command_extra = newHV ();
-          hv_store (owning_elt, "extra", strlen ("extra"),
-                    newRV_inc((SV *)command_extra), 0);
+          command_info = newHV ();
+          hv_store (owning_elt, "info", strlen ("info"),
+                    newRV_inc((SV *)command_info), 0);
         }
 
       ptr = SvPV(existing_text_sv, len);
-      hv_store (command_extra,
+      hv_store (command_info,
                 "spaces_before_argument",
                 strlen ("spaces_before_argument"),
                 newSVpv(ptr, len),
diff --git a/tp/Texinfo/XS/parsetexi/convert.c 
b/tp/Texinfo/XS/parsetexi/convert.c
index 697f5a2bfb..9f824548d9 100644
--- a/tp/Texinfo/XS/parsetexi/convert.c
+++ b/tp/Texinfo/XS/parsetexi/convert.c
@@ -67,7 +67,7 @@ expand_cmd_args_to_texi (ELEMENT *e, TEXT *result)
     }
 
   // TODO extra spaces
-  k = lookup_extra (e, "spaces_before_argument");
+  k = lookup_info (e, "spaces_before_argument");
   if (k)
     ADD((char *)k->value);
 
@@ -112,11 +112,11 @@ expand_cmd_args_to_texi (ELEMENT *e, TEXT *result)
                 ADD(",");
               arg_nr++;
             }
-          k = lookup_extra (e->args.list[i], "spaces_before_argument");
+          k = lookup_info (e->args.list[i], "spaces_before_argument");
           if (k)
             ADD((char *)k->value);
           convert_to_texinfo_internal (e->args.list[i], result);
-          k = lookup_extra (e->args.list[i], "spaces_after_argument");
+          k = lookup_info (e->args.list[i], "spaces_after_argument");
           if (k)
             ADD((char *)k->value);
         }
@@ -152,7 +152,7 @@ convert_to_texinfo_internal (ELEMENT *e, TEXT *result)
         {
           KEY_PAIR *k;
           ADD("{");
-          k = lookup_extra (e, "spaces_before_argument");
+          k = lookup_info (e, "spaces_before_argument");
           if (k)
             ADD((char *)k->value);
         }
diff --git a/tp/Texinfo/XS/parsetexi/extra.c b/tp/Texinfo/XS/parsetexi/extra.c
index 1fdf01f745..457cc10bb1 100644
--- a/tp/Texinfo/XS/parsetexi/extra.c
+++ b/tp/Texinfo/XS/parsetexi/extra.c
@@ -165,10 +165,9 @@ add_extra_integer (ELEMENT *e, char *key, long value)
 }
 
 KEY_PAIR *
-lookup_extra (ELEMENT *e, char *key)
+lookup_associated_info (ASSOCIATED_INFO *a, char *key)
 {
   int i;
-  ASSOCIATED_INFO *a = e->extra_info;
   for (i = 0; i < a->info_number; i++)
     {
       if (!strcmp (a->info[i].key, key))
@@ -176,3 +175,16 @@ lookup_extra (ELEMENT *e, char *key)
     }
   return 0;
 }
+
+KEY_PAIR *
+lookup_extra (ELEMENT *e, char *key)
+{
+  return lookup_associated_info (e->extra_info, key);
+}
+
+KEY_PAIR *
+lookup_info (ELEMENT *e, char *key)
+{
+  return lookup_associated_info (e->info_info, key);
+}
+
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c 
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 94c95eb69f..cb675a574e 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -403,9 +403,9 @@ handle_line_command (ELEMENT *current, char **line_inout,
           line_args = new_element (ET_line_arg);
           add_to_element_args (misc, line_args);
           add_extra_misc_args (misc, "misc_args", args);
-          add_extra_string_dup (misc, "spaces_before_argument", " ");
+          add_info_string_dup (misc, "spaces_before_argument", " ");
 
-          add_extra_string_dup (line_args, "spaces_after_argument", "\n");
+          add_info_string_dup (line_args, "spaces_after_argument", "\n");
 
           e = new_element (ET_NONE);
           text_append (&e->text, arg);
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 52bb538950..957a847046 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -646,15 +646,15 @@ abort_empty_line (ELEMENT **current_inout, char 
*additional_spaces)
                || last_child->type == ET_internal_spaces_before_argument)
         {
           /* Remove element from main tree. It will still be referenced in
-             the 'extra' hash as 'spaces_before_argument'. */
+             the 'info' hash as 'spaces_before_argument'. */
           ELEMENT *owning_element;
           KEY_PAIR *k;
           ELEMENT *e = pop_element_from_contents (current);
 
           k = lookup_extra (last_child, "spaces_associated_command");
           owning_element = (ELEMENT *) k->value;
-          add_extra_string_dup (owning_element, "spaces_before_argument",
-                                e->text.text);
+          add_info_string_dup (owning_element, "spaces_before_argument",
+                               e->text.text);
           destroy_element (e);
         }
     }
@@ -680,8 +680,8 @@ isolate_last_space_internal (ELEMENT *current)
   /* If text all whitespace */
   if (text[strspn (text, whitespace_chars)] == '\0')
     {
-      add_extra_string_dup (current, "spaces_after_argument",
-                            last_elt->text.text);
+      add_info_string_dup (current, "spaces_after_argument",
+                           last_elt->text.text);
       destroy_element (pop_element_from_contents (current));
     }
   else
@@ -704,8 +704,8 @@ isolate_last_space_internal (ELEMENT *current)
       text[text_len - trailing_spaces] = '\0';
       last_elt->text.end -= trailing_spaces;
 
-      add_extra_string_dup (current, "spaces_after_argument",
-                            t.text);
+      add_info_string_dup (current, "spaces_after_argument",
+                           t.text);
     }
 }
 
@@ -2068,7 +2068,7 @@ parse_texi (ELEMENT *root_elt, ELEMENT *current_elt)
               && last_contents_child(current)->type
                  == ET_internal_spaces_before_argument)
             {
-              /* Remove this element and update 'extra' values. */
+              /* Remove this element and update 'info' values. */
               abort_empty_line (&current, 0);
             }
 
diff --git a/tp/Texinfo/XS/parsetexi/parser.h b/tp/Texinfo/XS/parsetexi/parser.h
index 6ed77cf044..ed6409b4ea 100644
--- a/tp/Texinfo/XS/parsetexi/parser.h
+++ b/tp/Texinfo/XS/parsetexi/parser.h
@@ -225,6 +225,7 @@ void add_extra_string_dup (ELEMENT *e, char *key, char 
*value);
 void add_extra_integer (ELEMENT *e, char *key, long value);
 void add_info_string_dup (ELEMENT *e, char *key, char *value);
 KEY_PAIR *lookup_extra (ELEMENT *e, char *key);
+KEY_PAIR *lookup_info (ELEMENT *e, char *key);
 
 /* In menus.c */
 int handle_menu (ELEMENT **current_inout, char **line_inout);
diff --git a/tp/t/results/alias/alias_table_command.pl 
b/tp/t/results/alias/alias_table_command.pl
index 9ffa9b4619..52531c3540 100644
--- a/tp/t/results/alias/alias_table_command.pl
+++ b/tp/t/results/alias/alias_table_command.pl
@@ -17,7 +17,7 @@ $result_trees{'alias_table_command'} = {
                   'text' => 'myalias = code'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -29,7 +29,9 @@ $result_trees{'alias_table_command'} = {
             'misc_args' => [
               'myalias',
               'code'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -57,7 +59,7 @@ $result_trees{'alias_table_command'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -78,7 +80,7 @@ $result_trees{'alias_table_command'} = {
                               'text' => 'table item (code)'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -86,7 +88,7 @@ $result_trees{'alias_table_command'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -109,7 +111,7 @@ $result_trees{'alias_table_command'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -118,9 +120,11 @@ $result_trees{'alias_table_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -129,7 +133,9 @@ $result_trees{'alias_table_command'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/alias/bad_line.pl b/tp/t/results/alias/bad_line.pl
index f04f8a8a5e..30beb14f27 100644
--- a/tp/t/results/alias/bad_line.pl
+++ b/tp/t/results/alias/bad_line.pl
@@ -22,7 +22,7 @@ $result_trees{'bad_line'} = {
                   'text' => 'garbage-on-line =cmd garbage'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -30,7 +30,7 @@ $result_trees{'bad_line'} = {
             }
           ],
           'cmdname' => 'alias',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -70,7 +70,7 @@ $result_trees{'bad_line'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -78,7 +78,7 @@ $result_trees{'bad_line'} = {
             }
           ],
           'cmdname' => 'alias',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/alias/block_command_alias.pl 
b/tp/t/results/alias/block_command_alias.pl
index 0c38d1bcb0..1d03ac760f 100644
--- a/tp/t/results/alias/block_command_alias.pl
+++ b/tp/t/results/alias/block_command_alias.pl
@@ -17,7 +17,7 @@ $result_trees{'block_command_alias'} = {
                   'text' => 'lang=lisp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -29,7 +29,9 @@ $result_trees{'block_command_alias'} = {
             'misc_args' => [
               'lang',
               'lisp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -46,7 +48,7 @@ $result_trees{'block_command_alias'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -69,7 +71,7 @@ $result_trees{'block_command_alias'} = {
                           'text' => 'lang'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -78,9 +80,11 @@ $result_trees{'block_command_alias'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'lang'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
diff --git a/tp/t/results/alias/simple.pl b/tp/t/results/alias/simple.pl
index fa8c8becde..3b626d2830 100644
--- a/tp/t/results/alias/simple.pl
+++ b/tp/t/results/alias/simple.pl
@@ -17,7 +17,7 @@ $result_trees{'simple'} = {
                   'text' => 'myalias = code'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -29,7 +29,9 @@ $result_trees{'simple'} = {
             'misc_args' => [
               'myalias',
               'code'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -67,7 +69,9 @@ $result_trees{'simple'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -78,7 +82,9 @@ $result_trees{'simple'} = {
             'misc_args' => [
               'o-theralias',
               'verb'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/columnfractions/empty.pl 
b/tp/t/results/columnfractions/empty.pl
index 5ec777a1db..6458fd2a6d 100644
--- a/tp/t/results/columnfractions/empty.pl
+++ b/tp/t/results/columnfractions/empty.pl
@@ -16,7 +16,7 @@ $result_trees{'empty'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' 
 '
                       },
@@ -52,9 +52,11 @@ $result_trees{'empty'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -63,7 +65,9 @@ $result_trees{'empty'} = {
             }
           ],
           'extra' => {
-            'max_columns' => 0,
+            'max_columns' => 0
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/columnfractions/empty_comment.pl 
b/tp/t/results/columnfractions/empty_comment.pl
index 3737eae030..addef8e7b1 100644
--- a/tp/t/results/columnfractions/empty_comment.pl
+++ b/tp/t/results/columnfractions/empty_comment.pl
@@ -39,7 +39,9 @@ $result_trees{'empty_comment'} = {
                   ],
                   'cmdname' => 'columnfractions',
                   'extra' => {
-                    'missing_argument' => 1,
+                    'missing_argument' => 1
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -67,9 +69,11 @@ $result_trees{'empty_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -78,7 +82,9 @@ $result_trees{'empty_comment'} = {
             }
           ],
           'extra' => {
-            'max_columns' => 0,
+            'max_columns' => 0
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/columnfractions/good.pl 
b/tp/t/results/columnfractions/good.pl
index e07634ed83..f6d9ca6c57 100644
--- a/tp/t/results/columnfractions/good.pl
+++ b/tp/t/results/columnfractions/good.pl
@@ -21,7 +21,7 @@ $result_trees{'good'} = {
                           'text' => '0.4 .6 5.'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -34,7 +34,9 @@ $result_trees{'good'} = {
                       '0.4',
                       '.6',
                       '5.'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -62,9 +64,11 @@ $result_trees{'good'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -74,7 +78,9 @@ $result_trees{'good'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 3,
+            'max_columns' => 3
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/columnfractions/good_comment.pl 
b/tp/t/results/columnfractions/good_comment.pl
index b4ed3dbe01..905e8b526e 100644
--- a/tp/t/results/columnfractions/good_comment.pl
+++ b/tp/t/results/columnfractions/good_comment.pl
@@ -48,7 +48,9 @@ $result_trees{'good_comment'} = {
                       '0.4',
                       '.6',
                       '5.'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -76,9 +78,11 @@ $result_trees{'good_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -88,7 +92,9 @@ $result_trees{'good_comment'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 3,
+            'max_columns' => 3
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/columnfractions/good_space_comment.pl 
b/tp/t/results/columnfractions/good_space_comment.pl
index 050904f1a9..9537195f9b 100644
--- a/tp/t/results/columnfractions/good_space_comment.pl
+++ b/tp/t/results/columnfractions/good_space_comment.pl
@@ -37,7 +37,9 @@ $result_trees{'good_space_comment'} = {
 '
                             ]
                           }
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_after_argument' => '  '
                       },
                       'type' => 'line_arg'
@@ -48,7 +50,9 @@ $result_trees{'good_space_comment'} = {
                     'misc_args' => [
                       '0',
                       '1'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -76,9 +80,11 @@ $result_trees{'good_space_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -88,7 +94,9 @@ $result_trees{'good_space_comment'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/columnfractions/invalid.pl 
b/tp/t/results/columnfractions/invalid.pl
index 2fd384d17b..cc6ffb6618 100644
--- a/tp/t/results/columnfractions/invalid.pl
+++ b/tp/t/results/columnfractions/invalid.pl
@@ -21,7 +21,7 @@ $result_trees{'invalid'} = {
                           'text' => '2x.2 2.23x'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -29,7 +29,7 @@ $result_trees{'invalid'} = {
                     }
                   ],
                   'cmdname' => 'columnfractions',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -57,9 +57,11 @@ $result_trees{'invalid'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -68,7 +70,9 @@ $result_trees{'invalid'} = {
             }
           ],
           'extra' => {
-            'max_columns' => 0,
+            'max_columns' => 0
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/columnfractions/not_fraction.pl 
b/tp/t/results/columnfractions/not_fraction.pl
index 43f48faf32..7829667697 100644
--- a/tp/t/results/columnfractions/not_fraction.pl
+++ b/tp/t/results/columnfractions/not_fraction.pl
@@ -21,7 +21,7 @@ $result_trees{'not_fraction'} = {
                           'text' => 'aaa'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -29,7 +29,7 @@ $result_trees{'not_fraction'} = {
                     }
                   ],
                   'cmdname' => 'columnfractions',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -57,9 +57,11 @@ $result_trees{'not_fraction'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -68,7 +70,9 @@ $result_trees{'not_fraction'} = {
             }
           ],
           'extra' => {
-            'max_columns' => 0,
+            'max_columns' => 0
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/columnfractions/out_of_multitable.pl 
b/tp/t/results/columnfractions/out_of_multitable.pl
index 9e0e8e321a..214f4aaf98 100644
--- a/tp/t/results/columnfractions/out_of_multitable.pl
+++ b/tp/t/results/columnfractions/out_of_multitable.pl
@@ -25,7 +25,9 @@ $result_trees{'out_of_multitable'} = {
             'misc_args' => [
               '0.6',
               '0.4'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/columnfractions/something_before_columnfractions.pl 
b/tp/t/results/columnfractions/something_before_columnfractions.pl
index 1b07ed437f..75163f199c 100644
--- a/tp/t/results/columnfractions/something_before_columnfractions.pl
+++ b/tp/t/results/columnfractions/something_before_columnfractions.pl
@@ -24,7 +24,7 @@ $result_trees{'something_before_columnfractions'} = {
                           'text' => '0.3 0.7'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -36,7 +36,9 @@ $result_trees{'something_before_columnfractions'} = {
                     'misc_args' => [
                       '0.3',
                       '0.7'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -64,9 +66,11 @@ $result_trees{'something_before_columnfractions'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -76,7 +80,9 @@ $result_trees{'something_before_columnfractions'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/columnfractions/wrong_command.pl 
b/tp/t/results/columnfractions/wrong_command.pl
index 43d9a95d5f..85ca1f6788 100644
--- a/tp/t/results/columnfractions/wrong_command.pl
+++ b/tp/t/results/columnfractions/wrong_command.pl
@@ -36,7 +36,7 @@ $result_trees{'wrong_command'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' 
 '
                       },
@@ -44,7 +44,7 @@ $result_trees{'wrong_command'} = {
                     }
                   ],
                   'cmdname' => 'columnfractions',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -72,9 +72,11 @@ $result_trees{'wrong_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -83,7 +85,9 @@ $result_trees{'wrong_command'} = {
             }
           ],
           'extra' => {
-            'max_columns' => 0,
+            'max_columns' => 0
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/conditionals/command_conditionals_user_defined.pl 
b/tp/t/results/conditionals/command_conditionals_user_defined.pl
index f825724e5a..cc9693e259 100644
--- a/tp/t/results/conditionals/command_conditionals_user_defined.pl
+++ b/tp/t/results/conditionals/command_conditionals_user_defined.pl
@@ -31,7 +31,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'command_conditionals_user_defined'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                   'text' => 'auth'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -84,7 +86,9 @@ $result_trees{'command_conditionals_user_defined'} = {
           'extra' => {
             'misc_args' => [
               'auth'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -106,7 +110,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                   'text' => 'infoencl, :,:'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -119,7 +123,9 @@ $result_trees{'command_conditionals_user_defined'} = {
               'infoencl',
               ':',
               ':'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -141,7 +147,7 @@ $result_trees{'command_conditionals_user_defined'} = {
                   'text' => 'strongalias = strong'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -153,7 +159,9 @@ $result_trees{'command_conditionals_user_defined'} = {
             'misc_args' => [
               'strongalias',
               'strong'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl 
b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
index 75944df35f..8eb838f0a1 100644
--- a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
+++ b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
@@ -43,7 +43,7 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/conditionals/end_ifset_in_format.pl 
b/tp/t/results/conditionals/end_ifset_in_format.pl
index 5bfd116247..79947e0468 100644
--- a/tp/t/results/conditionals/end_ifset_in_format.pl
+++ b/tp/t/results/conditionals/end_ifset_in_format.pl
@@ -43,7 +43,7 @@ $result_trees{'end_ifset_in_format'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'end_ifset_in_format'} = {
                       'text' => 'ignore'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'end_ifset_in_format'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ignore'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -107,7 +109,7 @@ $result_trees{'end_ifset_in_format'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -129,7 +131,7 @@ $result_trees{'end_ifset_in_format'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -138,9 +140,11 @@ $result_trees{'end_ifset_in_format'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
diff --git a/tp/t/results/conditionals/false_format_not_closed.pl 
b/tp/t/results/conditionals/false_format_not_closed.pl
index 62e89195eb..6d452b753b 100644
--- a/tp/t/results/conditionals/false_format_not_closed.pl
+++ b/tp/t/results/conditionals/false_format_not_closed.pl
@@ -12,7 +12,7 @@ $result_trees{'false_format_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/conditionals/ifclear_in_ifset_set.pl 
b/tp/t/results/conditionals/ifclear_in_ifset_set.pl
index cc62e022dd..fe984c935f 100644
--- a/tp/t/results/conditionals/ifclear_in_ifset_set.pl
+++ b/tp/t/results/conditionals/ifclear_in_ifset_set.pl
@@ -48,7 +48,7 @@ $result_trees{'ifclear_in_ifset_set'} = {
                   'text' => 'junky   - ok, ignored'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -57,9 +57,11 @@ $result_trees{'ifclear_in_ifset_set'} = {
           ],
           'cmdname' => 'end',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'junky   - ok, ignored'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 6,
@@ -74,7 +76,7 @@ $result_trees{'ifclear_in_ifset_set'} = {
                   'text' => 'ifset'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -83,9 +85,11 @@ $result_trees{'ifclear_in_ifset_set'} = {
           ],
           'cmdname' => 'end',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ifset'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 7,
diff --git a/tp/t/results/conditionals/ignore_not_closed.pl 
b/tp/t/results/conditionals/ignore_not_closed.pl
index 762f7eedaa..0d75c21f37 100644
--- a/tp/t/results/conditionals/ignore_not_closed.pl
+++ b/tp/t/results/conditionals/ignore_not_closed.pl
@@ -12,7 +12,7 @@ $result_trees{'ignore_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/conditionals/ignored_in_ifset.pl 
b/tp/t/results/conditionals/ignored_in_ifset.pl
index ded8e9b5b8..365a4de3fa 100644
--- a/tp/t/results/conditionals/ignored_in_ifset.pl
+++ b/tp/t/results/conditionals/ignored_in_ifset.pl
@@ -28,7 +28,7 @@ $result_trees{'ignored_in_ifset'} = {
                       'text' => 'ifset'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -37,9 +37,11 @@ $result_trees{'ignored_in_ifset'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ifset'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -62,7 +64,7 @@ $result_trees{'ignored_in_ifset'} = {
                   'text' => 'ifset'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -71,9 +73,11 @@ $result_trees{'ignored_in_ifset'} = {
           ],
           'cmdname' => 'end',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ifset'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 13,
@@ -99,7 +103,7 @@ $result_trees{'ignored_in_ifset'} = {
                       'text' => 'ifset'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -108,9 +112,11 @@ $result_trees{'ignored_in_ifset'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ifset'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
diff --git a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl 
b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
index e94d38e486..f7636a908d 100644
--- a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
+++ b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
@@ -45,7 +45,7 @@ $result_trees{'inlinefmtifelse_nesting'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git 
a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl 
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
index fe9ea627ec..f7eca94f58 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
@@ -31,7 +31,7 @@ $result_trees{'inlineiffmtifelse_not_closed_three_arg'} = {
 '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl 
b/tp/t/results/conditionals/macro_in_ifset.pl
index c95b8aff09..d84bc9fce8 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -36,7 +36,7 @@ $result_trees{'macro_in_ifset'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'macro_in_ifset'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl 
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index 06eeeaf16f..a303f0fccc 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -62,7 +62,7 @@ $result_trees{'macro_in_ifset_set'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +71,11 @@ $result_trees{'macro_in_ifset_set'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -134,7 +136,7 @@ $result_trees{'macro_in_ifset_set'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -143,9 +145,11 @@ $result_trees{'macro_in_ifset_set'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
diff --git a/tp/t/results/conditionals/many_conditionals.pl 
b/tp/t/results/conditionals/many_conditionals.pl
index 69063753b7..33df506075 100644
--- a/tp/t/results/conditionals/many_conditionals.pl
+++ b/tp/t/results/conditionals/many_conditionals.pl
@@ -12,7 +12,7 @@ $result_trees{'many_conditionals'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -38,7 +38,7 @@ $result_trees{'many_conditionals'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -47,9 +47,11 @@ $result_trees{'many_conditionals'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -119,7 +121,7 @@ $result_trees{'many_conditionals'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -139,7 +141,7 @@ $result_trees{'many_conditionals'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -148,9 +150,11 @@ $result_trees{'many_conditionals'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl 
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index d4e076ad4d..72c8f35e14 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -71,7 +71,7 @@ $result_trees{'nested_ifset_ifclear'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -80,9 +80,11 @@ $result_trees{'nested_ifset_ifclear'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
diff --git a/tp/t/results/conditionals/nested_ignore.pl 
b/tp/t/results/conditionals/nested_ignore.pl
index 8e38b6e7c0..e1e5de384b 100644
--- a/tp/t/results/conditionals/nested_ignore.pl
+++ b/tp/t/results/conditionals/nested_ignore.pl
@@ -12,7 +12,7 @@ $result_trees{'nested_ignore'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -39,7 +39,7 @@ $result_trees{'nested_ignore'} = {
                       'text' => 'ignore'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'nested_ignore'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ignore'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -72,7 +74,7 @@ $result_trees{'nested_ignore'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -99,7 +101,7 @@ $result_trees{'nested_ignore'} = {
                       'text' => 'ignore'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -108,9 +110,11 @@ $result_trees{'nested_ignore'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ignore'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -132,7 +136,7 @@ $result_trees{'nested_ignore'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -159,7 +163,7 @@ $result_trees{'nested_ignore'} = {
                       'text' => 'ignore'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -168,9 +172,11 @@ $result_trees{'nested_ignore'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ignore'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
diff --git a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl 
b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
index 6b2ec16b4c..b12cba1761 100644
--- a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
+++ b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
@@ -31,7 +31,7 @@ $result_trees{'user_defined_txiinternalvalue'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'user_defined_txiinternalvalue'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
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 b8f1c4be5b..5da6ea79d7 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -18,7 +18,7 @@ $result_trees{'at_commands_in_raw'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'at_commands_in_raw'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'at_commands_in_raw'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,7 @@ $result_trees{'at_commands_in_raw'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -100,9 +102,11 @@ $result_trees{'at_commands_in_raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -126,7 +130,8 @@ $result_trees{'at_commands_in_raw'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -143,7 +148,7 @@ $result_trees{'at_commands_in_raw'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -164,7 +169,9 @@ $result_trees{'at_commands_in_raw'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -181,7 +188,7 @@ $result_trees{'at_commands_in_raw'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -198,7 +205,7 @@ $result_trees{'at_commands_in_raw'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -279,7 +286,7 @@ $result_trees{'at_commands_in_raw'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -288,9 +295,11 @@ $result_trees{'at_commands_in_raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -362,7 +371,7 @@ $result_trees{'at_commands_in_raw'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -382,7 +391,7 @@ $result_trees{'at_commands_in_raw'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -391,9 +400,11 @@ $result_trees{'at_commands_in_raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 61,
@@ -555,7 +566,7 @@ $result_trees{'at_commands_in_raw'} = {
                       'text' => 'fentry2'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -575,7 +586,9 @@ $result_trees{'at_commands_in_raw'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'findex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -615,7 +628,7 @@ $result_trees{'at_commands_in_raw'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -626,7 +639,9 @@ $result_trees{'at_commands_in_raw'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -643,7 +658,7 @@ $result_trees{'at_commands_in_raw'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -654,7 +669,9 @@ $result_trees{'at_commands_in_raw'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -676,7 +693,7 @@ $result_trees{'at_commands_in_raw'} = {
                   'text' => 'Figs'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -685,7 +702,6 @@ $result_trees{'at_commands_in_raw'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -693,6 +709,9 @@ $result_trees{'at_commands_in_raw'} = {
               'normalized' => 'Figs'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 79,
@@ -793,7 +812,8 @@ $result_trees{'at_commands_in_raw'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -916,9 +936,11 @@ $result_sectioning{'at_commands_in_raw'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -930,9 +952,11 @@ $result_sectioning{'at_commands_in_raw'} = {
                     'isindex' => 1,
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -961,10 +985,12 @@ $result_nodes{'at_commands_in_raw'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -972,6 +998,7 @@ $result_nodes{'at_commands_in_raw'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -979,6 +1006,7 @@ $result_nodes{'at_commands_in_raw'} = {
         'isindex' => 1,
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -994,6 +1022,7 @@ $result_menus{'at_commands_in_raw'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/converters_tests/combined_fonts.pl 
b/tp/t/results/converters_tests/combined_fonts.pl
index a2f244e40e..53c0657e62 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -19,7 +19,7 @@ $result_trees{'combined_fonts'} = {
                       'text' => 'combined_fonts.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'combined_fonts'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'combined_fonts.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'combined_fonts'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,9 @@ $result_trees{'combined_fonts'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +97,7 @@ $result_trees{'combined_fonts'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -108,7 +112,8 @@ $result_trees{'combined_fonts'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -125,7 +130,7 @@ $result_trees{'combined_fonts'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -145,7 +150,9 @@ $result_trees{'combined_fonts'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -162,7 +169,7 @@ $result_trees{'combined_fonts'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1065,7 +1072,7 @@ $result_trees{'combined_fonts'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1131,7 +1138,7 @@ $result_trees{'combined_fonts'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1140,9 +1147,11 @@ $result_trees{'combined_fonts'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -1157,7 +1166,8 @@ $result_trees{'combined_fonts'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1261,9 +1271,11 @@ $result_sectioning{'combined_fonts'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1274,9 +1286,11 @@ $result_sectioning{'combined_fonts'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1305,10 +1319,12 @@ $result_nodes{'combined_fonts'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1316,12 +1332,14 @@ $result_nodes{'combined_fonts'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1337,6 +1355,7 @@ $result_menus{'combined_fonts'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 3e2cd5923a..423106d197 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -18,7 +18,7 @@ $result_trees{'complex_nestings'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'complex_nestings'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'complex_nestings'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -70,7 +72,8 @@ $result_trees{'complex_nestings'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -87,7 +90,7 @@ $result_trees{'complex_nestings'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +110,9 @@ $result_trees{'complex_nestings'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +129,7 @@ $result_trees{'complex_nestings'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -141,7 +146,7 @@ $result_trees{'complex_nestings'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -406,7 +411,9 @@ $result_trees{'complex_nestings'} = {
                       'index_name' => 'fn',
                       'index_type_command' => 'defun'
                     },
-                    'original_def_cmdname' => 'defunx',
+                    'original_def_cmdname' => 'defunx'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -759,7 +766,9 @@ $result_trees{'complex_nestings'} = {
                                       'index_name' => 'vr',
                                       'index_type_command' => 'defvar'
                                     },
-                                    'original_def_cmdname' => 'defvarx',
+                                    'original_def_cmdname' => 'defvarx'
+                                  },
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'source_info' => {
@@ -803,7 +812,7 @@ $result_trees{'complex_nestings'} = {
                                               'type' => 'command_as_argument'
                                             }
                                           ],
-                                          'extra' => {
+                                          'info' => {
                                             'spaces_after_argument' => '
 '
                                           },
@@ -824,7 +833,7 @@ $result_trees{'complex_nestings'} = {
                                                           'text' => 'item'
                                                         }
                                                       ],
-                                                      'extra' => {
+                                                      'info' => {
                                                         
'spaces_after_argument' => '
 '
                                                       },
@@ -832,7 +841,7 @@ $result_trees{'complex_nestings'} = {
                                                     }
                                                   ],
                                                   'cmdname' => 'item',
-                                                  'extra' => {
+                                                  'info' => {
                                                     'spaces_before_argument' 
=> ' '
                                                   },
                                                   'source_info' => {
@@ -882,7 +891,7 @@ $result_trees{'complex_nestings'} = {
                                                           'text' => 'second 
item'
                                                         }
                                                       ],
-                                                      'extra' => {
+                                                      'info' => {
                                                         
'spaces_after_argument' => '
 '
                                                       },
@@ -890,7 +899,7 @@ $result_trees{'complex_nestings'} = {
                                                     }
                                                   ],
                                                   'cmdname' => 'item',
-                                                  'extra' => {
+                                                  'info' => {
                                                     'spaces_before_argument' 
=> ' '
                                                   },
                                                   'source_info' => {
@@ -913,7 +922,7 @@ $result_trees{'complex_nestings'} = {
                                                   'text' => 'table'
                                                 }
                                               ],
-                                              'extra' => {
+                                              'info' => {
                                                 'spaces_after_argument' => '
 '
                                               },
@@ -922,9 +931,11 @@ $result_trees{'complex_nestings'} = {
                                           ],
                                           'cmdname' => 'end',
                                           'extra' => {
-                                            'spaces_before_argument' => ' ',
                                             'text_arg' => 'table'
                                           },
+                                          'info' => {
+                                            'spaces_before_argument' => ' '
+                                          },
                                           'source_info' => {
                                             'file_name' => '',
                                             'line_nr' => 24,
@@ -933,7 +944,9 @@ $result_trees{'complex_nestings'} = {
                                         }
                                       ],
                                       'extra' => {
-                                        'command_as_argument' => {},
+                                        'command_as_argument' => {}
+                                      },
+                                      'info' => {
                                         'spaces_before_argument' => ' '
                                       },
                                       'source_info' => {
@@ -967,7 +980,7 @@ $result_trees{'complex_nestings'} = {
                                           'text' => 'defvar'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -976,9 +989,11 @@ $result_trees{'complex_nestings'} = {
                                   ],
                                   'cmdname' => 'end',
                                   'extra' => {
-                                    'spaces_before_argument' => ' ',
                                     'text_arg' => 'defvar'
                                   },
+                                  'info' => {
+                                    'spaces_before_argument' => ' '
+                                  },
                                   'source_info' => {
                                     'file_name' => '',
                                     'line_nr' => 27,
@@ -986,7 +1001,7 @@ $result_trees{'complex_nestings'} = {
                                   }
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -1006,7 +1021,7 @@ $result_trees{'complex_nestings'} = {
                                   'text' => 'deffn'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1015,9 +1030,11 @@ $result_trees{'complex_nestings'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'deffn'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 28,
@@ -1025,7 +1042,7 @@ $result_trees{'complex_nestings'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1045,7 +1062,7 @@ $result_trees{'complex_nestings'} = {
                           'text' => 'defun'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1054,9 +1071,11 @@ $result_trees{'complex_nestings'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'defun'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 29,
@@ -1064,7 +1083,7 @@ $result_trees{'complex_nestings'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1091,7 +1110,7 @@ $result_trees{'complex_nestings'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1100,9 +1119,11 @@ $result_trees{'complex_nestings'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -1117,7 +1138,8 @@ $result_trees{'complex_nestings'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1236,9 +1258,11 @@ $result_sectioning{'complex_nestings'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1249,9 +1273,11 @@ $result_sectioning{'complex_nestings'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1280,10 +1306,12 @@ $result_nodes{'complex_nestings'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1291,12 +1319,14 @@ $result_nodes{'complex_nestings'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1312,6 +1342,7 @@ $result_menus{'complex_nestings'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 37b7abdb82..9639fc495e 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -24,7 +24,7 @@ $result_trees{'definition_commands'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'definition_commands'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'definition_commands'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'definition_commands'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'definition_commands'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +116,9 @@ $result_trees{'definition_commands'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -130,7 +135,7 @@ $result_trees{'definition_commands'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -303,7 +308,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -312,9 +317,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -322,7 +329,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -525,7 +532,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -534,9 +541,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -544,7 +553,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -777,7 +786,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -786,9 +795,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -796,7 +807,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1196,7 +1207,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1411,7 +1424,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1626,7 +1641,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1841,7 +1858,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -2056,7 +2075,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -2316,7 +2337,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -2576,7 +2599,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -2836,7 +2861,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -3096,7 +3123,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -3356,7 +3385,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -3616,7 +3647,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -3876,7 +3909,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -4136,7 +4171,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -4396,7 +4433,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -4428,7 +4467,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'defspec'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4437,9 +4476,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defspec'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
@@ -4447,7 +4488,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4665,7 +4706,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -4779,7 +4822,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -4893,7 +4938,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -5007,7 +5054,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -5121,7 +5170,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -5250,7 +5301,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -5379,7 +5432,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -5508,7 +5563,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -5637,7 +5694,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -5766,7 +5825,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -5895,7 +5956,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -6024,7 +6087,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -6153,7 +6218,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -6282,7 +6349,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -6314,7 +6383,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'defspec'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6323,9 +6392,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defspec'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 53,
@@ -6333,7 +6404,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6633,7 +6704,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -6788,7 +6861,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -7033,7 +7108,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -7116,7 +7193,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -7271,7 +7350,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7280,9 +7359,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 63,
@@ -7290,7 +7371,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8657,7 +8738,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec'
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'defspecx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -8689,7 +8772,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'defspec'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -8698,9 +8781,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defspec'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 68,
@@ -8708,7 +8793,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8995,7 +9080,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9004,9 +9089,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 72,
@@ -9014,7 +9101,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9331,7 +9418,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9340,9 +9427,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 76,
@@ -9350,7 +9439,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9516,7 +9605,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'defcv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9525,9 +9614,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 81,
@@ -9535,7 +9626,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9714,7 +9805,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9723,9 +9814,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 85,
@@ -9733,7 +9826,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9750,7 +9843,7 @@ $result_trees{'definition_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -10032,7 +10125,7 @@ $result_trees{'definition_commands'} = {
                           'text' => 'deftypefn'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -10041,9 +10134,11 @@ $result_trees{'definition_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'deftypefn'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 90,
@@ -10051,7 +10146,7 @@ $result_trees{'definition_commands'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -10068,7 +10163,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10077,9 +10172,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 91,
@@ -10293,7 +10390,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10302,9 +10399,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 95,
@@ -10312,7 +10411,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10533,7 +10632,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10542,9 +10641,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 99,
@@ -10552,7 +10653,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10963,7 +11064,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10972,9 +11073,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 104,
@@ -10982,7 +11085,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11459,7 +11562,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -11709,7 +11814,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -11959,7 +12066,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -12209,7 +12318,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -12459,7 +12570,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -12739,7 +12852,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -13019,7 +13134,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -13299,7 +13416,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -13579,7 +13698,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -13859,7 +13980,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -14139,7 +14262,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -14419,7 +14544,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -14699,7 +14826,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -14979,7 +15108,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -15011,7 +15142,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -15020,9 +15151,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 122,
@@ -15030,7 +15163,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -15494,7 +15627,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -15731,7 +15866,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -15968,7 +16105,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -16205,7 +16344,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -16442,7 +16583,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -16694,7 +16837,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -16946,7 +17091,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -17198,7 +17345,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -17450,7 +17599,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -17702,7 +17853,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -17954,7 +18107,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -18206,7 +18361,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -18458,7 +18615,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -18710,7 +18869,9 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn'
                 },
-                'original_def_cmdname' => 'deftypefnx',
+                'original_def_cmdname' => 'deftypefnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -18742,7 +18903,7 @@ $result_trees{'definition_commands'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -18751,9 +18912,11 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 140,
@@ -18761,7 +18924,7 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -18776,7 +18939,8 @@ $result_trees{'definition_commands'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -19576,9 +19740,11 @@ $result_sectioning{'definition_commands'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -19589,9 +19755,11 @@ $result_sectioning{'definition_commands'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -19620,10 +19788,12 @@ $result_nodes{'definition_commands'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -19631,12 +19801,14 @@ $result_nodes{'definition_commands'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -19652,6 +19824,7 @@ $result_menus{'definition_commands'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/converters_tests/email_table_command_as_argument.pl 
b/tp/t/results/converters_tests/email_table_command_as_argument.pl
index d25aa60171..814e4988f3 100644
--- a/tp/t/results/converters_tests/email_table_command_as_argument.pl
+++ b/tp/t/results/converters_tests/email_table_command_as_argument.pl
@@ -23,7 +23,7 @@ $result_trees{'email_table_command_as_argument'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -50,7 +50,7 @@ $result_trees{'email_table_command_as_argument'} = {
                               'text' => 'gnu.org'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -58,7 +58,7 @@ $result_trees{'email_table_command_as_argument'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -95,7 +95,7 @@ $result_trees{'email_table_command_as_argument'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -104,9 +104,11 @@ $result_trees{'email_table_command_as_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -115,7 +117,9 @@ $result_trees{'email_table_command_as_argument'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/converters_tests/enumerate_above_ten.pl 
b/tp/t/results/converters_tests/enumerate_above_ten.pl
index efd24c8624..6fe5a8a040 100644
--- a/tp/t/results/converters_tests/enumerate_above_ten.pl
+++ b/tp/t/results/converters_tests/enumerate_above_ten.pl
@@ -17,7 +17,7 @@ $result_trees{'enumerate_above_ten'} = {
                   'text' => '14'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -60,7 +60,7 @@ $result_trees{'enumerate_above_ten'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -69,9 +69,11 @@ $result_trees{'enumerate_above_ten'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -80,7 +82,9 @@ $result_trees{'enumerate_above_ten'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '14',
+            'enumerate_specification' => '14'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index de0ab1a222..f650bae724 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -18,7 +18,7 @@ $result_trees{'footnote_no_number'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'footnote_no_number'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'footnote_no_number'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -70,7 +72,8 @@ $result_trees{'footnote_no_number'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -87,7 +90,7 @@ $result_trees{'footnote_no_number'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +110,9 @@ $result_trees{'footnote_no_number'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +129,7 @@ $result_trees{'footnote_no_number'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -214,7 +219,8 @@ $result_trees{'footnote_no_number'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -265,9 +271,11 @@ $result_sectioning{'footnote_no_number'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -278,9 +286,11 @@ $result_sectioning{'footnote_no_number'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -309,10 +319,12 @@ $result_nodes{'footnote_no_number'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -320,12 +332,14 @@ $result_nodes{'footnote_no_number'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -341,6 +355,7 @@ $result_menus{'footnote_no_number'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
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 aee2ee1d1c..76994c5e6d 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -18,7 +18,7 @@ $result_trees{'footnote_no_number_separate'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'footnote_no_number_separate'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'footnote_no_number_separate'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -70,7 +72,8 @@ $result_trees{'footnote_no_number_separate'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -87,7 +90,7 @@ $result_trees{'footnote_no_number_separate'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +110,9 @@ $result_trees{'footnote_no_number_separate'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +129,7 @@ $result_trees{'footnote_no_number_separate'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -214,7 +219,8 @@ $result_trees{'footnote_no_number_separate'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -265,9 +271,11 @@ $result_sectioning{'footnote_no_number_separate'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -278,9 +286,11 @@ $result_sectioning{'footnote_no_number_separate'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -309,10 +319,12 @@ $result_nodes{'footnote_no_number_separate'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -320,12 +332,14 @@ $result_nodes{'footnote_no_number_separate'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -341,6 +355,7 @@ $result_menus{'footnote_no_number_separate'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 2757b991c4..d9113958a6 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -18,7 +18,7 @@ $result_trees{'form_feeds'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'form_feeds'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'form_feeds'} = {
               'text' => 'firstnode'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -282,7 +284,7 @@ $result_trees{'form_feeds'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -308,7 +310,7 @@ $result_trees{'form_feeds'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -317,9 +319,11 @@ $result_trees{'form_feeds'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -346,7 +350,7 @@ $result_trees{'form_feeds'} = {
                   'text' => 'around center'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -354,7 +358,7 @@ $result_trees{'form_feeds'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
@@ -371,7 +375,7 @@ $result_trees{'form_feeds'} = {
                   'text' => 'in center'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -379,7 +383,7 @@ $result_trees{'form_feeds'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -439,7 +443,9 @@ $result_trees{'form_feeds'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'category',
+                        'def_role' => 'category'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => ' '
                       },
@@ -464,7 +470,9 @@ $result_trees{'form_feeds'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'name',
+                        'def_role' => 'name'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => ' '
                       },
@@ -489,7 +497,9 @@ $result_trees{'form_feeds'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => ' '
                       },
@@ -514,7 +524,9 @@ $result_trees{'form_feeds'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => '  '
                       },
@@ -539,7 +551,9 @@ $result_trees{'form_feeds'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => '  '
                       },
@@ -615,7 +629,7 @@ $result_trees{'form_feeds'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -624,9 +638,11 @@ $result_trees{'form_feeds'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -634,7 +650,7 @@ $result_trees{'form_feeds'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -651,7 +667,7 @@ $result_trees{'form_feeds'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -707,7 +723,9 @@ $result_trees{'form_feeds'} = {
               ],
               'cmdname' => 'caption',
               'extra' => {
-                'float' => {},
+                'float' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -767,7 +785,9 @@ $result_trees{'form_feeds'} = {
               ],
               'cmdname' => 'shortcaption',
               'extra' => {
-                'float' => {},
+                'float' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -797,7 +817,7 @@ $result_trees{'form_feeds'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -806,9 +826,11 @@ $result_trees{'form_feeds'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -847,7 +869,9 @@ $result_trees{'form_feeds'} = {
             'normalized' => 'first-node'
           }
         ],
-        'normalized' => 'first-node',
+        'normalized' => 'first-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -953,12 +977,14 @@ $result_nodes{'form_feeds'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -972,6 +998,7 @@ $result_menus{'form_feeds'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
@@ -987,13 +1014,15 @@ $result_floats{'form_feeds'} = {
           'cmdname' => 'caption',
           'extra' => {
             'float' => {}
-          }
+          },
+          'info' => {}
         },
         'shortcaption' => {
           'cmdname' => 'shortcaption',
           'extra' => {
             'float' => {}
-          }
+          },
+          'info' => {}
         },
         'type' => {
           'normalized' => ''
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index aebcd9ef5b..1b8866fdc1 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -22,7 +22,7 @@ $result_trees{'frenchspacing_and_code'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,9 @@ $result_trees{'frenchspacing_and_code'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -58,7 +60,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -78,7 +80,9 @@ $result_trees{'frenchspacing_and_code'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -95,7 +99,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -110,7 +114,8 @@ $result_trees{'frenchspacing_and_code'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -127,7 +132,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'text' => 'chapter frenchspacing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -147,7 +152,9 @@ $result_trees{'frenchspacing_and_code'} = {
             'normalized' => 'chapter-frenchspacing'
           }
         ],
-        'normalized' => 'chapter-frenchspacing',
+        'normalized' => 'chapter-frenchspacing'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -164,7 +171,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'text' => 'Chap frenchspacing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -227,7 +234,7 @@ $result_trees{'frenchspacing_and_code'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -253,7 +260,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -262,9 +269,11 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -545,7 +554,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -554,9 +563,11 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -564,7 +575,7 @@ $result_trees{'frenchspacing_and_code'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -816,7 +827,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -825,9 +836,11 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -835,7 +848,7 @@ $result_trees{'frenchspacing_and_code'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -857,7 +870,7 @@ $result_trees{'frenchspacing_and_code'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -868,7 +881,9 @@ $result_trees{'frenchspacing_and_code'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -878,7 +893,8 @@ $result_trees{'frenchspacing_and_code'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -895,7 +911,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'text' => 'chap no'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -915,7 +931,9 @@ $result_trees{'frenchspacing_and_code'} = {
             'normalized' => 'chap-no'
           }
         ],
-        'normalized' => 'chap-no',
+        'normalized' => 'chap-no'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -932,7 +950,7 @@ $result_trees{'frenchspacing_and_code'} = {
               'text' => 'Chap no'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -995,7 +1013,7 @@ $result_trees{'frenchspacing_and_code'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1021,7 +1039,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1030,9 +1048,11 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -1313,7 +1333,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1322,9 +1342,11 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 40,
@@ -1332,7 +1354,7 @@ $result_trees{'frenchspacing_and_code'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1584,7 +1606,7 @@ $result_trees{'frenchspacing_and_code'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1593,9 +1615,11 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1603,7 +1627,7 @@ $result_trees{'frenchspacing_and_code'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1613,7 +1637,8 @@ $result_trees{'frenchspacing_and_code'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1764,9 +1789,11 @@ $result_sectioning{'frenchspacing_and_code'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1777,9 +1804,11 @@ $result_sectioning{'frenchspacing_and_code'} = {
                   'extra' => {
                     'normalized' => 'chapter-frenchspacing'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1796,9 +1825,11 @@ $result_sectioning{'frenchspacing_and_code'} = {
                   'extra' => {
                     'normalized' => 'chap-no'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1832,10 +1863,12 @@ $result_nodes{'frenchspacing_and_code'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1843,12 +1876,14 @@ $result_nodes{'frenchspacing_and_code'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter-frenchspacing'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1856,12 +1891,14 @@ $result_nodes{'frenchspacing_and_code'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'chap-no'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -1883,6 +1920,7 @@ $result_menus{'frenchspacing_and_code'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index be158739f7..8d86f7beaa 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -18,7 +18,7 @@ $result_trees{'image_formatting'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'image_formatting'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'image_formatting'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -70,7 +72,8 @@ $result_trees{'image_formatting'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -87,7 +90,7 @@ $result_trees{'image_formatting'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +110,9 @@ $result_trees{'image_formatting'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +129,7 @@ $result_trees{'image_formatting'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -966,7 +971,7 @@ $result_trees{'image_formatting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1721,7 +1726,7 @@ $result_trees{'image_formatting'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1730,9 +1735,11 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -1844,7 +1851,8 @@ $result_trees{'image_formatting'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1941,9 +1949,11 @@ $result_sectioning{'image_formatting'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1954,9 +1964,11 @@ $result_sectioning{'image_formatting'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1985,10 +1997,12 @@ $result_nodes{'image_formatting'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1996,12 +2010,14 @@ $result_nodes{'image_formatting'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -2017,6 +2033,7 @@ $result_menus{'image_formatting'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl 
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index 5e94c06b14..3591596428 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -18,7 +18,7 @@ $result_trees{'index_entry_in_preformatted'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'index_entry_in_preformatted'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'index_entry_in_preformatted'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -70,7 +72,8 @@ $result_trees{'index_entry_in_preformatted'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -87,7 +90,7 @@ $result_trees{'index_entry_in_preformatted'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +110,9 @@ $result_trees{'index_entry_in_preformatted'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +129,7 @@ $result_trees{'index_entry_in_preformatted'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -141,7 +146,7 @@ $result_trees{'index_entry_in_preformatted'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -160,7 +165,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                           'text' => 'first'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -180,7 +185,9 @@ $result_trees{'index_entry_in_preformatted'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -223,7 +230,9 @@ $result_trees{'index_entry_in_preformatted'} = {
 '
                             ]
                           }
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -242,7 +251,9 @@ $result_trees{'index_entry_in_preformatted'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -264,7 +275,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                           'text' => 'last'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -284,7 +295,9 @@ $result_trees{'index_entry_in_preformatted'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -305,7 +318,7 @@ $result_trees{'index_entry_in_preformatted'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -314,9 +327,11 @@ $result_trees{'index_entry_in_preformatted'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -331,7 +346,8 @@ $result_trees{'index_entry_in_preformatted'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -399,9 +415,11 @@ $result_sectioning{'index_entry_in_preformatted'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -412,9 +430,11 @@ $result_sectioning{'index_entry_in_preformatted'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -443,10 +463,12 @@ $result_nodes{'index_entry_in_preformatted'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -454,12 +476,14 @@ $result_nodes{'index_entry_in_preformatted'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -475,6 +499,7 @@ $result_menus{'index_entry_in_preformatted'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/converters_tests/inline.pl 
b/tp/t/results/converters_tests/inline.pl
index 114ab0adfc..37dd5e738e 100644
--- a/tp/t/results/converters_tests/inline.pl
+++ b/tp/t/results/converters_tests/inline.pl
@@ -32,7 +32,7 @@ $result_trees{'inline'} = {
                       'text' => '<blink>html</blink> ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -69,7 +69,7 @@ $result_trees{'inline'} = {
                       'text' => 'plaintext ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -106,7 +106,7 @@ $result_trees{'inline'} = {
                       'text' => '<para>xml</para> ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -143,7 +143,7 @@ $result_trees{'inline'} = {
                       'text' => '<emphasis>docbook</emphasis> ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -283,7 +283,7 @@ $result_trees{'inline'} = {
                       'text' => ' ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -335,7 +335,7 @@ $result_trees{'inline'} = {
                       'text' => 'raw <blink>html</blink> ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -372,7 +372,7 @@ $result_trees{'inline'} = {
                       'text' => 'raw plaintext ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -409,7 +409,7 @@ $result_trees{'inline'} = {
                       'text' => 'raw <para>xml</para> ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -446,7 +446,7 @@ $result_trees{'inline'} = {
                       'text' => 'raw <emphasis>docbook</emphasis> ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -571,7 +571,7 @@ $result_trees{'inline'} = {
                       'text' => '$ ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/converters_tests/inline_expand_tex.pl 
b/tp/t/results/converters_tests/inline_expand_tex.pl
index f640ced161..ef27c88dfa 100644
--- a/tp/t/results/converters_tests/inline_expand_tex.pl
+++ b/tp/t/results/converters_tests/inline_expand_tex.pl
@@ -162,7 +162,7 @@ $result_trees{'inline_expand_tex'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -401,7 +401,7 @@ $result_trees{'inline_expand_tex'} = {
                       'text' => '$ ``'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/converters_tests/inlinefmtifelse.pl 
b/tp/t/results/converters_tests/inlinefmtifelse.pl
index 24e4a89c46..42bb139103 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse.pl
@@ -224,7 +224,7 @@ $result_trees{'inlinefmtifelse'} = {
                       'text' => 'docbook'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -239,7 +239,7 @@ $result_trees{'inlinefmtifelse'} = {
                       'text' => 'else docbook spaces '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -278,7 +278,7 @@ $result_trees{'inlinefmtifelse'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -293,7 +293,7 @@ $result_trees{'inlinefmtifelse'} = {
                       'text' => 'else tex spaces '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/converters_tests/inlineifsetifclear.pl 
b/tp/t/results/converters_tests/inlineifsetifclear.pl
index e03601777a..de332987da 100644
--- a/tp/t/results/converters_tests/inlineifsetifclear.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclear.pl
@@ -27,7 +27,7 @@ $result_trees{'inlineifsetifclear'} = {
                       'text' => 'iclear first '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -176,7 +176,7 @@ $result_trees{'inlineifsetifclear'} = {
                       'text' => 'ifset second '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/converters_tests/line_breaks.pl 
b/tp/t/results/converters_tests/line_breaks.pl
index 48eb81d38c..097b49a1d3 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -12,7 +12,7 @@ $result_trees{'line_breaks'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -44,7 +44,7 @@ $result_trees{'line_breaks'} = {
                       'text' => 'documentdescription'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -53,9 +53,11 @@ $result_trees{'line_breaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'documentdescription'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -88,7 +90,7 @@ $result_trees{'line_breaks'} = {
                   'text' => ' new version'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -96,7 +98,8 @@ $result_trees{'line_breaks'} = {
             }
           ],
           'cmdname' => 'settitle',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -119,7 +122,7 @@ $result_trees{'line_breaks'} = {
                   'text' => ' Language---Revisited'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -127,7 +130,8 @@ $result_trees{'line_breaks'} = {
             }
           ],
           'cmdname' => 'title',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -155,7 +159,7 @@ $result_trees{'line_breaks'} = {
                   'text' => ' line break'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -163,7 +167,7 @@ $result_trees{'line_breaks'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -191,7 +195,7 @@ $result_trees{'line_breaks'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -218,7 +222,7 @@ $result_trees{'line_breaks'} = {
                               'text' => ' after'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -226,7 +230,7 @@ $result_trees{'line_breaks'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -249,7 +253,7 @@ $result_trees{'line_breaks'} = {
                               'text' => ' afterx'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -257,7 +261,7 @@ $result_trees{'line_breaks'} = {
                         }
                       ],
                       'cmdname' => 'itemx',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -294,7 +298,7 @@ $result_trees{'line_breaks'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -303,9 +307,11 @@ $result_trees{'line_breaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -314,7 +320,9 @@ $result_trees{'line_breaks'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -342,7 +350,7 @@ $result_trees{'line_breaks'} = {
                   'text' => ' uotation'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -368,7 +376,7 @@ $result_trees{'line_breaks'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -377,9 +385,11 @@ $result_trees{'line_breaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -387,7 +397,7 @@ $result_trees{'line_breaks'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/converters_tests/non_empty_part.pl 
b/tp/t/results/converters_tests/non_empty_part.pl
index 41ece32c05..25c08612fb 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -18,7 +18,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'part before'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -47,7 +47,8 @@ $result_trees{'non_empty_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -64,7 +65,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -84,7 +85,9 @@ $result_trees{'non_empty_part'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -101,7 +104,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -118,7 +121,7 @@ $result_trees{'non_empty_part'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -233,7 +236,7 @@ $result_trees{'non_empty_part'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -242,9 +245,11 @@ $result_trees{'non_empty_part'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -265,7 +270,9 @@ $result_trees{'non_empty_part'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -282,7 +289,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'part I'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -311,7 +318,8 @@ $result_trees{'non_empty_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -328,7 +336,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'chap in Top node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -344,7 +352,9 @@ $result_trees{'non_empty_part'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -361,7 +371,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'Part II'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -390,7 +400,8 @@ $result_trees{'non_empty_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -407,7 +418,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'part chapter node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -427,7 +438,9 @@ $result_trees{'non_empty_part'} = {
             'normalized' => 'part-chapter-node'
           }
         ],
-        'normalized' => 'part-chapter-node',
+        'normalized' => 'part-chapter-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -444,7 +457,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'part III'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -473,7 +486,8 @@ $result_trees{'non_empty_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -490,7 +504,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'chapter with part node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -506,7 +520,9 @@ $result_trees{'non_empty_part'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -523,7 +539,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'Part IV'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -552,7 +568,8 @@ $result_trees{'non_empty_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -569,7 +586,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'Part V'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -598,7 +615,8 @@ $result_trees{'non_empty_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -615,7 +633,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'with part no node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -631,7 +649,9 @@ $result_trees{'non_empty_part'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -648,7 +668,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'Part VI'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -677,7 +697,8 @@ $result_trees{'non_empty_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -694,7 +715,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'node between part and chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -721,7 +742,9 @@ $result_trees{'non_empty_part'} = {
             'normalized' => 'node-between-part-and-chapter'
           }
         ],
-        'normalized' => 'node-between-part-and-chapter',
+        'normalized' => 'node-between-part-and-chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -738,7 +761,7 @@ $result_trees{'non_empty_part'} = {
               'text' => 'chapter after part node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -754,7 +777,9 @@ $result_trees{'non_empty_part'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -902,10 +927,12 @@ $result_sectioning{'non_empty_part'} = {
                 'extra' => {
                   'normalized' => 'Top'
                 },
+                'info' => {},
                 'structure' => {}
               },
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 0,
               'section_prev' => {},
@@ -914,6 +941,7 @@ $result_sectioning{'non_empty_part'} = {
           },
           'part_following_node' => {}
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -928,6 +956,7 @@ $result_sectioning{'non_empty_part'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 1,
@@ -937,6 +966,7 @@ $result_sectioning{'non_empty_part'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {}
@@ -954,9 +984,11 @@ $result_sectioning{'non_empty_part'} = {
             'extra' => {
               'normalized' => 'part-chapter-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_prev' => {},
@@ -972,6 +1004,7 @@ $result_sectioning{'non_empty_part'} = {
               'associated_node' => {},
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 2,
@@ -981,6 +1014,7 @@ $result_sectioning{'non_empty_part'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {}
@@ -993,6 +1027,7 @@ $result_sectioning{'non_empty_part'} = {
       {
         'cmdname' => 'part',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_prev' => {},
@@ -1007,6 +1042,7 @@ $result_sectioning{'non_empty_part'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 3,
@@ -1016,6 +1052,7 @@ $result_sectioning{'non_empty_part'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {}
@@ -1036,10 +1073,12 @@ $result_sectioning{'non_empty_part'} = {
                 'extra' => {
                   'normalized' => 'node-between-part-and-chapter'
                 },
+                'info' => {},
                 'structure' => {}
               },
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 4,
@@ -1050,6 +1089,7 @@ $result_sectioning{'non_empty_part'} = {
           },
           'part_following_node' => {}
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {}
@@ -1113,9 +1153,11 @@ $result_nodes{'non_empty_part'} = {
         'associated_part' => {
           'cmdname' => 'part',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         }
       },
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1126,6 +1168,7 @@ $result_nodes{'non_empty_part'} = {
     'node_preceding_part' => {},
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1136,9 +1179,11 @@ $result_nodes{'non_empty_part'} = {
             'associated_part' => {
               'cmdname' => 'part',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             }
           },
+          'info' => {},
           'structure' => {
             'section_number' => 2
           }
@@ -1146,10 +1191,12 @@ $result_nodes{'non_empty_part'} = {
         'node_preceding_part' => {
           'cmdname' => 'part',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'part-chapter-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1168,12 +1215,14 @@ $result_menus{'non_empty_part'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'part-chapter-node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl 
b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
index 7623045363..78b66307bb 100644
--- a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
+++ b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
@@ -18,7 +18,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'part before'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -47,7 +47,8 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -64,7 +65,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -84,7 +85,9 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -101,7 +104,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -118,7 +121,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -233,7 +236,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -242,9 +245,11 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -265,7 +270,9 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -282,7 +289,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'part I'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -311,7 +318,8 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -328,7 +336,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'chap in Top node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -344,7 +352,9 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -361,7 +371,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'Part II'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -390,7 +400,8 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -407,7 +418,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'part chapter node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -427,7 +438,9 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
             'normalized' => 'part-chapter-node'
           }
         ],
-        'normalized' => 'part-chapter-node',
+        'normalized' => 'part-chapter-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -444,7 +457,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'part III'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -473,7 +486,8 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -490,7 +504,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'chapter with part node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -506,7 +520,9 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -523,7 +539,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'Part IV'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -552,7 +568,8 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -569,7 +586,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'Part V'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -598,7 +615,8 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -615,7 +633,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'with part no node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -631,7 +649,9 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -648,7 +668,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'Part VI'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -677,7 +697,8 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -694,7 +715,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'node between part and chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -721,7 +742,9 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
             'normalized' => 'node-between-part-and-chapter'
           }
         ],
-        'normalized' => 'node-between-part-and-chapter',
+        'normalized' => 'node-between-part-and-chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -738,7 +761,7 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               'text' => 'chapter after part node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -754,7 +777,9 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -902,10 +927,12 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = 
{
                 'extra' => {
                   'normalized' => 'Top'
                 },
+                'info' => {},
                 'structure' => {}
               },
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 0,
               'section_prev' => {},
@@ -914,6 +941,7 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = {
           },
           'part_following_node' => {}
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -928,6 +956,7 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 1,
@@ -937,6 +966,7 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {}
@@ -954,9 +984,11 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = {
             'extra' => {
               'normalized' => 'part-chapter-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_prev' => {},
@@ -972,6 +1004,7 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = {
               'associated_node' => {},
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 2,
@@ -981,6 +1014,7 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {}
@@ -993,6 +1027,7 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = {
       {
         'cmdname' => 'part',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_prev' => {},
@@ -1007,6 +1042,7 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = 
{
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 3,
@@ -1016,6 +1052,7 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = 
{
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {}
@@ -1036,10 +1073,12 @@ $result_sectioning{'non_empty_part_no_top_node_output'} 
= {
                 'extra' => {
                   'normalized' => 'node-between-part-and-chapter'
                 },
+                'info' => {},
                 'structure' => {}
               },
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 4,
@@ -1050,6 +1089,7 @@ $result_sectioning{'non_empty_part_no_top_node_output'} = 
{
           },
           'part_following_node' => {}
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {}
@@ -1113,9 +1153,11 @@ $result_nodes{'non_empty_part_no_top_node_output'} = {
         'associated_part' => {
           'cmdname' => 'part',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         }
       },
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1126,6 +1168,7 @@ $result_nodes{'non_empty_part_no_top_node_output'} = {
     'node_preceding_part' => {},
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1136,9 +1179,11 @@ $result_nodes{'non_empty_part_no_top_node_output'} = {
             'associated_part' => {
               'cmdname' => 'part',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             }
           },
+          'info' => {},
           'structure' => {
             'section_number' => 2
           }
@@ -1146,10 +1191,12 @@ $result_nodes{'non_empty_part_no_top_node_output'} = {
         'node_preceding_part' => {
           'cmdname' => 'part',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'part-chapter-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1168,12 +1215,14 @@ $result_menus{'non_empty_part_no_top_node_output'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'part-chapter-node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/converters_tests/normal_font_in_monospace.pl 
b/tp/t/results/converters_tests/normal_font_in_monospace.pl
index b3b0bc2ba2..6f3f221ee8 100644
--- a/tp/t/results/converters_tests/normal_font_in_monospace.pl
+++ b/tp/t/results/converters_tests/normal_font_in_monospace.pl
@@ -12,7 +12,7 @@ $result_trees{'normal_font_in_monospace'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -77,7 +77,7 @@ $result_trees{'normal_font_in_monospace'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -86,9 +86,11 @@ $result_trees{'normal_font_in_monospace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git 
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl 
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index d5618d80f8..c491c90787 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -24,7 +24,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -114,7 +117,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -131,7 +136,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -153,7 +158,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'cp fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -165,7 +170,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
             'misc_args' => [
               'cp',
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -187,7 +194,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'vr fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -199,7 +206,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
             'misc_args' => [
               'vr',
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -221,7 +230,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'c``b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -241,7 +250,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -264,7 +275,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'v``j'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -284,7 +295,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'index_ignore_chars' => {},
               'index_name' => 'vr',
               'index_type_command' => 'vindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -307,7 +320,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'f``g'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -327,7 +340,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -350,7 +365,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'cdi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -361,7 +376,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'extra' => {
             'misc_args' => [
               'cdi'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -383,7 +400,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'cdi fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -395,7 +412,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
             'misc_args' => [
               'cdi',
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -417,7 +436,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'cdi``h'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -437,7 +456,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cdi',
               'index_type_command' => 'cdiindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -460,7 +481,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'ddi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -471,7 +492,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'extra' => {
             'misc_args' => [
               'ddi'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -493,7 +516,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'ddi cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -505,7 +528,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
             'misc_args' => [
               'ddi',
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -527,7 +552,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'ddi``g'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -547,7 +572,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
               'index_ignore_chars' => {},
               'index_name' => 'ddi',
               'index_type_command' => 'ddiindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -570,7 +597,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -581,7 +608,9 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -591,7 +620,8 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -690,9 +720,11 @@ $result_sectioning{'printindex_merged_indices_code_style'} 
= {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -704,9 +736,11 @@ $result_sectioning{'printindex_merged_indices_code_style'} 
= {
                     'isindex' => 1,
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -735,10 +769,12 @@ $result_nodes{'printindex_merged_indices_code_style'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -746,6 +782,7 @@ $result_nodes{'printindex_merged_indices_code_style'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -753,6 +790,7 @@ $result_nodes{'printindex_merged_indices_code_style'} = {
         'isindex' => 1,
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -768,6 +806,7 @@ $result_menus{'printindex_merged_indices_code_style'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/converters_tests/raw_block_commands.pl 
b/tp/t/results/converters_tests/raw_block_commands.pl
index 59cf59a0b1..05a8a9f998 100644
--- a/tp/t/results/converters_tests/raw_block_commands.pl
+++ b/tp/t/results/converters_tests/raw_block_commands.pl
@@ -17,7 +17,7 @@ $result_trees{'raw_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -46,7 +46,7 @@ $result_trees{'raw_block_commands'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -55,9 +55,11 @@ $result_trees{'raw_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -79,7 +81,7 @@ $result_trees{'raw_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -108,7 +110,7 @@ $result_trees{'raw_block_commands'} = {
                       'text' => 'xml'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -117,9 +119,11 @@ $result_trees{'raw_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'xml'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -141,7 +145,7 @@ $result_trees{'raw_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -170,7 +174,7 @@ $result_trees{'raw_block_commands'} = {
                       'text' => 'docbook'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -179,9 +183,11 @@ $result_trees{'raw_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'docbook'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -203,7 +209,7 @@ $result_trees{'raw_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -266,7 +272,7 @@ $result_trees{'raw_block_commands'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -275,9 +281,11 @@ $result_trees{'raw_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -299,7 +307,7 @@ $result_trees{'raw_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -368,7 +376,7 @@ $result_trees{'raw_block_commands'} = {
                       'text' => 'latex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -377,9 +385,11 @@ $result_trees{'raw_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'latex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
diff --git a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl 
b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
index b8b8e4d8fc..cf7fb3e5b0 100644
--- a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
+++ b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
@@ -17,7 +17,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -46,7 +46,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -55,9 +55,11 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -79,7 +81,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -108,7 +110,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                       'text' => 'xml'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -117,9 +119,11 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'xml'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -141,7 +145,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -170,7 +174,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                       'text' => 'docbook'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -179,9 +183,11 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'docbook'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -203,7 +209,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -266,7 +272,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -275,9 +281,11 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -299,7 +307,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -368,7 +376,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
                       'text' => 'latex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -377,9 +385,11 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'latex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
diff --git a/tp/t/results/converters_tests/ref_error_formatting.pl 
b/tp/t/results/converters_tests/ref_error_formatting.pl
index d99d38843b..8d81d4e915 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -1126,7 +1126,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1137,7 +1137,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1386,7 +1386,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1397,7 +1397,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1926,7 +1926,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1937,7 +1937,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2150,7 +2150,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2161,7 +2161,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2304,7 +2304,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'cross ref name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2434,7 +2434,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2557,7 +2557,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'cross ref name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2568,7 +2568,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2703,7 +2703,7 @@ $result_trees{'ref_error_formatting'} = {
                       'text' => 'cross ref name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index b941914a8d..d587ffe53b 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -40,7 +40,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -60,7 +60,9 @@ $result_trees{'ref_in_sectioning'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -97,7 +99,7 @@ $result_trees{'ref_in_sectioning'} = {
                           'text' => 'node'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -117,7 +119,9 @@ $result_trees{'ref_in_sectioning'} = {
                         'normalized' => 'node'
                       }
                     ],
-                    'normalized' => 'node',
+                    'normalized' => 'node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -194,7 +198,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'file'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -205,7 +209,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'Manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -229,7 +233,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -246,7 +250,7 @@ $result_trees{'ref_in_sectioning'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -361,7 +365,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -370,9 +374,11 @@ $result_trees{'ref_in_sectioning'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -392,7 +398,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -433,7 +440,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -444,7 +451,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'Manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -468,7 +475,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => '.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -483,7 +490,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -500,7 +508,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -520,7 +528,9 @@ $result_trees{'ref_in_sectioning'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -564,7 +574,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ' just node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -579,7 +589,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -677,7 +688,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'file'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -688,7 +699,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'Manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -712,7 +723,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -727,7 +738,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -756,7 +768,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'cross ref name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -782,7 +794,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => '  node, crossref arg2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -797,7 +809,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -859,7 +872,7 @@ $result_trees{'ref_in_sectioning'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -885,7 +898,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => '  code node, samptitle arg3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -900,7 +913,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -950,7 +964,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -974,7 +988,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ' code node, file name'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -989,7 +1003,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1027,7 +1042,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'Manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -1052,7 +1067,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ' node and manual'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1067,7 +1082,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1105,7 +1121,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'Manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -1130,7 +1146,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ' Top and manual'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1145,7 +1161,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1178,7 +1195,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'Manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -1196,7 +1213,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ' no node just manual'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1211,7 +1228,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1241,7 +1259,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1258,7 +1276,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ' no node just file name'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1273,7 +1291,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1302,7 +1321,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1313,7 +1332,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1337,7 +1356,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ' inforef a b c'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -1352,7 +1371,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1376,7 +1396,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -1394,7 +1414,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -1419,7 +1439,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ') pxref Top file name, spaces'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1434,7 +1454,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1467,7 +1488,7 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -1485,7 +1506,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ') pxref file name only, spaces'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1500,7 +1521,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1556,7 +1578,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => ', xref Top filename only, no spaces'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1571,7 +1593,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1615,7 +1638,7 @@ $result_trees{'ref_in_sectioning'} = {
               'text' => '. xref filename only, no spaces'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1630,7 +1653,8 @@ $result_trees{'ref_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1786,9 +1810,11 @@ $result_sectioning{'ref_in_sectioning'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1799,9 +1825,11 @@ $result_sectioning{'ref_in_sectioning'} = {
                   'extra' => {
                     'normalized' => 'node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1818,14 +1846,17 @@ $result_sectioning{'ref_in_sectioning'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.1',
@@ -1835,6 +1866,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.2',
@@ -1845,6 +1877,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.3',
@@ -1855,6 +1888,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.4',
@@ -1865,6 +1899,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.5',
@@ -1875,6 +1910,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.6',
@@ -1885,6 +1921,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.7',
@@ -1895,6 +1932,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.8',
@@ -1905,6 +1943,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.9',
@@ -1915,6 +1954,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.10',
@@ -1925,6 +1965,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.11',
@@ -1935,6 +1976,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.12',
@@ -1945,6 +1987,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.13',
@@ -2010,6 +2053,7 @@ $result_nodes{'ref_in_sectioning'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -2019,6 +2063,7 @@ $result_nodes{'ref_in_sectioning'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2026,12 +2071,14 @@ $result_nodes{'ref_in_sectioning'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -2039,12 +2086,14 @@ $result_nodes{'ref_in_sectioning'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'chap'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -2068,18 +2117,21 @@ $result_menus{'ref_in_sectioning'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'chap'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
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 1adcf66089..00ca14177d 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
@@ -34,7 +34,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                       'text' => 'references_to_top_no_top_output.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'references_to_top_no_top_output'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'references_to_top_no_top_output.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -60,7 +62,7 @@ $result_trees{'references_to_top_no_top_output'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -118,7 +120,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -127,9 +129,11 @@ $result_trees{'references_to_top_no_top_output'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -162,7 +166,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -182,7 +186,9 @@ $result_trees{'references_to_top_no_top_output'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -199,7 +205,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -399,7 +405,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'text' => 'My Flist'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -508,7 +514,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -517,9 +523,11 @@ $result_trees{'references_to_top_no_top_output'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -534,7 +542,6 @@ $result_trees{'references_to_top_no_top_output'} = {
               {}
             ],
             'normalized' => 'My-Flist',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -542,6 +549,9 @@ $result_trees{'references_to_top_no_top_output'} = {
               'normalized' => 'list'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 22,
@@ -561,7 +571,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'text' => 'index in Top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -581,7 +591,9 @@ $result_trees{'references_to_top_no_top_output'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -611,7 +623,8 @@ $result_trees{'references_to_top_no_top_output'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -628,7 +641,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -649,7 +662,9 @@ $result_trees{'references_to_top_no_top_output'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -666,7 +681,7 @@ $result_trees{'references_to_top_no_top_output'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -884,7 +899,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'text' => 'chap index'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -904,7 +919,9 @@ $result_trees{'references_to_top_no_top_output'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -927,7 +944,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -938,7 +955,9 @@ $result_trees{'references_to_top_no_top_output'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -968,7 +987,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'text' => 'Main Flist'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -1025,7 +1044,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1034,9 +1053,11 @@ $result_trees{'references_to_top_no_top_output'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 49,
@@ -1051,7 +1072,6 @@ $result_trees{'references_to_top_no_top_output'} = {
               {}
             ],
             'normalized' => 'Main-Flist',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -1059,6 +1079,9 @@ $result_trees{'references_to_top_no_top_output'} = {
               'normalized' => 'list'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 46,
@@ -1078,7 +1101,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                   'text' => 'list'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1087,7 +1110,6 @@ $result_trees{'references_to_top_no_top_output'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -1095,6 +1117,9 @@ $result_trees{'references_to_top_no_top_output'} = {
               'normalized' => 'list'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 51,
@@ -1102,7 +1127,8 @@ $result_trees{'references_to_top_no_top_output'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1261,9 +1287,11 @@ $result_sectioning{'references_to_top_no_top_output'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1275,9 +1303,11 @@ $result_sectioning{'references_to_top_no_top_output'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1306,10 +1336,12 @@ $result_nodes{'references_to_top_no_top_output'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1317,6 +1349,7 @@ $result_nodes{'references_to_top_no_top_output'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1324,6 +1357,7 @@ $result_nodes{'references_to_top_no_top_output'} = {
         'isindex' => 1,
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1339,6 +1373,7 @@ $result_menus{'references_to_top_no_top_output'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
@@ -1359,6 +1394,7 @@ $result_floats{'references_to_top_no_top_output'} = {
         'float_section' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'My-Flist',
@@ -1371,6 +1407,7 @@ $result_floats{'references_to_top_no_top_output'} = {
           'normalized' => 'list'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -1387,6 +1424,7 @@ $result_floats{'references_to_top_no_top_output'} = {
         'float_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1401,6 +1439,7 @@ $result_floats{'references_to_top_no_top_output'} = {
           'normalized' => 'list'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index f5867186f3..954770e1d0 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -18,7 +18,7 @@ $result_trees{'refs_formatting'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'refs_formatting'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'refs_formatting'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -861,7 +863,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -872,7 +874,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1121,7 +1123,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1132,7 +1134,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2151,7 +2153,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2162,7 +2164,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2447,7 +2449,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2458,7 +2460,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2640,7 +2642,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'cross ref name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2651,7 +2653,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2786,7 +2788,7 @@ $result_trees{'refs_formatting'} = {
                       'text' => 'cross ref name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2887,7 +2889,8 @@ $result_trees{'refs_formatting'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3040,9 +3043,11 @@ $result_sectioning{'refs_formatting'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'chapter'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -3061,19 +3066,22 @@ $result_nodes{'refs_formatting'} = {
     'associated_section' => {
       'cmdname' => 'chapter',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'section_number' => 1
       }
     },
     'normalized' => 'chapter'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'refs_formatting'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'chapter'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'refs_formatting'} = [
diff --git a/tp/t/results/converters_tests/simplest_no_node_section.pl 
b/tp/t/results/converters_tests/simplest_no_node_section.pl
index b407975d9a..e3edcf9344 100644
--- a/tp/t/results/converters_tests/simplest_no_node_section.pl
+++ b/tp/t/results/converters_tests/simplest_no_node_section.pl
@@ -39,7 +39,7 @@ $result_trees{'simplest_no_node_section'} = {
                       'text' => 'simplest_no_node_section.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'simplest_no_node_section'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'simplest_no_node_section.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'simplest_no_node_section.texi',
                 'line_nr' => 3,
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index b439ac1f8b..ef67ab7a64 100644
--- a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -25,7 +25,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -79,7 +81,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -387,7 +389,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -396,9 +398,11 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -418,7 +422,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -664,7 +669,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -710,7 +715,9 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
             'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
           }
         ],
-        'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
+        'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -906,7 +913,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1442,7 +1449,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => '  '
       },
       'source_info' => {
@@ -1571,9 +1579,11 @@ $result_sectioning{'some_at_commands_in_ref_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1584,9 +1594,11 @@ $result_sectioning{'some_at_commands_in_ref_nodes'} = {
                   'extra' => {
                     'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1615,6 +1627,7 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1624,6 +1637,7 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1631,12 +1645,14 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1654,12 +1670,14 @@ $result_menus{'some_at_commands_in_ref_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/converters_tests/sp_in_example.pl 
b/tp/t/results/converters_tests/sp_in_example.pl
index 9267a7aa26..84ea07c81e 100644
--- a/tp/t/results/converters_tests/sp_in_example.pl
+++ b/tp/t/results/converters_tests/sp_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'sp_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -35,7 +35,7 @@ $result_trees{'sp_in_example'} = {
                           'text' => '1'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -46,7 +46,9 @@ $result_trees{'sp_in_example'} = {
                   'extra' => {
                     'misc_args' => [
                       '1'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -82,7 +84,7 @@ $result_trees{'sp_in_example'} = {
                           'text' => '1'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -93,7 +95,9 @@ $result_trees{'sp_in_example'} = {
                   'extra' => {
                     'misc_args' => [
                       '1'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -115,7 +119,7 @@ $result_trees{'sp_in_example'} = {
                           'text' => '2'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -126,7 +130,9 @@ $result_trees{'sp_in_example'} = {
                   'extra' => {
                     'misc_args' => [
                       '2'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -156,7 +162,7 @@ $result_trees{'sp_in_example'} = {
                           'text' => '2'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -167,7 +173,9 @@ $result_trees{'sp_in_example'} = {
                   'extra' => {
                     'misc_args' => [
                       '2'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -197,7 +205,7 @@ $result_trees{'sp_in_example'} = {
                           'text' => '1'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -208,7 +216,9 @@ $result_trees{'sp_in_example'} = {
                   'extra' => {
                     'misc_args' => [
                       '1'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -228,7 +238,7 @@ $result_trees{'sp_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -237,9 +247,11 @@ $result_trees{'sp_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
diff --git a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
index 5b306eac59..e9f745a6da 100644
--- a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -18,7 +18,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -222,7 +222,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -231,9 +231,11 @@ $result_trees{'spaces_in_empty_node_names'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -265,7 +267,9 @@ $result_trees{'spaces_in_empty_node_names'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -285,7 +289,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               'cmdname' => ' '
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -309,7 +313,9 @@ $result_trees{'spaces_in_empty_node_names'} = {
             ],
             'normalized' => '-'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -345,7 +351,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -368,7 +374,9 @@ $result_trees{'spaces_in_empty_node_names'} = {
             ],
             'normalized' => '-'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -400,7 +408,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -576,7 +584,9 @@ $result_trees{'spaces_in_empty_node_names'} = {
             ],
             'normalized' => '-'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -652,14 +662,16 @@ $result_nodes{'spaces_in_empty_node_names'} = {
       }
     ],
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'spaces_in_empty_node_names'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'spaces_in_empty_node_names'} = [
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index 46934d9571..a2018720c4 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -18,7 +18,7 @@ $result_trees{'spaces_in_node_names'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'spaces_in_node_names'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -234,7 +234,7 @@ $result_trees{'spaces_in_node_names'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -243,9 +243,11 @@ $result_trees{'spaces_in_node_names'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -277,7 +279,9 @@ $result_trees{'spaces_in_node_names'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -300,7 +304,7 @@ $result_trees{'spaces_in_node_names'} = {
               'cmdname' => ' '
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -331,7 +335,9 @@ $result_trees{'spaces_in_node_names'} = {
             'normalized' => 'a-'
           }
         ],
-        'normalized' => 'a-',
+        'normalized' => 'a-'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -370,7 +376,7 @@ $result_trees{'spaces_in_node_names'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -399,7 +405,9 @@ $result_trees{'spaces_in_node_names'} = {
             'normalized' => 'b-'
           }
         ],
-        'normalized' => 'b-',
+        'normalized' => 'b-'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -434,7 +442,7 @@ $result_trees{'spaces_in_node_names'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -631,7 +639,9 @@ $result_trees{'spaces_in_node_names'} = {
             'normalized' => 'c-'
           }
         ],
-        'normalized' => 'c-',
+        'normalized' => 'c-'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -727,24 +737,28 @@ $result_nodes{'spaces_in_node_names'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'a-'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'b-'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'c-'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -774,24 +788,28 @@ $result_menus{'spaces_in_node_names'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'a-'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'b-'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'c-'
               },
+              'info' => {},
               'structure' => {
                 'menu_prev' => {},
                 'menu_up' => {},
diff --git a/tp/t/results/converters_tests/table_in_display_in_example.pl 
b/tp/t/results/converters_tests/table_in_display_in_example.pl
index c454d07eb2..fc8550b76d 100644
--- a/tp/t/results/converters_tests/table_in_display_in_example.pl
+++ b/tp/t/results/converters_tests/table_in_display_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'table_in_display_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -24,7 +24,7 @@ $result_trees{'table_in_display_in_example'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -47,7 +47,7 @@ $result_trees{'table_in_display_in_example'} = {
                           'type' => 'command_as_argument'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -68,7 +68,7 @@ $result_trees{'table_in_display_in_example'} = {
                                       'text' => 'item'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -76,7 +76,7 @@ $result_trees{'table_in_display_in_example'} = {
                                 }
                               ],
                               'cmdname' => 'item',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -113,7 +113,7 @@ $result_trees{'table_in_display_in_example'} = {
                               'text' => 'table'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -122,9 +122,11 @@ $result_trees{'table_in_display_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'table'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 6,
@@ -133,7 +135,9 @@ $result_trees{'table_in_display_in_example'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
+                    'command_as_argument' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -150,7 +154,7 @@ $result_trees{'table_in_display_in_example'} = {
                           'text' => 'display'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -159,9 +163,11 @@ $result_trees{'table_in_display_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'display'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -183,7 +189,7 @@ $result_trees{'table_in_display_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -192,9 +198,11 @@ $result_trees{'table_in_display_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/converters_tests/table_in_example_in_display.pl 
b/tp/t/results/converters_tests/table_in_example_in_display.pl
index b6ed633ae7..1054d11f34 100644
--- a/tp/t/results/converters_tests/table_in_example_in_display.pl
+++ b/tp/t/results/converters_tests/table_in_example_in_display.pl
@@ -12,7 +12,7 @@ $result_trees{'table_in_example_in_display'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -24,7 +24,7 @@ $result_trees{'table_in_example_in_display'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -47,7 +47,7 @@ $result_trees{'table_in_example_in_display'} = {
                           'type' => 'command_as_argument'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -68,7 +68,7 @@ $result_trees{'table_in_example_in_display'} = {
                                       'text' => 'item'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -76,7 +76,7 @@ $result_trees{'table_in_example_in_display'} = {
                                 }
                               ],
                               'cmdname' => 'item',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -113,7 +113,7 @@ $result_trees{'table_in_example_in_display'} = {
                               'text' => 'table'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -122,9 +122,11 @@ $result_trees{'table_in_example_in_display'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'table'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 6,
@@ -133,7 +135,9 @@ $result_trees{'table_in_example_in_display'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
+                    'command_as_argument' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -150,7 +154,7 @@ $result_trees{'table_in_example_in_display'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -159,9 +163,11 @@ $result_trees{'table_in_example_in_display'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -183,7 +189,7 @@ $result_trees{'table_in_example_in_display'} = {
                       'text' => 'display'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -192,9 +198,11 @@ $result_trees{'table_in_example_in_display'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 4733e9ded2..01352c0907 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -17,7 +17,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'text' => 'test_deftypefnnewline.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -26,9 +26,11 @@ $result_trees{'test_deftypefnnewline'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'test_deftypefnnewline.info'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -48,7 +50,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -59,7 +61,9 @@ $result_trees{'test_deftypefnnewline'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -84,7 +88,7 @@ $result_trees{'test_deftypefnnewline'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -104,7 +108,9 @@ $result_trees{'test_deftypefnnewline'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -121,7 +127,7 @@ $result_trees{'test_deftypefnnewline'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -136,7 +142,8 @@ $result_trees{'test_deftypefnnewline'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -153,7 +160,7 @@ $result_trees{'test_deftypefnnewline'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -173,7 +180,9 @@ $result_trees{'test_deftypefnnewline'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -190,7 +199,7 @@ $result_trees{'test_deftypefnnewline'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -327,7 +336,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypefun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -336,9 +345,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -346,7 +357,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -465,7 +476,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -474,9 +485,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -484,7 +497,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -638,7 +651,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -647,9 +660,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -657,7 +672,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -798,7 +813,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -807,9 +822,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -817,7 +834,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -958,7 +975,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -967,9 +984,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -977,7 +996,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1131,7 +1150,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1140,9 +1159,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 33,
@@ -1150,7 +1171,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1255,7 +1276,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1264,9 +1285,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -1274,7 +1297,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1296,7 +1319,7 @@ $result_trees{'test_deftypefnnewline'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1307,7 +1330,9 @@ $result_trees{'test_deftypefnnewline'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1444,7 +1469,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypefun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1453,9 +1478,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 43,
@@ -1463,7 +1490,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1582,7 +1609,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1591,9 +1618,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 47,
@@ -1601,7 +1630,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1755,7 +1784,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1764,9 +1793,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 51,
@@ -1774,7 +1805,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1915,7 +1946,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1924,9 +1955,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 55,
@@ -1934,7 +1967,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2075,7 +2108,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2084,9 +2117,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 59,
@@ -2094,7 +2129,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2248,7 +2283,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2257,9 +2292,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 63,
@@ -2267,7 +2304,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2372,7 +2409,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2381,9 +2418,11 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 67,
@@ -2391,7 +2430,7 @@ $result_trees{'test_deftypefnnewline'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2401,7 +2440,8 @@ $result_trees{'test_deftypefnnewline'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2671,9 +2711,11 @@ $result_sectioning{'test_deftypefnnewline'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -2684,9 +2726,11 @@ $result_sectioning{'test_deftypefnnewline'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2715,10 +2759,12 @@ $result_nodes{'test_deftypefnnewline'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -2726,12 +2772,14 @@ $result_nodes{'test_deftypefnnewline'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -2747,6 +2795,7 @@ $result_menus{'test_deftypefnnewline'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/converters_tests/test_sp.pl 
b/tp/t/results/converters_tests/test_sp.pl
index 7f6f16c54d..9faab7e6ca 100644
--- a/tp/t/results/converters_tests/test_sp.pl
+++ b/tp/t/results/converters_tests/test_sp.pl
@@ -26,7 +26,7 @@ $result_trees{'test_sp'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -37,7 +37,9 @@ $result_trees{'test_sp'} = {
           'extra' => {
             'misc_args' => [
               '1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -78,7 +80,7 @@ $result_trees{'test_sp'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -89,7 +91,9 @@ $result_trees{'test_sp'} = {
           'extra' => {
             'misc_args' => [
               '1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -111,7 +115,7 @@ $result_trees{'test_sp'} = {
                   'text' => '2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -122,7 +126,9 @@ $result_trees{'test_sp'} = {
           'extra' => {
             'misc_args' => [
               '2'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -162,7 +168,7 @@ $result_trees{'test_sp'} = {
                   'text' => '2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -173,7 +179,9 @@ $result_trees{'test_sp'} = {
           'extra' => {
             'misc_args' => [
               '2'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -213,7 +221,7 @@ $result_trees{'test_sp'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -224,7 +232,9 @@ $result_trees{'test_sp'} = {
           'extra' => {
             'misc_args' => [
               '1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index c4adb2d2dc..7b56a01dab 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -278,7 +278,7 @@ $result_trees{'things_before_setfilename'} = {
                       'text' => 'float anchor'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 ',
                     'spaces_before_argument' => ' '
@@ -305,7 +305,7 @@ $result_trees{'things_before_setfilename'} = {
                           'text' => 'float'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -314,9 +314,11 @@ $result_trees{'things_before_setfilename'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'float'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
                     'line_nr' => 21,
@@ -329,11 +331,13 @@ $result_trees{'things_before_setfilename'} = {
                   {}
                 ],
                 'normalized' => 'float-anchor',
-                'spaces_before_argument' => ' ',
                 'type' => {
                   'normalized' => ''
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
                 'line_nr' => 19,
@@ -406,7 +410,7 @@ $result_trees{'things_before_setfilename'} = {
                       'text' => 'ta'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 ',
                     'spaces_before_argument' => ' '
@@ -468,7 +472,7 @@ $result_trees{'things_before_setfilename'} = {
                           'text' => 'float'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -477,9 +481,11 @@ $result_trees{'things_before_setfilename'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'float'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
                     'line_nr' => 30,
@@ -493,7 +499,6 @@ $result_trees{'things_before_setfilename'} = {
                   {}
                 ],
                 'normalized' => 'ta',
-                'spaces_before_argument' => ' ',
                 'type' => {
                   'content' => [
                     {}
@@ -501,6 +506,9 @@ $result_trees{'things_before_setfilename'} = {
                   'normalized' => 'Text'
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
                 'line_nr' => 26,
@@ -535,7 +543,7 @@ $result_trees{'things_before_setfilename'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -601,7 +609,7 @@ $result_trees{'things_before_setfilename'} = {
                           'text' => 'menu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -610,9 +618,11 @@ $result_trees{'things_before_setfilename'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
                     'line_nr' => 36,
@@ -639,7 +649,7 @@ $result_trees{'things_before_setfilename'} = {
                       'text' => 'index entry'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -658,7 +668,9 @@ $result_trees{'things_before_setfilename'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -681,7 +693,7 @@ $result_trees{'things_before_setfilename'} = {
                       'text' => 'cp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -692,7 +704,9 @@ $result_trees{'things_before_setfilename'} = {
               'extra' => {
                 'misc_args' => [
                   'cp'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -714,7 +728,7 @@ $result_trees{'things_before_setfilename'} = {
                       'text' => 'Text'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -723,7 +737,6 @@ $result_trees{'things_before_setfilename'} = {
               ],
               'cmdname' => 'listoffloats',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'type' => {
                   'content' => [
                     {}
@@ -731,6 +744,9 @@ $result_trees{'things_before_setfilename'} = {
                   'normalized' => 'Text'
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
                 'line_nr' => 42,
@@ -755,7 +771,7 @@ $result_trees{'things_before_setfilename'} = {
                       'text' => 'things_before_setfilename.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -764,9 +780,11 @@ $result_trees{'things_before_setfilename'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'things_before_setfilename.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
                 'line_nr' => 44,
@@ -792,7 +810,7 @@ $result_trees{'things_before_setfilename'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -812,7 +830,9 @@ $result_trees{'things_before_setfilename'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -829,7 +849,7 @@ $result_trees{'things_before_setfilename'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -844,7 +864,8 @@ $result_trees{'things_before_setfilename'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -861,7 +882,7 @@ $result_trees{'things_before_setfilename'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -881,7 +902,9 @@ $result_trees{'things_before_setfilename'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -898,7 +921,7 @@ $result_trees{'things_before_setfilename'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1003,7 +1026,8 @@ $result_trees{'things_before_setfilename'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1157,9 +1181,11 @@ $result_sectioning{'things_before_setfilename'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1170,9 +1196,11 @@ $result_sectioning{'things_before_setfilename'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1201,10 +1229,12 @@ $result_nodes{'things_before_setfilename'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1212,12 +1242,14 @@ $result_nodes{'things_before_setfilename'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1233,6 +1265,7 @@ $result_menus{'things_before_setfilename'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
@@ -1268,6 +1301,7 @@ $result_floats{'things_before_setfilename'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -1293,6 +1327,7 @@ $result_floats{'things_before_setfilename'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
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 6032156261..87220acdbb 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
@@ -278,7 +278,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'text' => 'float anchor'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 ',
                     'spaces_before_argument' => ' '
@@ -305,7 +305,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                           'text' => 'float'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -314,9 +314,11 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'float'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
                     'line_nr' => 21,
@@ -329,11 +331,13 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   {}
                 ],
                 'normalized' => 'float-anchor',
-                'spaces_before_argument' => ' ',
                 'type' => {
                   'normalized' => ''
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
                 'line_nr' => 19,
@@ -406,7 +410,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'text' => 'ta'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 ',
                     'spaces_before_argument' => ' '
@@ -468,7 +472,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                           'text' => 'float'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -477,9 +481,11 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'float'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
                     'line_nr' => 30,
@@ -493,7 +499,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   {}
                 ],
                 'normalized' => 'ta',
-                'spaces_before_argument' => ' ',
                 'type' => {
                   'content' => [
                     {}
@@ -501,6 +506,9 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'normalized' => 'Text'
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
                 'line_nr' => 26,
@@ -535,7 +543,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -601,7 +609,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                           'text' => 'menu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -610,9 +618,11 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
                     'line_nr' => 36,
@@ -639,7 +649,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'text' => 'index entry'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -658,7 +668,9 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -681,7 +693,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'text' => 'cp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -692,7 +704,9 @@ $result_trees{'things_before_setfilename_no_element'} = {
               'extra' => {
                 'misc_args' => [
                   'cp'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -714,7 +728,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'text' => 'Text'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -723,7 +737,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
               ],
               'cmdname' => 'listoffloats',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'type' => {
                   'content' => [
                     {}
@@ -731,6 +744,9 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   'normalized' => 'Text'
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
                 'line_nr' => 42,
@@ -755,7 +771,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'text' => 'things_before_setfilename_no_element.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -764,9 +780,11 @@ $result_trees{'things_before_setfilename_no_element'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'things_before_setfilename_no_element.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
                 'line_nr' => 44,
@@ -1024,6 +1042,7 @@ $result_floats{'things_before_setfilename_no_element'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -1049,6 +1068,7 @@ $result_floats{'things_before_setfilename_no_element'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index e0506a57ea..ac5cb023ce 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -18,7 +18,7 @@ $result_trees{'top_in_ref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'top_in_ref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'top_in_ref'} = {
               'text' => 'refs node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -868,7 +870,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -879,7 +881,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1128,7 +1130,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1139,7 +1141,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2158,7 +2160,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2169,7 +2171,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2454,7 +2456,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2465,7 +2467,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2647,7 +2649,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'cross ref name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2658,7 +2660,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'file name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2793,7 +2795,7 @@ $result_trees{'top_in_ref'} = {
                       'text' => 'cross ref name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2906,7 +2908,9 @@ $result_trees{'top_in_ref'} = {
             'normalized' => 'refs-node'
           }
         ],
-        'normalized' => 'refs-node',
+        'normalized' => 'refs-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3056,12 +3060,14 @@ $result_nodes{'top_in_ref'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'refs-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -3075,6 +3081,7 @@ $result_menus{'top_in_ref'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index 993c6c4d09..772e6fe54f 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -17,7 +17,7 @@ $result_trees{'block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -52,9 +52,11 @@ $result_trees{'block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -81,7 +83,7 @@ $result_trees{'block_commands'} = {
                   'text' => 'warning'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -107,7 +109,7 @@ $result_trees{'block_commands'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -116,9 +118,11 @@ $result_trees{'block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -126,7 +130,7 @@ $result_trees{'block_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -156,7 +160,7 @@ $result_trees{'block_commands'} = {
                   'text' => 'b float'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -237,7 +241,7 @@ $result_trees{'block_commands'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -246,9 +250,11 @@ $result_trees{'block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -262,7 +268,6 @@ $result_trees{'block_commands'} = {
               {}
             ],
             'normalized' => 'b-float',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -270,6 +275,9 @@ $result_trees{'block_commands'} = {
               'normalized' => 'a float'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 10,
@@ -344,6 +352,7 @@ $result_floats{'block_commands'} = {
           'normalized' => 'a float'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/coverage/cartouche.pl 
b/tp/t/results/coverage/cartouche.pl
index 2621614b11..55b0042687 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -12,7 +12,7 @@ $result_trees{'cartouche'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,9 +43,11 @@ $result_trees{'cartouche'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/coverage/cartouche_in_example.pl 
b/tp/t/results/coverage/cartouche_in_example.pl
index 8b098613f9..409820aa9d 100644
--- a/tp/t/results/coverage/cartouche_in_example.pl
+++ b/tp/t/results/coverage/cartouche_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'cartouche_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,7 @@ $result_trees{'cartouche_in_example'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,7 +59,7 @@ $result_trees{'cartouche_in_example'} = {
                           'text' => 'cartouche'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -68,9 +68,11 @@ $result_trees{'cartouche_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'cartouche'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -101,7 +103,7 @@ $result_trees{'cartouche_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -110,9 +112,11 @@ $result_trees{'cartouche_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/coverage/cartouche_in_quotation.pl 
b/tp/t/results/coverage/cartouche_in_quotation.pl
index e2fdc93747..15ebd0db68 100644
--- a/tp/t/results/coverage/cartouche_in_quotation.pl
+++ b/tp/t/results/coverage/cartouche_in_quotation.pl
@@ -12,7 +12,7 @@ $result_trees{'cartouche_in_quotation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,7 @@ $result_trees{'cartouche_in_quotation'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,7 +59,7 @@ $result_trees{'cartouche_in_quotation'} = {
                           'text' => 'cartouche'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -68,9 +68,11 @@ $result_trees{'cartouche_in_quotation'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'cartouche'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -101,7 +103,7 @@ $result_trees{'cartouche_in_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -110,9 +112,11 @@ $result_trees{'cartouche_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/coverage/center.pl b/tp/t/results/coverage/center.pl
index 41cae1492f..38460b7bed 100644
--- a/tp/t/results/coverage/center.pl
+++ b/tp/t/results/coverage/center.pl
@@ -40,7 +40,7 @@ $result_trees{'center'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -48,7 +48,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/command_in_end.pl 
b/tp/t/results/coverage/command_in_end.pl
index 873680d1b7..e8d59679db 100644
--- a/tp/t/results/coverage/command_in_end.pl
+++ b/tp/t/results/coverage/command_in_end.pl
@@ -12,7 +12,7 @@ $result_trees{'command_in_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -50,7 +50,7 @@ $result_trees{'command_in_end'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -59,7 +59,9 @@ $result_trees{'command_in_end'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'missing_argument' => 1,
+                    'missing_argument' => 1
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -79,7 +81,7 @@ $result_trees{'command_in_end'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -120,7 +122,7 @@ $result_trees{'command_in_end'} = {
                               }
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -129,9 +131,11 @@ $result_trees{'command_in_end'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'q'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 7,
@@ -149,7 +153,7 @@ $result_trees{'command_in_end'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -190,7 +194,7 @@ $result_trees{'command_in_end'} = {
                                   }
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -199,9 +203,11 @@ $result_trees{'command_in_end'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'qu'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 11,
@@ -219,7 +225,7 @@ $result_trees{'command_in_end'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -263,7 +269,7 @@ $result_trees{'command_in_end'} = {
                                       'text' => 'n'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -272,9 +278,11 @@ $result_trees{'command_in_end'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'quotn'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 15,
@@ -292,7 +300,7 @@ $result_trees{'command_in_end'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -334,7 +342,7 @@ $result_trees{'command_in_end'} = {
                                       'text' => 'uotation'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -343,9 +351,11 @@ $result_trees{'command_in_end'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'quotation'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 19,
@@ -367,7 +377,7 @@ $result_trees{'command_in_end'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -409,7 +419,7 @@ $result_trees{'command_in_end'} = {
                                       'text' => 'otation'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -418,9 +428,11 @@ $result_trees{'command_in_end'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'quotation'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 23,
@@ -442,7 +454,7 @@ $result_trees{'command_in_end'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -484,7 +496,7 @@ $result_trees{'command_in_end'} = {
                                       'text' => 'ation'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -493,9 +505,11 @@ $result_trees{'command_in_end'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'quotation'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 27,
@@ -517,7 +531,7 @@ $result_trees{'command_in_end'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
diff --git a/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
index e84024c21c..f58f925eda 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_command_after.pl
@@ -12,7 +12,7 @@ $result_trees{'command_in_end_expanded_raw_command_after'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -56,7 +56,7 @@ $result_trees{'command_in_end_expanded_raw_command_after'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +65,11 @@ $result_trees{'command_in_end_expanded_raw_command_after'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
index b4d5ded914..80953681d9 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_command_empty_after.pl
@@ -12,7 +12,7 @@ 
$result_trees{'command_in_end_expanded_raw_command_empty_after'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -51,7 +51,7 @@ 
$result_trees{'command_in_end_expanded_raw_command_empty_after'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -60,9 +60,11 @@ 
$result_trees{'command_in_end_expanded_raw_command_empty_after'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
index d301e075ea..2e2ce5c367 100644
--- a/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
+++ b/tp/t/results/coverage/command_in_end_expanded_raw_in_command.pl
@@ -12,7 +12,7 @@ $result_trees{'command_in_end_expanded_raw_in_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -50,7 +50,7 @@ $result_trees{'command_in_end_expanded_raw_in_command'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -59,7 +59,9 @@ $result_trees{'command_in_end_expanded_raw_in_command'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'missing_argument' => 1,
+                    'missing_argument' => 1
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
index a0d3faddf3..7371aeb472 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_before_command.pl
@@ -12,7 +12,7 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_before_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -54,7 +54,7 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_before_command'} = {
                       'text' => 'ex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -63,9 +63,11 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_before_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
index 69d780b2c9..330b826926 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_one_char_not_in_command.pl
@@ -12,7 +12,7 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_not_in_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -53,7 +53,7 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_not_in_command'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -62,9 +62,11 @@ 
$result_trees{'command_in_end_expanded_raw_one_char_not_in_command'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 't'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
index e31dbffd82..4327615aa2 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_before_command.pl
@@ -12,7 +12,7 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_before_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -54,7 +54,7 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_before_command'} = {
                       'text' => 'x'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -63,9 +63,11 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_before_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
index 033d25730b..a2952c8879 100644
--- 
a/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_expanded_raw_two_char_not_in_command.pl
@@ -12,7 +12,7 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_not_in_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -53,7 +53,7 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_not_in_command'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -62,9 +62,11 @@ 
$result_trees{'command_in_end_expanded_raw_two_char_not_in_command'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'te'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
index 248a91024f..afad76897d 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
@@ -12,7 +12,7 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -50,7 +50,7 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,9 +59,11 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
index 3f51245fa1..34148ca2a2 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
@@ -12,7 +12,7 @@ $result_trees{'command_in_end_ignored_raw_in_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
index 11df9d9ac5..cd43189d7f 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
@@ -12,7 +12,7 @@ 
$result_trees{'command_in_end_ignored_raw_one_char_before_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
index 0ac1d7b1a9..4f2fb098cd 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
@@ -12,7 +12,7 @@ 
$result_trees{'command_in_end_ignored_raw_one_char_not_in_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
index 00d9f2bb0c..6b96f29a7e 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
@@ -12,7 +12,7 @@ 
$result_trees{'command_in_end_ignored_raw_two_char_before_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
index a673fbf7fd..3883297dbd 100644
--- 
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
+++ 
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
@@ -12,7 +12,7 @@ 
$result_trees{'command_in_end_ignored_raw_two_char_not_in_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/coverage/commands.pl 
b/tp/t/results/coverage/commands.pl
index bcbcd2c141..06dafdf643 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -210,7 +210,7 @@ $result_trees{'commands'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -302,7 +302,7 @@ $result_trees{'commands'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -321,7 +321,9 @@ $result_trees{'commands'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -362,7 +364,7 @@ $result_trees{'commands'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -370,7 +372,8 @@ $result_trees{'commands'} = {
             }
           ],
           'cmdname' => 'majorheading',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index 901d400f93..8de056c182 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -17,7 +17,7 @@ $result_trees{'commands_in_math'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -135,7 +135,7 @@ $result_trees{'commands_in_math'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -144,9 +144,11 @@ $result_trees{'commands_in_math'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -168,7 +170,7 @@ $result_trees{'commands_in_math'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -868,7 +870,7 @@ $result_trees{'commands_in_math'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -877,9 +879,11 @@ $result_trees{'commands_in_math'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -901,7 +905,7 @@ $result_trees{'commands_in_math'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1525,7 +1529,7 @@ $result_trees{'commands_in_math'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1534,9 +1538,11 @@ $result_trees{'commands_in_math'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -1558,7 +1564,7 @@ $result_trees{'commands_in_math'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1851,7 +1857,7 @@ $result_trees{'commands_in_math'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1860,9 +1866,11 @@ $result_trees{'commands_in_math'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl 
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index 1e97c2bf8a..e0009a2a56 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -52,7 +52,7 @@ $result_trees{'comment_on_cartouche_line'} = {
                       'text' => 'cartouche'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -61,9 +61,11 @@ $result_trees{'comment_on_cartouche_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'comment_on_cartouche_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/comment_on_group_line.pl 
b/tp/t/results/coverage/comment_on_group_line.pl
index 39992dd54b..068217b25f 100644
--- a/tp/t/results/coverage/comment_on_group_line.pl
+++ b/tp/t/results/coverage/comment_on_group_line.pl
@@ -52,7 +52,7 @@ $result_trees{'comment_on_group_line'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -61,9 +61,11 @@ $result_trees{'comment_on_group_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'comment_on_group_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index d85496ca3f..d3281970bf 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -127,7 +127,7 @@ $result_trees{'def'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -136,9 +136,11 @@ $result_trees{'def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -146,7 +148,7 @@ $result_trees{'def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -341,7 +343,7 @@ $result_trees{'def'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -350,9 +352,11 @@ $result_trees{'def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -360,7 +364,7 @@ $result_trees{'def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -568,7 +572,9 @@ $result_trees{'def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -663,7 +669,9 @@ $result_trees{'def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -697,7 +705,9 @@ $result_trees{'def'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'name',
+                        'def_role' => 'name'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -759,7 +769,9 @@ $result_trees{'def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -793,7 +805,9 @@ $result_trees{'def'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'name',
+                        'def_role' => 'name'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'source_info' => {
@@ -855,7 +869,9 @@ $result_trees{'def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -950,7 +966,9 @@ $result_trees{'def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1066,7 +1084,9 @@ $result_trees{'def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1410,7 +1430,9 @@ $result_trees{'def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1547,7 +1569,9 @@ $result_trees{'def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1684,7 +1708,9 @@ $result_trees{'def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1716,7 +1742,7 @@ $result_trees{'def'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1725,9 +1751,11 @@ $result_trees{'def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -1735,7 +1763,7 @@ $result_trees{'def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/delcomment.pl 
b/tp/t/results/coverage/delcomment.pl
index 9fdae42f9b..3de5de1dc4 100644
--- a/tp/t/results/coverage/delcomment.pl
+++ b/tp/t/results/coverage/delcomment.pl
@@ -34,7 +34,7 @@ $result_trees{'delcomment'} = {
                       'text' => 'delcomment.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'delcomment'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'delcomment.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'delcomment.texi',
                 'line_nr' => 2,
diff --git a/tp/t/results/coverage/displaymath.pl 
b/tp/t/results/coverage/displaymath.pl
index bf5fdf468a..4d8080e0e7 100644
--- a/tp/t/results/coverage/displaymath.pl
+++ b/tp/t/results/coverage/displaymath.pl
@@ -21,7 +21,7 @@ $result_trees{'displaymath'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -74,7 +74,7 @@ $result_trees{'displaymath'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -83,9 +83,11 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -122,7 +124,7 @@ $result_trees{'displaymath'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -203,7 +205,7 @@ $result_trees{'displaymath'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -212,9 +214,11 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -245,7 +249,7 @@ $result_trees{'displaymath'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -358,7 +362,7 @@ $result_trees{'displaymath'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -367,9 +371,11 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -400,7 +406,7 @@ $result_trees{'displaymath'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -437,7 +443,7 @@ $result_trees{'displaymath'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -446,9 +452,11 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
diff --git a/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl 
b/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
index 35333eaf3f..06e9d09f21 100644
--- a/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
+++ b/tp/t/results/coverage/end_bad_end_argument_and_superfluous_arg.pl
@@ -12,7 +12,7 @@ $result_trees{'end_bad_end_argument_and_superfluous_arg'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -53,7 +53,7 @@ $result_trees{'end_bad_end_argument_and_superfluous_arg'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -62,9 +62,11 @@ $result_trees{'end_bad_end_argument_and_superfluous_arg'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => ': '
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
diff --git a/tp/t/results/coverage/exdent_and_commands.pl 
b/tp/t/results/coverage/exdent_and_commands.pl
index 7814885203..89d0b722f9 100644
--- a/tp/t/results/coverage/exdent_and_commands.pl
+++ b/tp/t/results/coverage/exdent_and_commands.pl
@@ -12,7 +12,7 @@ $result_trees{'exdent_and_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -46,7 +46,7 @@ $result_trees{'exdent_and_commands'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -84,7 +84,7 @@ $result_trees{'exdent_and_commands'} = {
                       'text' => ' and following'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -92,7 +92,7 @@ $result_trees{'exdent_and_commands'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -118,7 +118,7 @@ $result_trees{'exdent_and_commands'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -127,9 +127,11 @@ $result_trees{'exdent_and_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -151,7 +153,7 @@ $result_trees{'exdent_and_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -185,7 +187,7 @@ $result_trees{'exdent_and_commands'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -223,7 +225,7 @@ $result_trees{'exdent_and_commands'} = {
                       'text' => ' and following'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -231,7 +233,7 @@ $result_trees{'exdent_and_commands'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -257,7 +259,7 @@ $result_trees{'exdent_and_commands'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -266,9 +268,11 @@ $result_trees{'exdent_and_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
diff --git a/tp/t/results/coverage/exdent_and_formats.pl 
b/tp/t/results/coverage/exdent_and_formats.pl
index b736e10237..b710318094 100644
--- a/tp/t/results/coverage/exdent_and_formats.pl
+++ b/tp/t/results/coverage/exdent_and_formats.pl
@@ -12,7 +12,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -71,7 +71,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'Other line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -79,7 +79,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -105,7 +105,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -114,9 +114,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -143,7 +145,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -160,7 +162,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'exdented  and dash --- in example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -168,7 +170,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -194,7 +196,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'exdented'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -202,7 +204,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -228,7 +230,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -237,9 +239,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -275,7 +279,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -305,7 +309,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -314,9 +318,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -380,7 +386,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -410,7 +416,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -419,9 +425,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -443,7 +451,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -483,7 +491,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -492,9 +500,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -516,7 +526,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -537,7 +547,7 @@ $result_trees{'exdent_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -563,7 +573,7 @@ $result_trees{'exdent_and_formats'} = {
                           'text' => 'exdented nested other line'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -571,7 +581,7 @@ $result_trees{'exdent_and_formats'} = {
                     }
                   ],
                   'cmdname' => 'exdent',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -588,7 +598,7 @@ $result_trees{'exdent_and_formats'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -597,9 +607,11 @@ $result_trees{'exdent_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 45,
@@ -621,7 +633,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -630,9 +642,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 46,
@@ -654,7 +668,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -671,7 +685,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'exdented quotation line   and dash --- in 
quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -679,7 +693,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -696,7 +710,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -705,9 +719,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 50,
@@ -729,7 +745,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -755,7 +771,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'exdented quotation line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -763,7 +779,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '  '
               },
               'source_info' => {
@@ -780,7 +796,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -789,9 +805,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 55,
@@ -813,7 +831,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -830,7 +848,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'exdented quotation line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -838,7 +856,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '  '
               },
               'source_info' => {
@@ -864,7 +882,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -873,9 +891,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 60,
@@ -897,7 +917,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -914,7 +934,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'exdented quotation line oidfjslsd aez a aze 
azaz aeae za eaz az'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -922,7 +942,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -939,7 +959,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'azeaz az az az az'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -947,7 +967,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -964,7 +984,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -973,9 +993,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 65,
@@ -997,7 +1019,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1014,7 +1036,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'exdented quotation line oidfjslsd aez a aze 
azaz aeae za eaz az azeaz end line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1022,7 +1044,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1039,7 +1061,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'az az az az'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1047,7 +1069,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1064,7 +1086,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1073,9 +1095,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 70,
@@ -1097,7 +1121,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1123,7 +1147,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'ezkfjklezf'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -1131,7 +1155,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1148,7 +1172,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1157,9 +1181,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 75,
@@ -1181,7 +1207,7 @@ $result_trees{'exdent_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1198,7 +1224,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'very loooooooooooooooooooooooooooooooooong 
exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1206,7 +1232,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1223,7 +1249,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'az az az az'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1231,7 +1257,7 @@ $result_trees{'exdent_and_formats'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1248,7 +1274,7 @@ $result_trees{'exdent_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1257,9 +1283,11 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 80,
diff --git a/tp/t/results/coverage/flushleft_flushright.pl 
b/tp/t/results/coverage/flushleft_flushright.pl
index 31cd9e790a..cd02bb8b65 100644
--- a/tp/t/results/coverage/flushleft_flushright.pl
+++ b/tp/t/results/coverage/flushleft_flushright.pl
@@ -17,7 +17,7 @@ $result_trees{'flushleft_flushright'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'flushleft_flushright'} = {
                       'text' => 'flushleft'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'flushleft_flushright'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushleft'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -98,7 +100,7 @@ $result_trees{'flushleft_flushright'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -146,7 +148,7 @@ $result_trees{'flushleft_flushright'} = {
                       'text' => 'flushright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -155,9 +157,11 @@ $result_trees{'flushleft_flushright'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
diff --git a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl 
b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
index f8d133a9c4..bbcf61b4bc 100644
--- a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
+++ b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
@@ -17,7 +17,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -29,7 +29,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,7 +59,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                           'text' => 'flushleft'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -68,9 +68,11 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'flushleft'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -92,7 +94,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -122,7 +124,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                           'text' => 'flushright'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -131,9 +133,11 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'flushright'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -155,7 +159,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -164,9 +168,11 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
diff --git a/tp/t/results/coverage/flushright_example_nested.pl 
b/tp/t/results/coverage/flushright_example_nested.pl
index 8fcd1be720..5098e180f8 100644
--- a/tp/t/results/coverage/flushright_example_nested.pl
+++ b/tp/t/results/coverage/flushright_example_nested.pl
@@ -12,7 +12,7 @@ $result_trees{'flushright_example_nested'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -24,7 +24,7 @@ $result_trees{'flushright_example_nested'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -55,7 +55,7 @@ $result_trees{'flushright_example_nested'} = {
                           'text' => 'flushright'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -64,9 +64,11 @@ $result_trees{'flushright_example_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'flushright'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -88,7 +90,7 @@ $result_trees{'flushright_example_nested'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -97,9 +99,11 @@ $result_trees{'flushright_example_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -121,7 +125,7 @@ $result_trees{'flushright_example_nested'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -133,7 +137,7 @@ $result_trees{'flushright_example_nested'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -168,7 +172,7 @@ $result_trees{'flushright_example_nested'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -177,9 +181,11 @@ $result_trees{'flushright_example_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 13,
@@ -201,7 +207,7 @@ $result_trees{'flushright_example_nested'} = {
                       'text' => 'flushright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -210,9 +216,11 @@ $result_trees{'flushright_example_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
diff --git a/tp/t/results/coverage/flushright_not_closed.pl 
b/tp/t/results/coverage/flushright_not_closed.pl
index 653792673d..a2f605faeb 100644
--- a/tp/t/results/coverage/flushright_not_closed.pl
+++ b/tp/t/results/coverage/flushright_not_closed.pl
@@ -12,7 +12,7 @@ $result_trees{'flushright_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/coverage/formats_only_title_comments.pl 
b/tp/t/results/coverage/formats_only_title_comments.pl
index e429a6aeec..ba38a7a427 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -18,7 +18,7 @@ $result_trees{'formats_only_title_comments'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'formats_only_title_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -162,7 +164,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -171,9 +173,11 @@ $result_trees{'formats_only_title_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -182,7 +186,9 @@ $result_trees{'formats_only_title_comments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -210,7 +216,7 @@ $result_trees{'formats_only_title_comments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -257,7 +263,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -266,9 +272,11 @@ $result_trees{'formats_only_title_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -277,7 +285,9 @@ $result_trees{'formats_only_title_comments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -321,7 +331,9 @@ $result_trees{'formats_only_title_comments'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -351,7 +363,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -360,9 +372,11 @@ $result_trees{'formats_only_title_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -371,7 +385,9 @@ $result_trees{'formats_only_title_comments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -397,7 +413,7 @@ $result_trees{'formats_only_title_comments'} = {
                           'text' => '0.5 0.5'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -409,7 +425,9 @@ $result_trees{'formats_only_title_comments'} = {
                     'misc_args' => [
                       '0.5',
                       '0.5'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -462,7 +480,7 @@ $result_trees{'formats_only_title_comments'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -471,9 +489,11 @@ $result_trees{'formats_only_title_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -483,7 +503,9 @@ $result_trees{'formats_only_title_comments'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/formats_only_titles.pl 
b/tp/t/results/coverage/formats_only_titles.pl
index b187399110..923709495e 100644
--- a/tp/t/results/coverage/formats_only_titles.pl
+++ b/tp/t/results/coverage/formats_only_titles.pl
@@ -18,7 +18,7 @@ $result_trees{'formats_only_titles'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -49,7 +49,7 @@ $result_trees{'formats_only_titles'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -58,9 +58,11 @@ $result_trees{'formats_only_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -85,7 +87,7 @@ $result_trees{'formats_only_titles'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -116,7 +118,7 @@ $result_trees{'formats_only_titles'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -125,9 +127,11 @@ $result_trees{'formats_only_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -163,7 +167,7 @@ $result_trees{'formats_only_titles'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -194,7 +198,7 @@ $result_trees{'formats_only_titles'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -203,9 +207,11 @@ $result_trees{'formats_only_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -214,7 +220,9 @@ $result_trees{'formats_only_titles'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -242,7 +250,7 @@ $result_trees{'formats_only_titles'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -273,7 +281,7 @@ $result_trees{'formats_only_titles'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -282,9 +290,11 @@ $result_trees{'formats_only_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -293,7 +303,9 @@ $result_trees{'formats_only_titles'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -319,7 +331,7 @@ $result_trees{'formats_only_titles'} = {
                           'text' => '0.5 0.5'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -331,7 +343,9 @@ $result_trees{'formats_only_titles'} = {
                     'misc_args' => [
                       '0.5',
                       '0.5'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -368,7 +382,7 @@ $result_trees{'formats_only_titles'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -377,9 +391,11 @@ $result_trees{'formats_only_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -389,7 +405,9 @@ $result_trees{'formats_only_titles'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/formats_titles.pl 
b/tp/t/results/coverage/formats_titles.pl
index 0e01e7b675..875f2e1c2c 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -18,7 +18,7 @@ $result_trees{'formats_titles'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -75,7 +75,7 @@ $result_trees{'formats_titles'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -84,9 +84,11 @@ $result_trees{'formats_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -111,7 +113,7 @@ $result_trees{'formats_titles'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -168,7 +170,7 @@ $result_trees{'formats_titles'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -177,9 +179,11 @@ $result_trees{'formats_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -215,7 +219,7 @@ $result_trees{'formats_titles'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -250,7 +254,7 @@ $result_trees{'formats_titles'} = {
                               'text' => 'tab'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -258,7 +262,7 @@ $result_trees{'formats_titles'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -281,7 +285,7 @@ $result_trees{'formats_titles'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -290,9 +294,11 @@ $result_trees{'formats_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -301,7 +307,9 @@ $result_trees{'formats_titles'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -329,7 +337,7 @@ $result_trees{'formats_titles'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +372,7 @@ $result_trees{'formats_titles'} = {
                               'text' => 'vtab'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -383,7 +391,9 @@ $result_trees{'formats_titles'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -406,7 +416,7 @@ $result_trees{'formats_titles'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -415,9 +425,11 @@ $result_trees{'formats_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -426,7 +438,9 @@ $result_trees{'formats_titles'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -452,7 +466,7 @@ $result_trees{'formats_titles'} = {
                           'text' => '0.5 0.5'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -464,7 +478,9 @@ $result_trees{'formats_titles'} = {
                     'misc_args' => [
                       '0.5',
                       '0.5'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -565,7 +581,7 @@ $result_trees{'formats_titles'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -574,9 +590,11 @@ $result_trees{'formats_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -586,7 +604,9 @@ $result_trees{'formats_titles'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/group_beginning_and_end_on_line.pl 
b/tp/t/results/coverage/group_beginning_and_end_on_line.pl
index b0841e86fb..9eb3b56a3b 100644
--- a/tp/t/results/coverage/group_beginning_and_end_on_line.pl
+++ b/tp/t/results/coverage/group_beginning_and_end_on_line.pl
@@ -30,7 +30,7 @@ $result_trees{'group_beginning_and_end_on_line'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -39,9 +39,11 @@ $result_trees{'group_beginning_and_end_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -49,7 +51,7 @@ $result_trees{'group_beginning_and_end_on_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/group_not_closed.pl 
b/tp/t/results/coverage/group_not_closed.pl
index 7b48f5be02..3095d62bd4 100644
--- a/tp/t/results/coverage/group_not_closed.pl
+++ b/tp/t/results/coverage/group_not_closed.pl
@@ -12,7 +12,7 @@ $result_trees{'group_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/coverage/hyphenation.pl 
b/tp/t/results/coverage/hyphenation.pl
index 72402cafd8..80a5ec224f 100644
--- a/tp/t/results/coverage/hyphenation.pl
+++ b/tp/t/results/coverage/hyphenation.pl
@@ -22,7 +22,7 @@ $result_trees{'hyphenation'} = {
                   'text' => 'some-where'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'brace_command_arg'
diff --git a/tp/t/results/coverage/indentedblock.pl 
b/tp/t/results/coverage/indentedblock.pl
index 470c54acaa..62fed6aa95 100644
--- a/tp/t/results/coverage/indentedblock.pl
+++ b/tp/t/results/coverage/indentedblock.pl
@@ -12,7 +12,7 @@ $result_trees{'indentedblock'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -56,7 +56,7 @@ $result_trees{'indentedblock'} = {
                       'text' => 'indentedblock'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +65,11 @@ $result_trees{'indentedblock'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'indentedblock'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/coverage/insertcopying.pl 
b/tp/t/results/coverage/insertcopying.pl
index fe1a79206b..6aa85da208 100644
--- a/tp/t/results/coverage/insertcopying.pl
+++ b/tp/t/results/coverage/insertcopying.pl
@@ -12,7 +12,7 @@ $result_trees{'insertcopying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -38,7 +38,7 @@ $result_trees{'insertcopying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -64,7 +64,7 @@ $result_trees{'insertcopying'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -73,9 +73,11 @@ $result_trees{'insertcopying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
@@ -97,7 +99,7 @@ $result_trees{'insertcopying'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -106,9 +108,11 @@ $result_trees{'insertcopying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/coverage/invalid_U.pl 
b/tp/t/results/coverage/invalid_U.pl
index 06ea0c3f78..f1e8815dff 100644
--- a/tp/t/results/coverage/invalid_U.pl
+++ b/tp/t/results/coverage/invalid_U.pl
@@ -152,7 +152,7 @@ $result_trees{'invalid_U'} = {
                       'text' => '0023'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -198,7 +198,7 @@ $result_trees{'invalid_U'} = {
                       'text' => 'wxyz'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
diff --git a/tp/t/results/coverage/item_container.pl 
b/tp/t/results/coverage/item_container.pl
index a8282fbf8d..294acb2880 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -22,7 +22,7 @@ $result_trees{'item_container'} = {
                   'text' => '+'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'item_container'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'item_container'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -84,7 +86,7 @@ $result_trees{'item_container'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -112,7 +114,7 @@ $result_trees{'item_container'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -160,7 +162,7 @@ $result_trees{'item_container'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -169,9 +171,11 @@ $result_trees{'item_container'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -180,7 +184,9 @@ $result_trees{'item_container'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -203,7 +209,7 @@ $result_trees{'item_container'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -246,7 +252,7 @@ $result_trees{'item_container'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -255,9 +261,11 @@ $result_trees{'item_container'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
diff --git a/tp/t/results/coverage/math.pl b/tp/t/results/coverage/math.pl
index 805ca3aae1..14631f4809 100644
--- a/tp/t/results/coverage/math.pl
+++ b/tp/t/results/coverage/math.pl
@@ -280,7 +280,7 @@ $result_trees{'math'} = {
                 }
               ],
               'cmdname' => 'math',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index ce9bc3012e..a1adf0796d 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -26,7 +26,7 @@ $result_trees{'multitable'} = {
                           'text' => '0.6 0.4'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -38,7 +38,9 @@ $result_trees{'multitable'} = {
                     'misc_args' => [
                       '0.6',
                       '0.4'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -242,7 +244,7 @@ $result_trees{'multitable'} = {
                                       'text' => 'index entry within multitable'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -261,7 +263,9 @@ $result_trees{'multitable'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
                                   'index_type_command' => 'cindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -335,7 +339,7 @@ $result_trees{'multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -344,9 +348,11 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -356,7 +362,9 @@ $result_trees{'multitable'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -394,7 +402,7 @@ $result_trees{'multitable'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -475,7 +483,7 @@ $result_trees{'multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -484,9 +492,11 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -509,7 +519,9 @@ $result_trees{'multitable'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/nested_block_commands.pl 
b/tp/t/results/coverage/nested_block_commands.pl
index 7642fc2e30..d33a687f0f 100644
--- a/tp/t/results/coverage/nested_block_commands.pl
+++ b/tp/t/results/coverage/nested_block_commands.pl
@@ -12,7 +12,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,7 +59,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -68,9 +68,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -92,7 +94,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -101,9 +103,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -125,7 +129,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -137,7 +141,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -163,7 +167,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -172,9 +176,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 11,
@@ -196,7 +202,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +211,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -229,7 +237,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -250,7 +258,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -276,7 +284,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -285,9 +293,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 18,
@@ -318,7 +328,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -327,9 +337,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -351,7 +363,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -377,7 +389,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -403,7 +415,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -412,9 +424,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 27,
@@ -436,7 +450,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -445,9 +459,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -469,7 +485,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -500,7 +516,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -526,7 +542,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -535,9 +551,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 36,
@@ -559,7 +577,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -568,9 +586,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -592,7 +612,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -618,7 +638,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -644,7 +664,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -653,9 +673,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 44,
@@ -677,7 +699,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -686,9 +708,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 45,
@@ -710,7 +734,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -722,7 +746,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -753,7 +777,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -762,9 +786,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 51,
@@ -786,7 +812,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -795,9 +821,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 52,
@@ -819,7 +847,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -831,7 +859,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -867,7 +895,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -876,9 +904,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 59,
@@ -900,7 +930,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -909,9 +939,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 60,
@@ -933,7 +965,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -945,7 +977,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -976,7 +1008,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -985,9 +1017,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 66,
@@ -1009,7 +1043,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1018,9 +1052,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 67,
@@ -1042,7 +1078,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1054,7 +1090,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1080,7 +1116,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1089,9 +1125,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 72,
@@ -1127,7 +1165,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1136,9 +1174,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 75,
@@ -1160,7 +1200,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1172,7 +1212,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1198,7 +1238,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1207,9 +1247,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 80,
@@ -1245,7 +1287,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1254,9 +1296,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 83,
@@ -1278,7 +1322,7 @@ $result_trees{'nested_block_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1290,7 +1334,7 @@ $result_trees{'nested_block_commands'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1316,7 +1360,7 @@ $result_trees{'nested_block_commands'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1325,9 +1369,11 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 88,
@@ -1368,7 +1414,7 @@ $result_trees{'nested_block_commands'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1377,9 +1423,11 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 92,
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index a73d17779b..edf478b08d 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -17,7 +17,7 @@ $result_trees{'preformatted'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -52,7 +52,7 @@ $result_trees{'preformatted'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -61,9 +61,11 @@ $result_trees{'preformatted'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -85,7 +87,7 @@ $result_trees{'preformatted'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -108,7 +110,7 @@ $result_trees{'preformatted'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -129,7 +131,7 @@ $result_trees{'preformatted'} = {
                                   'text' => 'item in table in format'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -148,7 +150,9 @@ $result_trees{'preformatted'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
                               'index_type_command' => 'vtable'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -190,7 +194,7 @@ $result_trees{'preformatted'} = {
                           'text' => 'vtable'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -199,9 +203,11 @@ $result_trees{'preformatted'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'vtable'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 13,
@@ -210,7 +216,9 @@ $result_trees{'preformatted'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -227,7 +235,7 @@ $result_trees{'preformatted'} = {
                       'text' => 'format'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -236,9 +244,11 @@ $result_trees{'preformatted'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'format'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 6498d35b8c..67469e8d84 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -25,7 +25,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               'text' => 'node! After punc'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -46,7 +46,9 @@ $result_trees{'punctuation_in_line_commands'} = {
             'normalized' => 'node_0021-After-punc'
           }
         ],
-        'normalized' => 'node_0021-After-punc',
+        'normalized' => 'node_0021-After-punc'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -63,7 +65,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               'text' => 'top! After punc'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -112,7 +114,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                               'text' => 'item! After punc'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -120,7 +122,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -143,7 +145,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -152,9 +154,11 @@ $result_trees{'punctuation_in_line_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -163,7 +167,9 @@ $result_trees{'punctuation_in_line_commands'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -185,7 +191,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'text' => 'quotation arg! After punc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -211,7 +217,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                       'text' => 'exdent quotation! After punc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -219,7 +225,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -236,7 +242,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -245,9 +251,11 @@ $result_trees{'punctuation_in_line_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -255,7 +263,7 @@ $result_trees{'punctuation_in_line_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -285,7 +293,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'text' => 'float label! After punc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -342,7 +350,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -351,9 +359,11 @@ $result_trees{'punctuation_in_line_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -368,7 +378,6 @@ $result_trees{'punctuation_in_line_commands'} = {
             ],
             'normalized' => 'float-label_0021-After-punc',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -376,6 +385,9 @@ $result_trees{'punctuation_in_line_commands'} = {
               'normalized' => 'float type! After punc'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 14,
@@ -403,7 +415,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'text' => 'label with caption'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -460,7 +472,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -469,9 +481,11 @@ $result_trees{'punctuation_in_line_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -486,7 +500,6 @@ $result_trees{'punctuation_in_line_commands'} = {
               {}
             ],
             'normalized' => 'label-with-caption',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -494,6 +507,9 @@ $result_trees{'punctuation_in_line_commands'} = {
               'normalized' => 'float type! After punc'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 19,
@@ -513,7 +529,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'text' => 'float type! After punc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -522,7 +538,6 @@ $result_trees{'punctuation_in_line_commands'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -530,6 +545,9 @@ $result_trees{'punctuation_in_line_commands'} = {
               'normalized' => 'float type! After punc'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 24,
@@ -549,7 +567,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'text' => 'index! After punc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -569,7 +587,9 @@ $result_trees{'punctuation_in_line_commands'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -592,7 +612,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'text' => 'heading! After punc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -600,7 +620,8 @@ $result_trees{'punctuation_in_line_commands'} = {
             }
           ],
           'cmdname' => 'heading',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -649,7 +670,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'text' => 'center! After punc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -657,7 +678,7 @@ $result_trees{'punctuation_in_line_commands'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -679,7 +700,7 @@ $result_trees{'punctuation_in_line_commands'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -690,7 +711,9 @@ $result_trees{'punctuation_in_line_commands'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -725,7 +748,8 @@ $result_trees{'punctuation_in_line_commands'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -838,9 +862,11 @@ $result_sectioning{'punctuation_in_line_commands'} = {
             'extra' => {
               'isindex' => 1,
               'normalized' => 'node_0021-After-punc'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -858,11 +884,13 @@ $result_nodes{'punctuation_in_line_commands'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
     'normalized' => 'node_0021-After-punc'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'punctuation_in_line_commands'} = {
@@ -870,7 +898,8 @@ $result_menus{'punctuation_in_line_commands'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'node_0021-After-punc'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'punctuation_in_line_commands'} = [];
@@ -884,6 +913,7 @@ $result_floats{'punctuation_in_line_commands'} = {
         'float_section' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'float-label_0021-After-punc',
@@ -902,6 +932,7 @@ $result_floats{'punctuation_in_line_commands'} = {
           'normalized' => 'float type! After punc'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -926,6 +957,7 @@ $result_floats{'punctuation_in_line_commands'} = {
           'normalized' => 'float type! After punc'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 2
       }
diff --git a/tp/t/results/coverage/quotation_author.pl 
b/tp/t/results/coverage/quotation_author.pl
index e28e671845..550c0ce65f 100644
--- a/tp/t/results/coverage/quotation_author.pl
+++ b/tp/t/results/coverage/quotation_author.pl
@@ -12,7 +12,7 @@ $result_trees{'quotation_author'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -34,7 +34,7 @@ $result_trees{'quotation_author'} = {
                       'text' => 'First Author'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,7 +43,9 @@ $result_trees{'quotation_author'} = {
               ],
               'cmdname' => 'author',
               'extra' => {
-                'quotation' => {},
+                'quotation' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -87,7 +89,7 @@ $result_trees{'quotation_author'} = {
                           'text' => 'cond author'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -96,7 +98,9 @@ $result_trees{'quotation_author'} = {
                   ],
                   'cmdname' => 'author',
                   'extra' => {
-                    'quotation' => {},
+                    'quotation' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -125,7 +129,7 @@ $result_trees{'quotation_author'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -134,9 +138,11 @@ $result_trees{'quotation_author'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/coverage/raggedright.pl 
b/tp/t/results/coverage/raggedright.pl
index ecb3af5e3f..905da24e53 100644
--- a/tp/t/results/coverage/raggedright.pl
+++ b/tp/t/results/coverage/raggedright.pl
@@ -17,7 +17,7 @@ $result_trees{'raggedright'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'raggedright'} = {
                       'text' => 'raggedright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -52,9 +52,11 @@ $result_trees{'raggedright'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'raggedright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/coverage/setfilename_in_paragraph.pl 
b/tp/t/results/coverage/setfilename_in_paragraph.pl
index 3c9b0502bb..e41ae5c1be 100644
--- a/tp/t/results/coverage/setfilename_in_paragraph.pl
+++ b/tp/t/results/coverage/setfilename_in_paragraph.pl
@@ -26,7 +26,7 @@ $result_trees{'setfilename_in_paragraph'} = {
                   'text' => 'filename.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -35,9 +35,11 @@ $result_trees{'setfilename_in_paragraph'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'filename.info'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
diff --git a/tp/t/results/coverage/spaces_after_braced_command.pl 
b/tp/t/results/coverage/spaces_after_braced_command.pl
index 8265749054..ffe2e790d1 100644
--- a/tp/t/results/coverage/spaces_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_after_braced_command.pl
@@ -130,7 +130,7 @@ $result_trees{'spaces_after_braced_command'} = {
 '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
diff --git a/tp/t/results/coverage/symbol_after_block.pl 
b/tp/t/results/coverage/symbol_after_block.pl
index 3bb9b49e53..a00d5b4f40 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -12,7 +12,7 @@ $result_trees{'symbol_after_block'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -38,7 +38,7 @@ $result_trees{'symbol_after_block'} = {
                       'text' => 'html. On the line.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -47,9 +47,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html. On the line.'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'symbol_after_block'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -103,7 +105,7 @@ $result_trees{'symbol_after_block'} = {
                       'text' => ' On the line.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -112,9 +114,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html@ On the line.'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -150,7 +154,7 @@ $result_trees{'symbol_after_block'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -172,7 +176,7 @@ $result_trees{'symbol_after_block'} = {
                       'text' => 'verbatim;'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -181,9 +185,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim;'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -205,7 +211,7 @@ $result_trees{'symbol_after_block'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -230,7 +236,7 @@ $result_trees{'symbol_after_block'} = {
                       'cmdname' => '@'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -239,9 +245,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim@'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -288,7 +296,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -309,7 +317,7 @@ $result_trees{'symbol_after_block'} = {
                               'text' => 'a'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -317,7 +325,7 @@ $result_trees{'symbol_after_block'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -354,7 +362,7 @@ $result_trees{'symbol_after_block'} = {
                       'text' => 'table+'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -363,9 +371,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table+'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -374,7 +384,9 @@ $result_trees{'symbol_after_block'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -402,7 +414,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -423,7 +435,7 @@ $result_trees{'symbol_after_block'} = {
                               'text' => 'a'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -431,7 +443,7 @@ $result_trees{'symbol_after_block'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -471,7 +483,7 @@ $result_trees{'symbol_after_block'} = {
                       'cmdname' => '@'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -480,9 +492,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table@'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -491,7 +505,9 @@ $result_trees{'symbol_after_block'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -533,7 +549,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -576,7 +592,7 @@ $result_trees{'symbol_after_block'} = {
                       'text' => 'itemize\'\''
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -585,9 +601,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize\'\''
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
@@ -596,7 +614,9 @@ $result_trees{'symbol_after_block'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -624,7 +644,7 @@ $result_trees{'symbol_after_block'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -670,7 +690,7 @@ $result_trees{'symbol_after_block'} = {
                       'cmdname' => '@'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -679,9 +699,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize@'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 39,
@@ -690,7 +712,9 @@ $result_trees{'symbol_after_block'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -730,7 +754,7 @@ $result_trees{'symbol_after_block'} = {
                           'text' => '6 7'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -742,7 +766,9 @@ $result_trees{'symbol_after_block'} = {
                     'misc_args' => [
                       '6',
                       '7'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -893,7 +919,7 @@ $result_trees{'symbol_after_block'} = {
                       'text' => 'multitable^'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -902,9 +928,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable^'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 46,
@@ -914,7 +942,9 @@ $result_trees{'symbol_after_block'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -940,7 +970,7 @@ $result_trees{'symbol_after_block'} = {
                           'text' => '6 7'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -952,7 +982,9 @@ $result_trees{'symbol_after_block'} = {
                     'misc_args' => [
                       '6',
                       '7'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1106,7 +1138,7 @@ $result_trees{'symbol_after_block'} = {
                       'cmdname' => '{'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1115,9 +1147,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable{'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 51,
@@ -1127,7 +1161,9 @@ $result_trees{'symbol_after_block'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1158,7 +1194,7 @@ $result_trees{'symbol_after_block'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1184,7 +1220,7 @@ $result_trees{'symbol_after_block'} = {
                       'text' => 'flushleft!'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1193,9 +1229,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushleft!'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 57,
@@ -1217,7 +1255,7 @@ $result_trees{'symbol_after_block'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1246,7 +1284,7 @@ $result_trees{'symbol_after_block'} = {
                       'cmdname' => '@'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1255,9 +1293,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushleft@'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 61,
@@ -1293,7 +1333,7 @@ $result_trees{'symbol_after_block'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1319,7 +1359,7 @@ $result_trees{'symbol_after_block'} = {
                       'text' => 'copying*'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1328,9 +1368,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying*'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 67,
@@ -1352,7 +1394,7 @@ $result_trees{'symbol_after_block'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1381,7 +1423,7 @@ $result_trees{'symbol_after_block'} = {
                       'cmdname' => '@'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1390,9 +1432,11 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying@'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 71,
diff --git a/tp/t/results/coverage/symbol_after_command.pl 
b/tp/t/results/coverage/symbol_after_command.pl
index c691b22cac..020e93112e 100644
--- a/tp/t/results/coverage/symbol_after_command.pl
+++ b/tp/t/results/coverage/symbol_after_command.pl
@@ -23,7 +23,7 @@ $result_trees{'symbol_after_command'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -44,7 +44,7 @@ $result_trees{'symbol_after_command'} = {
                               'text' => '. dot'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -76,7 +76,7 @@ $result_trees{'symbol_after_command'} = {
                               'text' => ', comma'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -114,7 +114,7 @@ $result_trees{'symbol_after_command'} = {
                               'cmdname' => '@'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -152,7 +152,7 @@ $result_trees{'symbol_after_command'} = {
                               'cmdname' => '{'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -184,7 +184,7 @@ $result_trees{'symbol_after_command'} = {
                               'text' => '! exclam'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -216,7 +216,7 @@ $result_trees{'symbol_after_command'} = {
                               'text' => '\'\' quotes'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -248,7 +248,7 @@ $result_trees{'symbol_after_command'} = {
                               'text' => ': colon'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -276,7 +276,7 @@ $result_trees{'symbol_after_command'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -285,9 +285,11 @@ $result_trees{'symbol_after_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -296,7 +298,9 @@ $result_trees{'symbol_after_command'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index f620d03040..79337be053 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -28,7 +28,7 @@ $result_trees{'table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -49,7 +49,7 @@ $result_trees{'table'} = {
                               'text' => 'table item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -57,7 +57,7 @@ $result_trees{'table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -74,7 +74,7 @@ $result_trees{'table'} = {
                               'text' => 'table itemx'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -82,7 +82,7 @@ $result_trees{'table'} = {
                         }
                       ],
                       'cmdname' => 'itemx',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -124,7 +124,7 @@ $result_trees{'table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -133,9 +133,11 @@ $result_trees{'table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -144,7 +146,9 @@ $result_trees{'table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -221,7 +225,7 @@ $result_trees{'table'} = {
                           'text' => 'index entry'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -240,7 +244,9 @@ $result_trees{'table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -270,7 +276,7 @@ $result_trees{'table'} = {
                               'text' => 'vtable item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -289,7 +295,9 @@ $result_trees{'table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -324,7 +332,7 @@ $result_trees{'table'} = {
                                   'text' => 'key'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -343,7 +351,9 @@ $result_trees{'table'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'ky',
                               'index_type_command' => 'kindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -380,7 +390,9 @@ $result_trees{'table'} = {
 '
                                 ]
                               }
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_after_argument' => ' '
                           },
                           'type' => 'line_arg'
@@ -398,7 +410,9 @@ $result_trees{'table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -431,7 +445,7 @@ $result_trees{'table'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -440,9 +454,11 @@ $result_trees{'table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -451,7 +467,9 @@ $result_trees{'table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -479,7 +497,7 @@ $result_trees{'table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -500,7 +518,7 @@ $result_trees{'table'} = {
                               'text' => 'unknown command after indicating 
command'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -508,7 +526,7 @@ $result_trees{'table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -531,7 +549,7 @@ $result_trees{'table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -540,9 +558,11 @@ $result_trees{'table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -551,7 +571,9 @@ $result_trees{'table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/table_command_comment.pl 
b/tp/t/results/coverage/table_command_comment.pl
index 9846017e63..e4da2b235f 100644
--- a/tp/t/results/coverage/table_command_comment.pl
+++ b/tp/t/results/coverage/table_command_comment.pl
@@ -58,7 +58,7 @@ $result_trees{'table_command_comment'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -66,7 +66,7 @@ $result_trees{'table_command_comment'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -94,9 +94,11 @@ $result_trees{'table_command_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -105,7 +107,9 @@ $result_trees{'table_command_comment'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/test_errormsg.pl 
b/tp/t/results/coverage/test_errormsg.pl
index 9f22b54abf..8a74bbaac5 100644
--- a/tp/t/results/coverage/test_errormsg.pl
+++ b/tp/t/results/coverage/test_errormsg.pl
@@ -84,7 +84,7 @@ $result_trees{'test_errormsg'} = {
                       'text' => 'with surrounding spaces'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '   ',
                     'spaces_before_argument' => '  '
                   },
diff --git a/tp/t/results/coverage/titlefont_in_center.pl 
b/tp/t/results/coverage/titlefont_in_center.pl
index b95270bfb0..fea6c81a1d 100644
--- a/tp/t/results/coverage/titlefont_in_center.pl
+++ b/tp/t/results/coverage/titlefont_in_center.pl
@@ -37,7 +37,7 @@ $result_trees{'titlefont_in_center'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -45,7 +45,7 @@ $result_trees{'titlefont_in_center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/coverage/verbatiminclude.pl 
b/tp/t/results/coverage/verbatiminclude.pl
index 98dfb86834..11f2fc835d 100644
--- a/tp/t/results/coverage/verbatiminclude.pl
+++ b/tp/t/results/coverage/verbatiminclude.pl
@@ -22,7 +22,7 @@ $result_trees{'verbatiminclude'} = {
                   'text' => 'incl-incl.txi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -32,9 +32,11 @@ $result_trees{'verbatiminclude'} = {
           'cmdname' => 'verbatiminclude',
           'extra' => {
             'input_perl_encoding' => 'utf-8',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'incl-incl.txi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
diff --git a/tp/t/results/coverage_braces/abbr_acronym.pl 
b/tp/t/results/coverage_braces/abbr_acronym.pl
index a0758b607d..730780de52 100644
--- a/tp/t/results/coverage_braces/abbr_acronym.pl
+++ b/tp/t/results/coverage_braces/abbr_acronym.pl
@@ -234,7 +234,7 @@ $result_trees{'abbr_acronym'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
diff --git a/tp/t/results/coverage_braces/caption_not_closed.pl 
b/tp/t/results/coverage_braces/caption_not_closed.pl
index d441283fe0..c5720c709b 100644
--- a/tp/t/results/coverage_braces/caption_not_closed.pl
+++ b/tp/t/results/coverage_braces/caption_not_closed.pl
@@ -17,7 +17,7 @@ $result_trees{'caption_not_closed'} = {
                   'text' => 'Text'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +101,7 @@ $result_trees{'caption_not_closed'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -110,9 +110,11 @@ $result_trees{'caption_not_closed'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -122,7 +124,6 @@ $result_trees{'caption_not_closed'} = {
           ],
           'extra' => {
             'caption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -130,6 +131,9 @@ $result_trees{'caption_not_closed'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -211,7 +215,8 @@ $result_floats{'caption_not_closed'} = {
           ],
           'normalized' => 'Text'
         }
-      }
+      },
+      'info' => {}
     }
   ]
 };
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 6d7c1fa384..ed97716f4e 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -18,7 +18,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'contain_plain_text_nestings'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -70,7 +72,8 @@ $result_trees{'contain_plain_text_nestings'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -87,7 +90,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -108,7 +111,9 @@ $result_trees{'contain_plain_text_nestings'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -125,7 +130,7 @@ $result_trees{'contain_plain_text_nestings'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -313,7 +318,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -335,7 +340,9 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'index_type_command' => 'cindex',
                   'sortas' => ' text'
                 },
-                'sortas' => ' text',
+                'sortas' => ' text'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -394,7 +401,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                               'text' => 'cross in w'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -454,7 +461,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                               'text' => 'cross in hyphenation'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -515,7 +522,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                               'text' => 'cross in key'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -586,7 +593,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                                       'text' => 'cross in sortas'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'type' => 'brace_command_arg'
@@ -623,7 +630,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -645,7 +652,9 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'index_type_command' => 'cindex',
                   'sortas' => ' text'
                 },
-                'sortas' => ' text',
+                'sortas' => ' text'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -671,7 +680,7 @@ $result_trees{'contain_plain_text_nestings'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -682,7 +691,9 @@ $result_trees{'contain_plain_text_nestings'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -692,7 +703,8 @@ $result_trees{'contain_plain_text_nestings'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -771,9 +783,11 @@ $result_sectioning{'contain_plain_text_nestings'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -785,9 +799,11 @@ $result_sectioning{'contain_plain_text_nestings'} = {
                     'isindex' => 1,
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -816,10 +832,12 @@ $result_nodes{'contain_plain_text_nestings'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -827,6 +845,7 @@ $result_nodes{'contain_plain_text_nestings'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -834,6 +853,7 @@ $result_nodes{'contain_plain_text_nestings'} = {
         'isindex' => 1,
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -849,6 +869,7 @@ $result_menus{'contain_plain_text_nestings'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/coverage_braces/empty_images.pl 
b/tp/t/results/coverage_braces/empty_images.pl
index b9057a59d4..2a739f9989 100644
--- a/tp/t/results/coverage_braces/empty_images.pl
+++ b/tp/t/results/coverage_braces/empty_images.pl
@@ -37,7 +37,7 @@ $result_trees{'empty_images'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -64,7 +64,7 @@ $result_trees{'empty_images'} = {
                   'text' => 'cc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'brace_command_arg'
diff --git a/tp/t/results/coverage_braces/empty_line_in_email.pl 
b/tp/t/results/coverage_braces/empty_line_in_email.pl
index 186d788725..7ed4faba70 100644
--- a/tp/t/results/coverage_braces/empty_line_in_email.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_email.pl
@@ -21,7 +21,7 @@ $result_trees{'empty_line_in_email'} = {
                       'type' => 'empty_line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' 
 '
                   },
diff --git a/tp/t/results/coverage_braces/empty_ref.pl 
b/tp/t/results/coverage_braces/empty_ref.pl
index f82399e6fe..3c8c2a4eff 100644
--- a/tp/t/results/coverage_braces/empty_ref.pl
+++ b/tp/t/results/coverage_braces/empty_ref.pl
@@ -62,7 +62,7 @@ $result_trees{'empty_ref'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -85,7 +85,7 @@ $result_trees{'empty_ref'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -96,7 +96,7 @@ $result_trees{'empty_ref'} = {
                       'text' => 'arg'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/coverage_braces/empty_second_email_argument.pl 
b/tp/t/results/coverage_braces/empty_second_email_argument.pl
index 062d3902e2..4315f94164 100644
--- a/tp/t/results/coverage_braces/empty_second_email_argument.pl
+++ b/tp/t/results/coverage_braces/empty_second_email_argument.pl
@@ -25,13 +25,13 @@ $result_trees{'empty_second_email_argument'} = {
                       'text' => 'b.c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
                 },
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
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 227cf692bb..71863b6530 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,7 +37,7 @@ $result_trees{'footnote_ending_on_empty_line'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index 54c0016e79..4de4721805 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -18,7 +18,7 @@ $result_trees{'footnote_no_node'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -68,7 +68,8 @@ $result_trees{'footnote_no_node'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -99,6 +100,7 @@ $result_sectioning{'footnote_no_node'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
diff --git a/tp/t/results/coverage_braces/footnote_not_closed.pl 
b/tp/t/results/coverage_braces/footnote_not_closed.pl
index da90408c0c..8ea133034a 100644
--- a/tp/t/results/coverage_braces/footnote_not_closed.pl
+++ b/tp/t/results/coverage_braces/footnote_not_closed.pl
@@ -46,7 +46,7 @@ $result_trees{'footnote_not_closed'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
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 f7ec8d650d..623e8ad7af 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
@@ -80,7 +80,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
                       'text' => 'aaa'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ''
                   },
                   'type' => 'brace_command_arg'
@@ -91,7 +91,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
                       'text' => 'fff'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'type' => 'brace_command_arg'
@@ -129,7 +129,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' 
 '
               },
@@ -171,7 +171,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '  '
               },
               'source_info' => {
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 737eb2c4b5..df87d2c4c0 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
@@ -21,7 +21,7 @@ $result_trees{'format_on_first_footnote_line'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -47,7 +47,7 @@ $result_trees{'format_on_first_footnote_line'} = {
                                   'text' => 'quotation'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -56,9 +56,11 @@ $result_trees{'format_on_first_footnote_line'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'quotation'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 3,
@@ -107,7 +109,7 @@ $result_trees{'format_on_first_footnote_line'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -133,7 +135,7 @@ $result_trees{'format_on_first_footnote_line'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -142,9 +144,11 @@ $result_trees{'format_on_first_footnote_line'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 8,
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl 
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index c84d232dbf..3f85175df3 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -35,7 +35,7 @@ $result_trees{'heading_in_footnote'} = {
                               'text' => 'H1'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -43,7 +43,8 @@ $result_trees{'heading_in_footnote'} = {
                         }
                       ],
                       'cmdname' => 'heading',
-                      'extra' => {
+                      'extra' => {},
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -60,7 +61,7 @@ $result_trees{'heading_in_footnote'} = {
                               'text' => 'ind e'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -79,7 +80,9 @@ $result_trees{'heading_in_footnote'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
                           'index_type_command' => 'cindex'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -103,7 +106,7 @@ $result_trees{'heading_in_footnote'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
diff --git a/tp/t/results/coverage_braces/inforef_too_much_args.pl 
b/tp/t/results/coverage_braces/inforef_too_much_args.pl
index ded3aa1075..6272ea9be7 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -18,7 +18,7 @@ $result_trees{'inforef_too_much_args'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -50,7 +50,7 @@ $result_trees{'inforef_too_much_args'} = {
                       'text' => 'cross ref name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -61,7 +61,7 @@ $result_trees{'inforef_too_much_args'} = {
                       'text' => 'file name, spurious arg'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -101,7 +101,9 @@ $result_trees{'inforef_too_much_args'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -131,14 +133,16 @@ $result_nodes{'inforef_too_much_args'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'chapter'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'inforef_too_much_args'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'chapter'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'inforef_too_much_args'} = [
diff --git a/tp/t/results/coverage_braces/kbd.pl 
b/tp/t/results/coverage_braces/kbd.pl
index 3711c05cef..2cd8ea9fdc 100644
--- a/tp/t/results/coverage_braces/kbd.pl
+++ b/tp/t/results/coverage_braces/kbd.pl
@@ -173,7 +173,7 @@ $result_trees{'kbd'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -221,7 +221,7 @@ $result_trees{'kbd'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -230,9 +230,11 @@ $result_trees{'kbd'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -274,7 +276,7 @@ $result_trees{'kbd'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -322,7 +324,7 @@ $result_trees{'kbd'} = {
                       'text' => 'format'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -331,9 +333,11 @@ $result_trees{'kbd'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'format'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
diff --git a/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl 
b/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl
index d20b52ca3f..f50e4a8cb5 100644
--- a/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/math_leading_trailing_spaces.pl
@@ -23,7 +23,7 @@ $result_trees{'math_leading_trailing_spaces'} = {
                 }
               ],
               'cmdname' => 'math',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/coverage_braces/nested_args.pl 
b/tp/t/results/coverage_braces/nested_args.pl
index a75672d030..2960e3ef8e 100644
--- a/tp/t/results/coverage_braces/nested_args.pl
+++ b/tp/t/results/coverage_braces/nested_args.pl
@@ -66,7 +66,7 @@ $result_trees{'nested_args'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -98,7 +98,7 @@ $result_trees{'nested_args'} = {
                       'text' => 'ction'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -124,7 +124,7 @@ $result_trees{'nested_args'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' 
 '
                   },
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl 
b/tp/t/results/coverage_braces/nested_in_sc.pl
index 8e99cab159..b779400939 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -148,7 +148,7 @@ $result_trees{'nested_in_sc'} = {
                                       'text' => 'expl'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'type' => 'brace_command_arg'
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 f0d1c530a0..5a589b7b53 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
@@ -104,7 +104,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                       'text' => 'a-b c-d'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -152,7 +152,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
                       'text' => '1234'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
diff --git a/tp/t/results/coverage_braces/recursive_acronym.pl 
b/tp/t/results/coverage_braces/recursive_acronym.pl
index a9bdb0c2a2..a8d43322c1 100644
--- a/tp/t/results/coverage_braces/recursive_acronym.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym.pl
@@ -45,7 +45,7 @@ $result_trees{'recursive_acronym'} = {
                       'text' => '\'s Not Unix'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/coverage_braces/recursive_acronym_definition.pl 
b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
index 1aab5a2b0b..099e6aa846 100644
--- a/tp/t/results/coverage_braces/recursive_acronym_definition.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
@@ -51,7 +51,7 @@ $result_trees{'recursive_acronym_definition'} = {
                                       'text' => 'is something'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'type' => 'brace_command_arg'
@@ -68,7 +68,7 @@ $result_trees{'recursive_acronym_definition'} = {
                               'text' => '\'s Not Unix'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -85,7 +85,7 @@ $result_trees{'recursive_acronym_definition'} = {
                       'text' => '\'s Not Unix'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/coverage_braces/ref_empty_node.pl 
b/tp/t/results/coverage_braces/ref_empty_node.pl
index 1228d0e9a2..41dddecbd0 100644
--- a/tp/t/results/coverage_braces/ref_empty_node.pl
+++ b/tp/t/results/coverage_braces/ref_empty_node.pl
@@ -58,7 +58,7 @@ $result_trees{'ref_empty_node'} = {
                   'type' => 'brace_command_arg'
                 },
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -69,7 +69,7 @@ $result_trees{'ref_empty_node'} = {
                       'text' => 'Manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -116,7 +116,7 @@ $result_trees{'ref_empty_node'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -127,7 +127,7 @@ $result_trees{'ref_empty_node'} = {
                       'text' => 'Bidule'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -138,7 +138,7 @@ $result_trees{'ref_empty_node'} = {
                       'text' => 'Truc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -149,7 +149,7 @@ $result_trees{'ref_empty_node'} = {
                       'text' => 'file'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -160,7 +160,7 @@ $result_trees{'ref_empty_node'} = {
                       'text' => 'Printed'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/coverage_braces/space_in_anchor.pl 
b/tp/t/results/coverage_braces/space_in_anchor.pl
index a6bcdb8a86..204e2bd616 100644
--- a/tp/t/results/coverage_braces/space_in_anchor.pl
+++ b/tp/t/results/coverage_braces/space_in_anchor.pl
@@ -17,7 +17,7 @@ $result_trees{'space_in_anchor'} = {
                   'text' => 'anchor  name'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '   ',
                 'spaces_before_argument' => '   '
               },
diff --git a/tp/t/results/coverage_braces/space_in_footnote.pl 
b/tp/t/results/coverage_braces/space_in_footnote.pl
index f13b28e5bc..0ad5d4b9c7 100644
--- a/tp/t/results/coverage_braces/space_in_footnote.pl
+++ b/tp/t/results/coverage_braces/space_in_footnote.pl
@@ -31,7 +31,7 @@ $result_trees{'space_in_footnote'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/coverage_braces/space_in_image.pl 
b/tp/t/results/coverage_braces/space_in_image.pl
index dc387cfcf0..bbbc397fc0 100644
--- a/tp/t/results/coverage_braces/space_in_image.pl
+++ b/tp/t/results/coverage_braces/space_in_image.pl
@@ -17,7 +17,7 @@ $result_trees{'space_in_image'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
@@ -37,7 +37,7 @@ $result_trees{'space_in_image'} = {
                   'text' => 'cc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -48,7 +48,7 @@ $result_trees{'space_in_image'} = {
                   'text' => 'dd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -59,7 +59,7 @@ $result_trees{'space_in_image'} = {
                   'text' => '.e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -88,7 +88,7 @@ $result_trees{'space_in_image'} = {
                       'text' => 'f'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index cd50cf55af..e297b45132 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -41,7 +41,7 @@ $result_trees{'test_image'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -50,9 +50,11 @@ $result_trees{'test_image'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -78,7 +80,7 @@ $result_trees{'test_image'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -150,7 +152,7 @@ $result_trees{'test_image'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -306,7 +308,7 @@ $result_trees{'test_image'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -325,7 +327,7 @@ $result_trees{'test_image'} = {
                           'text' => '1cm'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -430,7 +432,7 @@ $result_trees{'test_image'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '  ',
                         'spaces_before_argument' => ' '
                       },
@@ -519,7 +521,7 @@ $result_trees{'test_image'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -528,9 +530,11 @@ $result_trees{'test_image'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -560,7 +564,7 @@ $result_trees{'test_image'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -631,7 +635,7 @@ $result_trees{'test_image'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -784,7 +788,7 @@ $result_trees{'test_image'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -803,7 +807,7 @@ $result_trees{'test_image'} = {
                       'text' => '1cm'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -908,7 +912,7 @@ $result_trees{'test_image'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '  ',
                     'spaces_before_argument' => ' '
                   },
@@ -1026,7 +1030,7 @@ $result_trees{'test_image'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1094,7 +1098,7 @@ $result_trees{'test_image'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -1245,7 +1249,7 @@ $result_trees{'test_image'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -1264,7 +1268,7 @@ $result_trees{'test_image'} = {
                           'text' => '1cm'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -1369,7 +1373,7 @@ $result_trees{'test_image'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '  ',
                         'spaces_before_argument' => ' '
                       },
@@ -1458,7 +1462,7 @@ $result_trees{'test_image'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1467,9 +1471,11 @@ $result_trees{'test_image'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -1504,7 +1510,7 @@ $result_trees{'test_image'} = {
                   'text' => 'Image with commands'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -1571,7 +1577,7 @@ $result_trees{'test_image'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1724,7 +1730,7 @@ $result_trees{'test_image'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -1743,7 +1749,7 @@ $result_trees{'test_image'} = {
                           'text' => '1cm'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -1848,7 +1854,7 @@ $result_trees{'test_image'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '  ',
                         'spaces_before_argument' => ' '
                       },
@@ -1995,7 +2001,7 @@ $result_trees{'test_image'} = {
                               }
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -2148,7 +2154,7 @@ $result_trees{'test_image'} = {
                                   }
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => ' '
                               },
                               'type' => 'brace_command_arg'
@@ -2167,7 +2173,7 @@ $result_trees{'test_image'} = {
                                   'text' => '1cm'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'type' => 'brace_command_arg'
@@ -2272,7 +2278,7 @@ $result_trees{'test_image'} = {
                                   }
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '  ',
                                 'spaces_before_argument' => ' '
                               },
@@ -2378,7 +2384,7 @@ $result_trees{'test_image'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2387,9 +2393,11 @@ $result_trees{'test_image'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -2403,7 +2411,6 @@ $result_trees{'test_image'} = {
               {}
             ],
             'normalized' => 'Image-with-commands',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -2411,6 +2418,9 @@ $result_trees{'test_image'} = {
               'normalized' => 'Image'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 23,
@@ -2430,7 +2440,7 @@ $result_trees{'test_image'} = {
                   'text' => 'Image'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2439,7 +2449,6 @@ $result_trees{'test_image'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -2447,6 +2456,9 @@ $result_trees{'test_image'} = {
               'normalized' => 'Image'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 29,
@@ -2471,7 +2483,9 @@ $result_trees{'test_image'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2561,14 +2575,16 @@ $result_nodes{'test_image'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'test_image'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'test_image'} = [
@@ -2821,6 +2837,7 @@ $result_floats{'test_image'} = {
           'normalized' => 'Image'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/coverage_braces/too_much_args.pl 
b/tp/t/results/coverage_braces/too_much_args.pl
index c1adae07ad..3510d51641 100644
--- a/tp/t/results/coverage_braces/too_much_args.pl
+++ b/tp/t/results/coverage_braces/too_much_args.pl
@@ -27,7 +27,7 @@ $result_trees{'too_much_args'} = {
                       'text' => 'A truc Z b, E eep'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
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 c7ee26e791..ba40af5069 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -24,7 +24,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'two_footnotes_in_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => '2 footnotes in 2 nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -186,7 +188,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -252,7 +254,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -261,9 +263,11 @@ $result_trees{'two_footnotes_in_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -283,7 +287,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -300,7 +305,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -320,7 +325,9 @@ $result_trees{'two_footnotes_in_nodes'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -337,7 +344,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -460,7 +467,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -537,9 +545,11 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -550,9 +560,11 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -581,6 +593,7 @@ $result_nodes{'two_footnotes_in_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -590,6 +603,7 @@ $result_nodes{'two_footnotes_in_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -597,12 +611,14 @@ $result_nodes{'two_footnotes_in_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -620,12 +636,14 @@ $result_menus{'two_footnotes_in_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
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 f7f1ecadc4..703b14ffac 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
@@ -19,7 +19,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                       'text' => 'separate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'extra' => {
                 'misc_args' => [
                   'separate'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -53,7 +55,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -73,7 +75,9 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -90,7 +94,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'text' => '2 footnotes in 2 nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -215,7 +219,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -281,7 +285,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -290,9 +294,11 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -312,7 +318,8 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -329,7 +336,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -349,7 +356,9 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -366,7 +375,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -489,7 +498,8 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -567,9 +577,11 @@ $result_sectioning{'two_footnotes_in_nodes_separate'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -580,9 +592,11 @@ $result_sectioning{'two_footnotes_in_nodes_separate'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -611,6 +625,7 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -620,6 +635,7 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -627,12 +643,14 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -650,12 +668,14 @@ $result_menus{'two_footnotes_in_nodes_separate'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/coverage_braces/uref_in_ref.pl 
b/tp/t/results/coverage_braces/uref_in_ref.pl
index 49a6414070..d05837a2d3 100644
--- a/tp/t/results/coverage_braces/uref_in_ref.pl
+++ b/tp/t/results/coverage_braces/uref_in_ref.pl
@@ -62,7 +62,7 @@ $result_trees{'uref_in_ref'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -99,7 +99,7 @@ $result_trees{'uref_in_ref'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -136,7 +136,7 @@ $result_trees{'uref_in_ref'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -173,7 +173,7 @@ $result_trees{'uref_in_ref'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/coverage_braces/uref_with_commands_characters.pl 
b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
index d5e66c3b30..044b33ae49 100644
--- a/tp/t/results/coverage_braces/uref_with_commands_characters.pl
+++ b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
@@ -94,7 +94,7 @@ $result_trees{'uref_with_commands_characters'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index 133ca1a61b..dd751fc916 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -18,7 +18,7 @@ $result_trees{'verb_in_xref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -84,7 +84,7 @@ $result_trees{'verb_in_xref'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -126,7 +126,9 @@ $result_trees{'verb_in_xref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -160,14 +162,16 @@ $result_nodes{'verb_in_xref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'verb_in_xref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'verb_in_xref'} = [
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 353488b758..ac366d4caf 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -99,7 +99,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defvr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -108,9 +108,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -118,7 +120,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -235,7 +237,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -244,9 +246,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -254,7 +258,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -358,7 +362,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -367,9 +371,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -377,7 +383,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -508,7 +514,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -517,9 +523,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -527,7 +535,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -645,7 +653,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -654,9 +662,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -664,7 +674,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -817,7 +827,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -826,9 +836,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -836,7 +848,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -976,7 +988,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -985,9 +997,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -995,7 +1009,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1113,7 +1127,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypevr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1122,9 +1136,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -1132,7 +1148,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1250,7 +1266,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defcv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1259,9 +1275,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
@@ -1269,7 +1287,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1400,7 +1418,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defcv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1409,9 +1427,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 39,
@@ -1419,7 +1439,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1559,7 +1579,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1568,9 +1588,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 43,
@@ -1578,7 +1600,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1731,7 +1753,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1740,9 +1762,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 47,
@@ -1750,7 +1774,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1889,7 +1913,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1898,9 +1922,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 51,
@@ -1908,7 +1934,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2034,7 +2060,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2043,9 +2069,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 55,
@@ -2053,7 +2081,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2170,7 +2198,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2179,9 +2207,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 59,
@@ -2189,7 +2219,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2311,7 +2341,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2320,9 +2350,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 63,
@@ -2330,7 +2362,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2452,7 +2484,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defmac'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2461,9 +2493,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defmac'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 67,
@@ -2471,7 +2505,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2593,7 +2627,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defspec'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2602,9 +2636,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defspec'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 71,
@@ -2612,7 +2648,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2721,7 +2757,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defvar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2730,9 +2766,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 75,
@@ -2740,7 +2778,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2875,7 +2913,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defvar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2884,9 +2922,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 79,
@@ -2894,7 +2934,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3003,7 +3043,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defopt'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3012,9 +3052,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defopt'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 83,
@@ -3022,7 +3064,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3158,7 +3200,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypefun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3167,9 +3209,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 87,
@@ -3177,7 +3221,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3300,7 +3344,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypevar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3309,9 +3353,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 91,
@@ -3319,7 +3365,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3450,7 +3496,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3459,9 +3505,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 95,
@@ -3469,7 +3517,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3614,7 +3662,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypeivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3623,9 +3671,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 99,
@@ -3633,7 +3683,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3777,7 +3827,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'defmethod'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3786,9 +3836,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defmethod'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 103,
@@ -3796,7 +3848,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3954,7 +4006,7 @@ $result_trees{'all_commands'} = {
                       'text' => 'deftypemethod'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3963,9 +4015,11 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypemethod'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 107,
@@ -3973,7 +4027,7 @@ $result_trees{'all_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index e61a28edc8..e4244015b7 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -407,7 +407,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -416,9 +416,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -426,7 +428,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -795,7 +797,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'defvr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -804,9 +806,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -814,7 +818,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1031,7 +1035,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1040,9 +1044,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -1050,7 +1056,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1528,7 +1534,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1537,9 +1543,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -1547,7 +1555,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1684,7 +1692,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1693,9 +1701,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -1703,7 +1713,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1993,7 +2003,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2002,9 +2012,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -2012,7 +2024,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2359,7 +2371,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypevr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2368,9 +2380,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -2378,7 +2392,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2737,7 +2751,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2746,9 +2760,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -2756,7 +2772,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3103,7 +3119,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'defcv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3112,9 +3128,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 33,
@@ -3122,7 +3140,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3506,7 +3524,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3515,9 +3533,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -3525,7 +3545,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3870,7 +3890,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3879,9 +3899,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 41,
@@ -3889,7 +3911,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4263,7 +4285,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4272,9 +4294,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 45,
@@ -4282,7 +4306,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4449,7 +4473,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4458,9 +4482,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 48,
@@ -4468,7 +4494,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4655,7 +4681,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4664,9 +4690,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 51,
@@ -4674,7 +4702,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4861,7 +4889,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4870,9 +4898,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 54,
@@ -4880,7 +4910,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -5047,7 +5077,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5056,9 +5086,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 57,
@@ -5066,7 +5098,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -5233,7 +5265,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5242,9 +5274,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 60,
@@ -5252,7 +5286,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -5439,7 +5473,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5448,9 +5482,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 63,
@@ -5458,7 +5494,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -5645,7 +5681,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5654,9 +5690,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 66,
@@ -5664,7 +5702,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -5831,7 +5869,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5840,9 +5878,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 69,
@@ -5850,7 +5890,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6017,7 +6057,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6026,9 +6066,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 72,
@@ -6036,7 +6078,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6223,7 +6265,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6232,9 +6274,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 75,
@@ -6242,7 +6286,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6429,7 +6473,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6438,9 +6482,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 78,
@@ -6448,7 +6494,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6615,7 +6661,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6624,9 +6670,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 81,
@@ -6634,7 +6682,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6801,7 +6849,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6810,9 +6858,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 84,
@@ -6820,7 +6870,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7020,7 +7070,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7029,9 +7079,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 87,
@@ -7039,7 +7091,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7173,7 +7225,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7182,9 +7234,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 90,
@@ -7192,7 +7246,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7368,7 +7422,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7377,9 +7431,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 93,
@@ -7387,7 +7443,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7563,7 +7619,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7572,9 +7628,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 96,
@@ -7582,7 +7640,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7758,7 +7816,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'defvr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7767,9 +7825,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 99,
@@ -7777,7 +7837,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7953,7 +8013,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'defvr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7962,9 +8022,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 102,
@@ -7972,7 +8034,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8177,7 +8239,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -8186,9 +8248,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 105,
@@ -8196,7 +8260,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8401,7 +8465,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -8410,9 +8474,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 108,
@@ -8420,7 +8486,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8625,7 +8691,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypevr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -8634,9 +8700,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 111,
@@ -8644,7 +8712,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8849,7 +8917,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypevr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -8858,9 +8926,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 114,
@@ -8868,7 +8938,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9044,7 +9114,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9053,9 +9123,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 117,
@@ -9063,7 +9135,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9239,7 +9311,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9248,9 +9320,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 120,
@@ -9258,7 +9332,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9463,7 +9537,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'defcv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9472,9 +9546,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 123,
@@ -9482,7 +9558,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9686,7 +9762,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9695,9 +9771,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 126,
@@ -9705,7 +9783,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9947,7 +10025,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9956,9 +10034,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 129,
@@ -9966,7 +10046,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10208,7 +10288,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10217,9 +10297,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 132,
@@ -10227,7 +10309,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10440,7 +10522,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10449,9 +10531,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 135,
@@ -10459,7 +10543,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10672,7 +10756,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10681,9 +10765,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 138,
@@ -10691,7 +10777,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10933,7 +11019,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10942,9 +11028,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 141,
@@ -10952,7 +11040,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11194,7 +11282,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -11203,9 +11291,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 144,
@@ -11213,7 +11303,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11459,7 +11549,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -11468,9 +11558,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 147,
@@ -11478,7 +11570,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11724,7 +11816,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -11733,9 +11825,11 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 150,
@@ -11743,7 +11837,7 @@ $result_trees{'all_commands_delimiters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 35880ec1d5..bb7cf5e589 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -18,7 +18,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -426,7 +426,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -435,9 +435,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -445,7 +447,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -815,7 +817,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'defvr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -824,9 +826,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -834,7 +838,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1052,7 +1056,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1061,9 +1065,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -1071,7 +1077,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1550,7 +1556,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1559,9 +1565,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -1569,7 +1577,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1707,7 +1715,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1716,9 +1724,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -1726,7 +1736,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2017,7 +2027,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2026,9 +2036,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -2036,7 +2048,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2384,7 +2396,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypevr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2393,9 +2405,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -2403,7 +2417,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2763,7 +2777,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2772,9 +2786,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -2782,7 +2798,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3130,7 +3146,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'defcv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3139,9 +3155,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -3149,7 +3167,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3534,7 +3552,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3543,9 +3561,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -3553,7 +3573,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3899,7 +3919,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3908,9 +3928,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 42,
@@ -3918,7 +3940,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4293,7 +4315,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4302,9 +4324,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 46,
@@ -4312,7 +4336,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4480,7 +4504,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4489,9 +4513,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 49,
@@ -4499,7 +4525,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4687,7 +4713,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4696,9 +4722,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 52,
@@ -4706,7 +4734,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4894,7 +4922,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4903,9 +4931,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 55,
@@ -4913,7 +4943,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -5081,7 +5111,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5090,9 +5120,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 58,
@@ -5100,7 +5132,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -5268,7 +5300,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5277,9 +5309,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 61,
@@ -5287,7 +5321,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -5475,7 +5509,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5484,9 +5518,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 64,
@@ -5494,7 +5530,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -5682,7 +5718,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5691,9 +5727,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 67,
@@ -5701,7 +5739,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -5869,7 +5907,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5878,9 +5916,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 70,
@@ -5888,7 +5928,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6056,7 +6096,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6065,9 +6105,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 73,
@@ -6075,7 +6117,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6263,7 +6305,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6272,9 +6314,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 76,
@@ -6282,7 +6326,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6470,7 +6514,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6479,9 +6523,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 79,
@@ -6489,7 +6535,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6657,7 +6703,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6666,9 +6712,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 82,
@@ -6676,7 +6724,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -6844,7 +6892,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -6853,9 +6901,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 85,
@@ -6863,7 +6913,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7064,7 +7114,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7073,9 +7123,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 88,
@@ -7083,7 +7135,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7218,7 +7270,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7227,9 +7279,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 91,
@@ -7237,7 +7291,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7414,7 +7468,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7423,9 +7477,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 94,
@@ -7433,7 +7489,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7610,7 +7666,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7619,9 +7675,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 97,
@@ -7629,7 +7687,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -7806,7 +7864,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'defvr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -7815,9 +7873,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 100,
@@ -7825,7 +7885,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8002,7 +8062,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'defvr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -8011,9 +8071,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 103,
@@ -8021,7 +8083,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8227,7 +8289,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -8236,9 +8298,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 106,
@@ -8246,7 +8310,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8452,7 +8516,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -8461,9 +8525,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 109,
@@ -8471,7 +8537,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8677,7 +8743,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypevr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -8686,9 +8752,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 112,
@@ -8696,7 +8764,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -8902,7 +8970,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypevr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -8911,9 +8979,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 115,
@@ -8921,7 +8991,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9098,7 +9168,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9107,9 +9177,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 118,
@@ -9117,7 +9189,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9294,7 +9366,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9303,9 +9375,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 121,
@@ -9313,7 +9387,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9519,7 +9593,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'defcv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9528,9 +9602,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 124,
@@ -9538,7 +9614,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -9743,7 +9819,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -9752,9 +9828,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 127,
@@ -9762,7 +9840,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10005,7 +10083,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10014,9 +10092,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 130,
@@ -10024,7 +10104,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10267,7 +10347,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10276,9 +10356,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 133,
@@ -10286,7 +10368,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10500,7 +10582,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10509,9 +10591,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 136,
@@ -10519,7 +10603,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10733,7 +10817,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -10742,9 +10826,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 139,
@@ -10752,7 +10838,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -10995,7 +11081,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -11004,9 +11090,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 142,
@@ -11014,7 +11102,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11257,7 +11345,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -11266,9 +11354,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 145,
@@ -11276,7 +11366,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11523,7 +11613,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -11532,9 +11622,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 148,
@@ -11542,7 +11634,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11789,7 +11881,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -11798,9 +11890,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 151,
@@ -11808,7 +11902,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11830,7 +11924,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'text' => 'Functions'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -11838,7 +11932,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11855,7 +11949,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -11866,7 +11960,9 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11888,7 +11984,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'text' => 'Types'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -11896,7 +11992,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11913,7 +12009,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'text' => 'tp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -11924,7 +12020,9 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'extra' => {
             'misc_args' => [
               'tp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11946,7 +12044,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'text' => 'Variables'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -11954,7 +12052,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -11971,7 +12069,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'text' => 'vr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -11982,7 +12080,9 @@ $result_trees{'all_commands_delimiters_printindex'} = {
           'extra' => {
             'misc_args' => [
               'vr'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -12005,7 +12105,9 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -12668,7 +12770,8 @@ $result_nodes{'all_commands_delimiters_printindex'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'all_commands_delimiters_printindex'} = {
@@ -12676,7 +12779,8 @@ $result_menus{'all_commands_delimiters_printindex'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'all_commands_delimiters_printindex'} = [];
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index 58354eb54c..cfb4be5412 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -18,7 +18,7 @@ $result_trees{'all_commands_printindex'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -118,7 +118,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defvr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -127,9 +127,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -137,7 +139,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -255,7 +257,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -264,9 +266,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -274,7 +278,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -379,7 +383,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -388,9 +392,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -398,7 +404,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -530,7 +536,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -539,9 +545,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -549,7 +557,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -668,7 +676,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -677,9 +685,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -687,7 +697,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -841,7 +851,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -850,9 +860,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -860,7 +872,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1001,7 +1013,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1010,9 +1022,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -1020,7 +1034,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1139,7 +1153,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypevr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1148,9 +1162,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -1158,7 +1174,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1277,7 +1293,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defcv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1286,9 +1302,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -1296,7 +1314,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1428,7 +1446,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defcv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1437,9 +1455,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 40,
@@ -1447,7 +1467,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1588,7 +1608,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1597,9 +1617,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1607,7 +1629,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1761,7 +1783,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1770,9 +1792,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 48,
@@ -1780,7 +1804,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1920,7 +1944,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1929,9 +1953,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 52,
@@ -1939,7 +1965,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2066,7 +2092,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2075,9 +2101,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 56,
@@ -2085,7 +2113,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2203,7 +2231,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2212,9 +2240,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 60,
@@ -2222,7 +2252,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2345,7 +2375,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2354,9 +2384,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 64,
@@ -2364,7 +2396,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2487,7 +2519,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defmac'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2496,9 +2528,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defmac'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 68,
@@ -2506,7 +2540,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2629,7 +2663,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defspec'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2638,9 +2672,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defspec'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 72,
@@ -2648,7 +2684,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2758,7 +2794,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defvar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2767,9 +2803,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 76,
@@ -2777,7 +2815,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2913,7 +2951,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defvar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2922,9 +2960,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 80,
@@ -2932,7 +2972,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3042,7 +3082,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defopt'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3051,9 +3091,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defopt'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 84,
@@ -3061,7 +3103,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3198,7 +3240,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypefun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3207,9 +3249,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 88,
@@ -3217,7 +3261,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3341,7 +3385,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypevar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3350,9 +3394,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 92,
@@ -3360,7 +3406,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3492,7 +3538,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3501,9 +3547,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 96,
@@ -3511,7 +3559,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3657,7 +3705,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypeivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3666,9 +3714,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 100,
@@ -3676,7 +3726,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3821,7 +3871,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'defmethod'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3830,9 +3880,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defmethod'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 104,
@@ -3840,7 +3892,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3999,7 +4051,7 @@ $result_trees{'all_commands_printindex'} = {
                       'text' => 'deftypemethod'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4008,9 +4060,11 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypemethod'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 108,
@@ -4018,7 +4072,7 @@ $result_trees{'all_commands_printindex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4040,7 +4094,7 @@ $result_trees{'all_commands_printindex'} = {
                   'text' => 'Functions'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4048,7 +4102,7 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4065,7 +4119,7 @@ $result_trees{'all_commands_printindex'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4076,7 +4130,9 @@ $result_trees{'all_commands_printindex'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4098,7 +4154,7 @@ $result_trees{'all_commands_printindex'} = {
                   'text' => 'Types'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4106,7 +4162,7 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4123,7 +4179,7 @@ $result_trees{'all_commands_printindex'} = {
                   'text' => 'tp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4134,7 +4190,9 @@ $result_trees{'all_commands_printindex'} = {
           'extra' => {
             'misc_args' => [
               'tp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4156,7 +4214,7 @@ $result_trees{'all_commands_printindex'} = {
                   'text' => 'Variables'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4164,7 +4222,7 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'cmdname' => 'heading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4181,7 +4239,7 @@ $result_trees{'all_commands_printindex'} = {
                   'text' => 'vr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4192,7 +4250,9 @@ $result_trees{'all_commands_printindex'} = {
           'extra' => {
             'misc_args' => [
               'vr'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4215,7 +4275,9 @@ $result_trees{'all_commands_printindex'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4651,7 +4713,8 @@ $result_nodes{'all_commands_printindex'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'all_commands_printindex'} = {
@@ -4659,7 +4722,8 @@ $result_menus{'all_commands_printindex'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'all_commands_printindex'} = [];
diff --git a/tp/t/results/def/all_empty_def.pl 
b/tp/t/results/def/all_empty_def.pl
index b63c709812..0cbabd14f7 100644
--- a/tp/t/results/def/all_empty_def.pl
+++ b/tp/t/results/def/all_empty_def.pl
@@ -37,7 +37,7 @@ $result_trees{'all_empty_def'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -46,9 +46,11 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -56,7 +58,7 @@ $result_trees{'all_empty_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '
 '
           },
@@ -99,7 +101,7 @@ $result_trees{'all_empty_def'} = {
                       'text' => 'defvr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -108,9 +110,11 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -118,7 +122,7 @@ $result_trees{'all_empty_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '
 '
           },
@@ -161,7 +165,7 @@ $result_trees{'all_empty_def'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -170,9 +174,11 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -180,7 +186,7 @@ $result_trees{'all_empty_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '
 '
           },
@@ -223,7 +229,7 @@ $result_trees{'all_empty_def'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -232,9 +238,11 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -242,7 +250,7 @@ $result_trees{'all_empty_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '
 '
           },
@@ -285,7 +293,7 @@ $result_trees{'all_empty_def'} = {
                       'text' => 'deftypevr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -294,9 +302,11 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -304,7 +314,7 @@ $result_trees{'all_empty_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '
 '
           },
@@ -347,7 +357,7 @@ $result_trees{'all_empty_def'} = {
                       'text' => 'defcv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -356,9 +366,11 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -366,7 +378,7 @@ $result_trees{'all_empty_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '
 '
           },
@@ -409,7 +421,7 @@ $result_trees{'all_empty_def'} = {
                       'text' => 'deftypecv'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -418,9 +430,11 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -428,7 +442,7 @@ $result_trees{'all_empty_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '
 '
           },
@@ -471,7 +485,7 @@ $result_trees{'all_empty_def'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -480,9 +494,11 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -490,7 +506,7 @@ $result_trees{'all_empty_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '
 '
           },
@@ -533,7 +549,7 @@ $result_trees{'all_empty_def'} = {
                       'text' => 'deftp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -542,9 +558,11 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -552,7 +570,7 @@ $result_trees{'all_empty_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '
 '
           },
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index 71616d5585..7fe20103fd 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -162,7 +162,7 @@ $result_trees{'ampchar'} = {
                       'text' => 'defop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -171,9 +171,11 @@ $result_trees{'ampchar'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -181,7 +183,7 @@ $result_trees{'ampchar'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/code_in_def.pl b/tp/t/results/def/code_in_def.pl
index 6ef18f5af7..555f439d91 100644
--- a/tp/t/results/def/code_in_def.pl
+++ b/tp/t/results/def/code_in_def.pl
@@ -192,7 +192,7 @@ $result_trees{'code_in_def'} = {
                       'text' => 'deftypefn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -201,9 +201,11 @@ $result_trees{'code_in_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -211,7 +213,7 @@ $result_trees{'code_in_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index 189842ac92..fd814080d9 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -286,7 +286,9 @@ $result_trees{'def_defx_mismatch'} = {
                   'index_type_command' => 'deffn'
                 },
                 'not_after_command' => 1,
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -328,7 +330,7 @@ $result_trees{'def_defx_mismatch'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -337,9 +339,11 @@ $result_trees{'def_defx_mismatch'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -347,7 +351,7 @@ $result_trees{'def_defx_mismatch'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index 1b9b05f0f5..9ffbcbc4ce 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -219,7 +219,9 @@ $result_trees{'defx_after_comment'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -242,9 +244,11 @@ $result_trees{'defx_after_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -252,7 +256,7 @@ $result_trees{'defx_after_comment'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/defx_after_comment_in_example.pl 
b/tp/t/results/def/defx_after_comment_in_example.pl
index 1da51667ad..bd7540079e 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'defx_after_comment_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -236,7 +236,9 @@ $result_trees{'defx_after_comment_in_example'} = {
                       'index_name' => 'fn',
                       'index_type_command' => 'deffn'
                     },
-                    'original_def_cmdname' => 'deffnx',
+                    'original_def_cmdname' => 'deffnx'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -254,7 +256,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                           'text' => 'deffn'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -263,9 +265,11 @@ $result_trees{'defx_after_comment_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -273,7 +277,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -290,7 +294,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -299,9 +303,11 @@ $result_trees{'defx_after_comment_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/def/defx_after_empty_line.pl 
b/tp/t/results/def/defx_after_empty_line.pl
index 1c2b223783..ce53d01322 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -208,7 +208,9 @@ $result_trees{'defx_after_empty_line'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -231,9 +233,11 @@ $result_trees{'defx_after_empty_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -241,7 +245,7 @@ $result_trees{'defx_after_empty_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/defx_after_empty_line_in_example.pl 
b/tp/t/results/def/defx_after_empty_line_in_example.pl
index 76de45b1be..90e819f597 100644
--- a/tp/t/results/def/defx_after_empty_line_in_example.pl
+++ b/tp/t/results/def/defx_after_empty_line_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -262,7 +262,9 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                       'index_name' => 'fn',
                       'index_type_command' => 'deffn'
                     },
-                    'original_def_cmdname' => 'deffnx',
+                    'original_def_cmdname' => 'deffnx'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -280,7 +282,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                           'text' => 'deffn'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -289,9 +291,11 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 8,
@@ -299,7 +303,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -316,7 +320,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -325,9 +329,11 @@ $result_trees{'defx_after_empty_line_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl 
b/tp/t/results/def/defx_after_paragraph_end.pl
index 3c2f0d6b61..ff24415201 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -218,7 +218,9 @@ $result_trees{'defx_after_paragraph_end'} = {
                   'index_type_command' => 'deffn'
                 },
                 'not_after_command' => 1,
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -241,9 +243,11 @@ $result_trees{'defx_after_paragraph_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -251,7 +255,7 @@ $result_trees{'defx_after_paragraph_end'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/defx_after_preformatted_with_text.pl 
b/tp/t/results/def/defx_after_preformatted_with_text.pl
index 75f52fe559..20f2266ff1 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -12,7 +12,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -230,7 +230,9 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                       'index_type_command' => 'deffn'
                     },
                     'not_after_command' => 1,
-                    'original_def_cmdname' => 'deffnx',
+                    'original_def_cmdname' => 'deffnx'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -248,7 +250,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                           'text' => 'deffn'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -257,9 +259,11 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
@@ -267,7 +271,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -284,7 +288,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -293,9 +297,11 @@ $result_trees{'defx_after_preformatted_with_text'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/def/defx_after_text.pl 
b/tp/t/results/def/defx_after_text.pl
index 28b50d0c82..2aefea6747 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -213,7 +213,9 @@ $result_trees{'defx_after_text'} = {
                   'index_type_command' => 'deffn'
                 },
                 'not_after_command' => 1,
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -236,9 +238,11 @@ $result_trees{'defx_after_text'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -246,7 +250,7 @@ $result_trees{'defx_after_text'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index f4f9922a1a..418a127085 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'defx_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -210,7 +210,9 @@ $result_trees{'defx_in_example'} = {
                       'index_name' => 'fn',
                       'index_type_command' => 'deffn'
                     },
-                    'original_def_cmdname' => 'deffnx',
+                    'original_def_cmdname' => 'deffnx'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -228,7 +230,7 @@ $result_trees{'defx_in_example'} = {
                           'text' => 'deffn'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -237,9 +239,11 @@ $result_trees{'defx_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -247,7 +251,7 @@ $result_trees{'defx_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -264,7 +268,7 @@ $result_trees{'defx_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -273,9 +277,11 @@ $result_trees{'defx_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/def/double_command.pl 
b/tp/t/results/def/double_command.pl
index 0cbc13d01a..a2d82f69c8 100644
--- a/tp/t/results/def/double_command.pl
+++ b/tp/t/results/def/double_command.pl
@@ -295,7 +295,9 @@ $result_trees{'double_command'} = {
                           'index_type_command' => 'deffn'
                         },
                         'not_after_command' => 1,
-                        'original_def_cmdname' => 'deffnx',
+                        'original_def_cmdname' => 'deffnx'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -361,7 +363,7 @@ $result_trees{'double_command'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -370,9 +372,11 @@ $result_trees{'double_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -380,7 +384,7 @@ $result_trees{'double_command'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -510,7 +514,9 @@ $result_trees{'double_command'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -575,7 +581,7 @@ $result_trees{'double_command'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -584,9 +590,11 @@ $result_trees{'double_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -594,7 +602,7 @@ $result_trees{'double_command'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/empty_def_arguments.pl 
b/tp/t/results/def/empty_def_arguments.pl
index d7bf56dae9..8613e58e16 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -182,7 +182,9 @@ $result_trees{'empty_def_arguments'} = {
                 'def_parsed_hash' => {
                   'category' => {}
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -201,7 +203,9 @@ $result_trees{'empty_def_arguments'} = {
               'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' 
 '
               },
@@ -240,7 +244,9 @@ $result_trees{'empty_def_arguments'} = {
                 'def_parsed_hash' => {
                   'category' => {}
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -302,7 +308,9 @@ $result_trees{'empty_def_arguments'} = {
                   'category' => {},
                   'name' => {}
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -383,7 +391,9 @@ $result_trees{'empty_def_arguments'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name',
+                        'def_role' => 'name'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -537,7 +547,7 @@ $result_trees{'empty_def_arguments'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -546,9 +556,11 @@ $result_trees{'empty_def_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -556,7 +568,7 @@ $result_trees{'empty_def_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/empty_def_command.pl 
b/tp/t/results/def/empty_def_command.pl
index fbf4a6a638..aa3d84b092 100644
--- a/tp/t/results/def/empty_def_command.pl
+++ b/tp/t/results/def/empty_def_command.pl
@@ -85,7 +85,7 @@ $result_trees{'empty_def_command'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -94,9 +94,11 @@ $result_trees{'empty_def_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -104,7 +106,7 @@ $result_trees{'empty_def_command'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -269,7 +271,9 @@ $result_trees{'empty_def_command'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -287,7 +291,7 @@ $result_trees{'empty_def_command'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -296,9 +300,11 @@ $result_trees{'empty_def_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -306,7 +312,7 @@ $result_trees{'empty_def_command'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/empty_deftype.pl 
b/tp/t/results/def/empty_deftype.pl
index ae0ee48892..43ed26d967 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -176,7 +176,7 @@ $result_trees{'empty_deftype'} = {
                       'text' => 'deftypefun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -185,9 +185,11 @@ $result_trees{'empty_deftype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -195,7 +197,7 @@ $result_trees{'empty_deftype'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -357,7 +359,7 @@ $result_trees{'empty_deftype'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -366,9 +368,11 @@ $result_trees{'empty_deftype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -376,7 +380,7 @@ $result_trees{'empty_deftype'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -579,7 +583,7 @@ $result_trees{'empty_deftype'} = {
                       'text' => 'deftypemethod'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -588,9 +592,11 @@ $result_trees{'empty_deftype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypemethod'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -598,7 +604,7 @@ $result_trees{'empty_deftype'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -782,7 +788,7 @@ $result_trees{'empty_deftype'} = {
                       'text' => 'defmethod'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -791,9 +797,11 @@ $result_trees{'empty_deftype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defmethod'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -801,7 +809,7 @@ $result_trees{'empty_deftype'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/empty_deftypeop_name.pl 
b/tp/t/results/def/empty_deftypeop_name.pl
index 32b8bc2620..4892263a1e 100644
--- a/tp/t/results/def/empty_deftypeop_name.pl
+++ b/tp/t/results/def/empty_deftypeop_name.pl
@@ -158,7 +158,7 @@ $result_trees{'empty_deftypeop_name'} = {
                       'text' => 'deftypeop'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -167,9 +167,11 @@ $result_trees{'empty_deftypeop_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -177,7 +179,7 @@ $result_trees{'empty_deftypeop_name'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/end_of_line_end_file.pl 
b/tp/t/results/def/end_of_line_end_file.pl
index 9b4cc92fb3..1e9aec36f9 100644
--- a/tp/t/results/def/end_of_line_end_file.pl
+++ b/tp/t/results/def/end_of_line_end_file.pl
@@ -35,7 +35,7 @@ $result_trees{'end_of_line_end_file'} = {
               'type' => 'def_line'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/end_of_line_protect_at_end.pl 
b/tp/t/results/def/end_of_line_protect_at_end.pl
index cbb2b7c19c..8d37e7dde8 100644
--- a/tp/t/results/def/end_of_line_protect_at_end.pl
+++ b/tp/t/results/def/end_of_line_protect_at_end.pl
@@ -95,7 +95,7 @@ $result_trees{'end_of_line_protect_at_end'} = {
               'type' => 'def_line'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/end_of_lines_protected.pl 
b/tp/t/results/def/end_of_lines_protected.pl
index bdbfa7681c..23154c776a 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -223,7 +223,7 @@ $result_trees{'end_of_lines_protected'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -232,9 +232,11 @@ $result_trees{'end_of_lines_protected'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -242,7 +244,7 @@ $result_trees{'end_of_lines_protected'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
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 24a4f4e80d..9ae37d6a00 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
@@ -242,7 +242,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                                   'text' => 'deffn'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -251,9 +251,11 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'deffn'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 7,
@@ -261,7 +263,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -275,7 +277,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
diff --git a/tp/t/results/def/inter_item_commands_in_def.pl 
b/tp/t/results/def/inter_item_commands_in_def.pl
index bdbf3c2d27..48d232132c 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -168,7 +168,9 @@ $result_trees{'inter_item_commands_in_def'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'name',
+                        'def_role' => 'name'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -230,7 +232,9 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -250,7 +254,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                           'text' => 'between deffnx'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -269,7 +273,9 @@ $result_trees{'inter_item_commands_in_def'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -388,7 +394,9 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -408,7 +416,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                           'text' => 'cindex in deff item'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -427,7 +435,9 @@ $result_trees{'inter_item_commands_in_def'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -462,7 +472,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -471,9 +481,11 @@ $result_trees{'inter_item_commands_in_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -481,7 +493,7 @@ $result_trees{'inter_item_commands_in_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/inter_item_commands_in_def_in_example.pl 
b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
index 5b2c52b88a..87fe1a2c17 100644
--- a/tp/t/results/def/inter_item_commands_in_def_in_example.pl
+++ b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -185,7 +185,9 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                             }
                           ],
                           'extra' => {
-                            'def_role' => 'name',
+                            'def_role' => 'name'
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -247,7 +249,9 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'index_name' => 'fn',
                       'index_type_command' => 'deffn'
                     },
-                    'original_def_cmdname' => 'deffnx',
+                    'original_def_cmdname' => 'deffnx'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -269,7 +273,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                                   'text' => 'between deffnx'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -288,7 +292,9 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
                               'index_type_command' => 'cindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -410,7 +416,9 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'index_name' => 'fn',
                       'index_type_command' => 'deffn'
                     },
-                    'original_def_cmdname' => 'deffnx',
+                    'original_def_cmdname' => 'deffnx'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -432,7 +440,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                                   'text' => 'cindex in deff item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -451,7 +459,9 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
                               'index_type_command' => 'cindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -484,7 +494,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           'text' => 'deffn'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -493,9 +503,11 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 11,
@@ -503,7 +515,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -520,7 +532,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -529,9 +541,11 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
diff --git a/tp/t/results/def/leading_space_in_def_arg.pl 
b/tp/t/results/def/leading_space_in_def_arg.pl
index d6c8df30d0..e6c57b02b3 100644
--- a/tp/t/results/def/leading_space_in_def_arg.pl
+++ b/tp/t/results/def/leading_space_in_def_arg.pl
@@ -36,7 +36,9 @@ $result_trees{'leading_space_in_def_arg'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'name',
+                        'def_role' => 'name'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -109,7 +111,7 @@ $result_trees{'leading_space_in_def_arg'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -118,9 +120,11 @@ $result_trees{'leading_space_in_def_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -128,7 +132,7 @@ $result_trees{'leading_space_in_def_arg'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/no_category_or_no_name.pl 
b/tp/t/results/def/no_category_or_no_name.pl
index 6c83cb84be..a61aa841a2 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -51,7 +51,7 @@ $result_trees{'no_category_or_no_name'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -60,9 +60,11 @@ $result_trees{'no_category_or_no_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -70,7 +72,7 @@ $result_trees{'no_category_or_no_name'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '
 '
           },
@@ -156,7 +158,7 @@ $result_trees{'no_category_or_no_name'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -165,9 +167,11 @@ $result_trees{'no_category_or_no_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -175,7 +179,7 @@ $result_trees{'no_category_or_no_name'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -311,7 +315,9 @@ $result_trees{'no_category_or_no_name'} = {
                 'def_parsed_hash' => {
                   'category' => {}
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -330,7 +336,9 @@ $result_trees{'no_category_or_no_name'} = {
               'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' 
 '
               },
@@ -363,7 +371,7 @@ $result_trees{'no_category_or_no_name'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -372,9 +380,11 @@ $result_trees{'no_category_or_no_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -382,7 +392,7 @@ $result_trees{'no_category_or_no_name'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 2895084a85..34309d872b 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -160,7 +160,9 @@ $result_trees{'not_closed'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -272,7 +274,7 @@ $result_trees{'not_closed'} = {
                       'type' => 'def_line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -285,7 +287,7 @@ $result_trees{'not_closed'} = {
               'type' => 'def_item'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index be1e00c42f..ce7695fa30 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -18,7 +18,7 @@ $result_trees{'omit_def_space'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'omit_def_space'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'omit_def_space'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -315,7 +317,9 @@ $result_trees{'omit_def_space'} = {
                   'index_type_command' => 'defun'
                 },
                 'omit_def_name_space' => 1,
-                'original_def_cmdname' => 'defunx',
+                'original_def_cmdname' => 'defunx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -347,7 +351,7 @@ $result_trees{'omit_def_space'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -356,9 +360,11 @@ $result_trees{'omit_def_space'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -366,7 +372,7 @@ $result_trees{'omit_def_space'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -388,7 +394,9 @@ $result_trees{'omit_def_space'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -443,12 +451,14 @@ $result_nodes{'omit_def_space'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -462,6 +472,7 @@ $result_menus{'omit_def_space'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/def/protected_brace.pl 
b/tp/t/results/def/protected_brace.pl
index 3de8af07cd..93604a5443 100644
--- a/tp/t/results/def/protected_brace.pl
+++ b/tp/t/results/def/protected_brace.pl
@@ -85,7 +85,7 @@ $result_trees{'protected_brace'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -94,9 +94,11 @@ $result_trees{'protected_brace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -104,7 +106,7 @@ $result_trees{'protected_brace'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 9a6256cbf6..94bce22f21 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -25,7 +25,7 @@ $result_trees{'ref_in_def'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -511,7 +511,9 @@ $result_trees{'ref_in_def'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -543,7 +545,7 @@ $result_trees{'ref_in_def'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -552,9 +554,11 @@ $result_trees{'ref_in_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -562,7 +566,7 @@ $result_trees{'ref_in_def'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -595,7 +599,9 @@ $result_trees{'ref_in_def'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -667,14 +673,16 @@ $result_nodes{'ref_in_def'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'ref_in_def'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'ref_in_def'} = [];
diff --git a/tp/t/results/def/space_in_def_for_index.pl 
b/tp/t/results/def/space_in_def_for_index.pl
index 6c4f92654e..fe1325da83 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -18,7 +18,7 @@ $result_trees{'space_in_def_for_index'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -46,7 +46,9 @@ $result_trees{'space_in_def_for_index'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'category',
+                        'def_role' => 'category'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => ' '
                       },
@@ -71,7 +73,9 @@ $result_trees{'space_in_def_for_index'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'name',
+                        'def_role' => 'name'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => ' '
                       },
@@ -96,7 +100,9 @@ $result_trees{'space_in_def_for_index'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => ' '
                       },
@@ -254,7 +260,9 @@ $result_trees{'space_in_def_for_index'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -272,7 +280,7 @@ $result_trees{'space_in_def_for_index'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -281,9 +289,11 @@ $result_trees{'space_in_def_for_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -291,7 +301,7 @@ $result_trees{'space_in_def_for_index'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -313,7 +323,7 @@ $result_trees{'space_in_def_for_index'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -324,7 +334,9 @@ $result_trees{'space_in_def_for_index'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -347,7 +359,9 @@ $result_trees{'space_in_def_for_index'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -395,7 +409,8 @@ $result_nodes{'space_in_def_for_index'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'space_in_def_for_index'} = {
@@ -403,7 +418,8 @@ $result_menus{'space_in_def_for_index'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'space_in_def_for_index'} = [];
diff --git a/tp/t/results/def/wrong_braces_simple.pl 
b/tp/t/results/def/wrong_braces_simple.pl
index c4091d7108..25e9ccef40 100644
--- a/tp/t/results/def/wrong_braces_simple.pl
+++ b/tp/t/results/def/wrong_braces_simple.pl
@@ -124,7 +124,7 @@ $result_trees{'wrong_braces_simple'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -133,9 +133,11 @@ $result_trees{'wrong_braces_simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -143,7 +145,7 @@ $result_trees{'wrong_braces_simple'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -285,7 +287,7 @@ $result_trees{'wrong_braces_simple'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -294,9 +296,11 @@ $result_trees{'wrong_braces_simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -304,7 +308,7 @@ $result_trees{'wrong_braces_simple'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -392,7 +396,9 @@ $result_trees{'wrong_braces_simple'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_before_argument' => '
 '
                       },
@@ -445,7 +451,7 @@ $result_trees{'wrong_braces_simple'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -454,9 +460,11 @@ $result_trees{'wrong_braces_simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -464,7 +472,7 @@ $result_trees{'wrong_braces_simple'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -557,7 +565,9 @@ $result_trees{'wrong_braces_simple'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -611,7 +621,7 @@ $result_trees{'wrong_braces_simple'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -620,9 +630,11 @@ $result_trees{'wrong_braces_simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -630,7 +642,7 @@ $result_trees{'wrong_braces_simple'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -847,7 +859,9 @@ $result_trees{'wrong_braces_simple'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -966,7 +980,9 @@ $result_trees{'wrong_braces_simple'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1047,7 +1063,9 @@ $result_trees{'wrong_braces_simple'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_before_argument' => '
 '
                       },
@@ -1084,7 +1102,9 @@ $result_trees{'wrong_braces_simple'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1170,7 +1190,9 @@ $result_trees{'wrong_braces_simple'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1208,7 +1230,9 @@ $result_trees{'wrong_braces_simple'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1226,7 +1250,7 @@ $result_trees{'wrong_braces_simple'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1235,9 +1259,11 @@ $result_trees{'wrong_braces_simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -1245,7 +1271,7 @@ $result_trees{'wrong_braces_simple'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/def/wrong_braces_with_end_of_lines.pl 
b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
index ad96753457..6315d0f5f0 100644
--- a/tp/t/results/def/wrong_braces_with_end_of_lines.pl
+++ b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
@@ -62,7 +62,9 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => '   '
@@ -136,7 +138,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -145,9 +147,11 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -155,7 +159,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -304,7 +308,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -313,9 +317,11 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -323,7 +329,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/docbook_tests/between_node_and_section.pl 
b/tp/t/results/docbook_tests/between_node_and_section.pl
index 08285709f6..448ea008a7 100644
--- a/tp/t/results/docbook_tests/between_node_and_section.pl
+++ b/tp/t/results/docbook_tests/between_node_and_section.pl
@@ -25,7 +25,7 @@ $result_trees{'between_node_and_section'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'between_node_and_section'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'between_node_and_section'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -77,7 +79,8 @@ $result_trees{'between_node_and_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -94,7 +97,7 @@ $result_trees{'between_node_and_section'} = {
               'text' => 'sec1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -114,7 +117,9 @@ $result_trees{'between_node_and_section'} = {
             'normalized' => 'sec1'
           }
         ],
-        'normalized' => 'sec1',
+        'normalized' => 'sec1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -131,7 +136,7 @@ $result_trees{'between_node_and_section'} = {
               'text' => 'sec1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -146,7 +151,8 @@ $result_trees{'between_node_and_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -163,7 +169,7 @@ $result_trees{'between_node_and_section'} = {
               'text' => 'sec2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -214,7 +220,9 @@ $result_trees{'between_node_and_section'} = {
             'normalized' => 'sec2'
           }
         ],
-        'normalized' => 'sec2',
+        'normalized' => 'sec2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -231,7 +239,7 @@ $result_trees{'between_node_and_section'} = {
               'text' => 'sec2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -239,7 +247,8 @@ $result_trees{'between_node_and_section'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -293,9 +302,11 @@ $result_sectioning{'between_node_and_section'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'chap'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -306,9 +317,11 @@ $result_sectioning{'between_node_and_section'} = {
                   'extra' => {
                     'normalized' => 'sec1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => '1.1',
@@ -323,9 +336,11 @@ $result_sectioning{'between_node_and_section'} = {
                   'extra' => {
                     'normalized' => 'sec2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => '1.2',
@@ -354,19 +369,22 @@ $result_nodes{'between_node_and_section'} = {
     'associated_section' => {
       'cmdname' => 'chapter',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'section_number' => 1
       }
     },
     'normalized' => 'chap'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'between_node_and_section'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'chap'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'between_node_and_section'} = [];
diff --git 
a/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl 
b/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl
index 5409f2faac..632a85742a 100644
--- 
a/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl
+++ 
b/tp/t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl
@@ -17,7 +17,7 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
                   'text' => 'something'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -34,7 +34,7 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -53,7 +55,7 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -70,7 +72,7 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -96,7 +98,7 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -105,9 +107,11 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/docbook_tests/multiple_documentlanguage.pl 
b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
index 498a126456..cf3de96414 100644
--- a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -17,7 +17,7 @@ $result_trees{'multiple_documentlanguage'} = {
                   'text' => 'ja'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -26,9 +26,11 @@ $result_trees{'multiple_documentlanguage'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ja'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -51,7 +53,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -71,7 +73,9 @@ $result_trees{'multiple_documentlanguage'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -88,7 +92,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -103,7 +107,8 @@ $result_trees{'multiple_documentlanguage'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -120,7 +125,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -140,7 +145,9 @@ $result_trees{'multiple_documentlanguage'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -157,7 +164,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'text' => 'Chap no new language'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -179,7 +186,7 @@ $result_trees{'multiple_documentlanguage'} = {
                   'text' => 'fr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -188,9 +195,11 @@ $result_trees{'multiple_documentlanguage'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 9,
@@ -198,7 +207,8 @@ $result_trees{'multiple_documentlanguage'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -215,7 +225,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'text' => 'chapter fr'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -235,7 +245,9 @@ $result_trees{'multiple_documentlanguage'} = {
             'normalized' => 'chapter-fr'
           }
         ],
-        'normalized' => 'chapter-fr',
+        'normalized' => 'chapter-fr'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -252,7 +264,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'text' => 'chapter fr'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -274,7 +286,7 @@ $result_trees{'multiple_documentlanguage'} = {
                   'text' => 'pt'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -283,9 +295,11 @@ $result_trees{'multiple_documentlanguage'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'pt'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 13,
@@ -293,7 +307,8 @@ $result_trees{'multiple_documentlanguage'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -310,7 +325,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'text' => 'subnode pt'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -330,7 +345,9 @@ $result_trees{'multiple_documentlanguage'} = {
             'normalized' => 'subnode-pt'
           }
         ],
-        'normalized' => 'subnode-pt',
+        'normalized' => 'subnode-pt'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -347,7 +364,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'text' => 'section pt'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -369,7 +386,7 @@ $result_trees{'multiple_documentlanguage'} = {
                   'text' => 'fr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -378,9 +395,11 @@ $result_trees{'multiple_documentlanguage'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 17,
@@ -388,7 +407,8 @@ $result_trees{'multiple_documentlanguage'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -405,7 +425,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'text' => 'subnode fr'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -425,7 +445,9 @@ $result_trees{'multiple_documentlanguage'} = {
             'normalized' => 'subnode-fr'
           }
         ],
-        'normalized' => 'subnode-fr',
+        'normalized' => 'subnode-fr'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -442,7 +464,7 @@ $result_trees{'multiple_documentlanguage'} = {
               'text' => 'section fr'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -457,7 +479,8 @@ $result_trees{'multiple_documentlanguage'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -532,9 +555,11 @@ $result_sectioning{'multiple_documentlanguage'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -545,9 +570,11 @@ $result_sectioning{'multiple_documentlanguage'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -564,9 +591,11 @@ $result_sectioning{'multiple_documentlanguage'} = {
                   'extra' => {
                     'normalized' => 'chapter-fr'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -577,9 +606,11 @@ $result_sectioning{'multiple_documentlanguage'} = {
                         'extra' => {
                           'normalized' => 'subnode-pt'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.1',
@@ -594,9 +625,11 @@ $result_sectioning{'multiple_documentlanguage'} = {
                         'extra' => {
                           'normalized' => 'subnode-fr'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.2',
@@ -640,10 +673,12 @@ $result_nodes{'multiple_documentlanguage'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -651,12 +686,14 @@ $result_nodes{'multiple_documentlanguage'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -664,12 +701,14 @@ $result_nodes{'multiple_documentlanguage'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'chapter-fr'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -691,6 +730,7 @@ $result_menus{'multiple_documentlanguage'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index 20c2b031cb..f8d473fb23 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -18,7 +18,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'special_docbook_unnumbered'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +88,7 @@ $result_trees{'special_docbook_unnumbered'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -299,7 +301,7 @@ $result_trees{'special_docbook_unnumbered'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -308,9 +310,11 @@ $result_trees{'special_docbook_unnumbered'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -330,7 +334,8 @@ $result_trees{'special_docbook_unnumbered'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -347,7 +352,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'text' => 'Dedication'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -367,7 +372,9 @@ $result_trees{'special_docbook_unnumbered'} = {
             'normalized' => 'Dedication'
           }
         ],
-        'normalized' => 'Dedication',
+        'normalized' => 'Dedication'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -384,7 +391,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'text' => 'a dedication'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -413,7 +420,8 @@ $result_trees{'special_docbook_unnumbered'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -430,7 +438,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'text' => 'preface'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -450,7 +458,9 @@ $result_trees{'special_docbook_unnumbered'} = {
             'normalized' => 'preface'
           }
         ],
-        'normalized' => 'preface',
+        'normalized' => 'preface'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -467,7 +477,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'text' => 'The Preface'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -496,7 +506,8 @@ $result_trees{'special_docbook_unnumbered'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -513,7 +524,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'text' => 'colophon'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -533,7 +544,9 @@ $result_trees{'special_docbook_unnumbered'} = {
             'normalized' => 'colophon'
           }
         ],
-        'normalized' => 'colophon',
+        'normalized' => 'colophon'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -550,7 +563,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'text' => 'A colophon'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -579,7 +592,8 @@ $result_trees{'special_docbook_unnumbered'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -596,7 +610,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'text' => 'acknowledgements'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -616,7 +630,9 @@ $result_trees{'special_docbook_unnumbered'} = {
             'normalized' => 'acknowledgements'
           }
         ],
-        'normalized' => 'acknowledgements',
+        'normalized' => 'acknowledgements'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -633,7 +649,7 @@ $result_trees{'special_docbook_unnumbered'} = {
               'text' => 'A chapter Acnkowledgements'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -657,7 +673,8 @@ $result_trees{'special_docbook_unnumbered'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -764,9 +781,11 @@ $result_sectioning{'special_docbook_unnumbered'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -777,9 +796,11 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                   'extra' => {
                     'normalized' => 'Dedication'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_up' => {},
@@ -795,9 +816,11 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                   'extra' => {
                     'normalized' => 'preface'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -814,9 +837,11 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                   'extra' => {
                     'normalized' => 'colophon'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -833,9 +858,11 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                   'extra' => {
                     'normalized' => 'acknowledgements'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -877,6 +904,7 @@ $result_nodes{'special_docbook_unnumbered'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -886,6 +914,7 @@ $result_nodes{'special_docbook_unnumbered'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -893,10 +922,12 @@ $result_nodes{'special_docbook_unnumbered'} = {
         'associated_section' => {
           'cmdname' => 'unnumbered',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'Dedication'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -904,10 +935,12 @@ $result_nodes{'special_docbook_unnumbered'} = {
             'associated_section' => {
               'cmdname' => 'unnumbered',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             },
             'normalized' => 'preface'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -915,10 +948,12 @@ $result_nodes{'special_docbook_unnumbered'} = {
                 'associated_section' => {
                   'cmdname' => 'unnumbered',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {}
                 },
                 'normalized' => 'colophon'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -926,12 +961,14 @@ $result_nodes{'special_docbook_unnumbered'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 1
                       }
                     },
                     'normalized' => 'acknowledgements'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -967,30 +1004,35 @@ $result_menus{'special_docbook_unnumbered'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Dedication'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'preface'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'colophon'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'acknowledgements'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index bf56dd6faa..8fca009ef7 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -24,7 +24,7 @@ $result_trees{'anchor_in_caption'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -46,7 +46,7 @@ $result_trees{'anchor_in_caption'} = {
                   'text' => 'fl'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -55,7 +55,6 @@ $result_trees{'anchor_in_caption'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -63,6 +62,9 @@ $result_trees{'anchor_in_caption'} = {
               'normalized' => 'fl'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
@@ -90,7 +92,7 @@ $result_trees{'anchor_in_caption'} = {
                   'text' => 'label'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -171,7 +173,7 @@ $result_trees{'anchor_in_caption'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -180,9 +182,11 @@ $result_trees{'anchor_in_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -196,7 +200,6 @@ $result_trees{'anchor_in_caption'} = {
               {}
             ],
             'normalized' => 'label',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -204,6 +207,9 @@ $result_trees{'anchor_in_caption'} = {
               'normalized' => 'fl'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 5,
@@ -223,7 +229,9 @@ $result_trees{'anchor_in_caption'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -266,14 +274,16 @@ $result_nodes{'anchor_in_caption'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'anchor_in_caption'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'anchor_in_caption'} = [];
@@ -300,6 +310,7 @@ $result_floats{'anchor_in_caption'} = {
           'normalized' => 'fl'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 9191aa0d97..d4dfa267f2 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -24,7 +24,7 @@ $result_trees{'cindex_in_caption'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -46,7 +46,7 @@ $result_trees{'cindex_in_caption'} = {
                   'text' => 'fl'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -55,7 +55,6 @@ $result_trees{'cindex_in_caption'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -63,6 +62,9 @@ $result_trees{'cindex_in_caption'} = {
               'normalized' => 'fl'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
@@ -90,7 +92,7 @@ $result_trees{'cindex_in_caption'} = {
                   'text' => 'label'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -127,7 +129,7 @@ $result_trees{'cindex_in_caption'} = {
                                   'text' => 'index entry'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -147,7 +149,9 @@ $result_trees{'cindex_in_caption'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
                               'index_type_command' => 'cindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -186,7 +190,7 @@ $result_trees{'cindex_in_caption'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -195,9 +199,11 @@ $result_trees{'cindex_in_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -211,7 +217,6 @@ $result_trees{'cindex_in_caption'} = {
               {}
             ],
             'normalized' => 'label',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -219,6 +224,9 @@ $result_trees{'cindex_in_caption'} = {
               'normalized' => 'fl'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 5,
@@ -238,7 +246,7 @@ $result_trees{'cindex_in_caption'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -249,7 +257,9 @@ $result_trees{'cindex_in_caption'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -277,7 +287,9 @@ $result_trees{'cindex_in_caption'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -331,7 +343,8 @@ $result_nodes{'cindex_in_caption'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'cindex_in_caption'} = {
@@ -339,7 +352,8 @@ $result_menus{'cindex_in_caption'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'cindex_in_caption'} = [];
@@ -366,6 +380,7 @@ $result_floats{'cindex_in_caption'} = {
           'normalized' => 'fl'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl 
b/tp/t/results/float/comment_space_comand_in_float.pl
index 97f5adc22e..faab92710d 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -24,7 +24,7 @@ $result_trees{'comment_space_comand_in_float'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +76,9 @@ $result_trees{'comment_space_comand_in_float'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -101,7 +103,7 @@ $result_trees{'comment_space_comand_in_float'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -110,9 +112,11 @@ $result_trees{'comment_space_comand_in_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -126,7 +130,6 @@ $result_trees{'comment_space_comand_in_float'} = {
               {}
             ],
             'normalized' => 'label-',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {},
@@ -135,6 +138,9 @@ $result_trees{'comment_space_comand_in_float'} = {
               'normalized' => 'Text @ '
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
@@ -180,7 +186,6 @@ $result_trees{'comment_space_comand_in_float'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {},
@@ -189,6 +194,9 @@ $result_trees{'comment_space_comand_in_float'} = {
               'normalized' => 'Text @ '
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 7,
@@ -208,7 +216,9 @@ $result_trees{'comment_space_comand_in_float'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -249,14 +259,16 @@ $result_nodes{'comment_space_comand_in_float'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'comment_space_comand_in_float'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'comment_space_comand_in_float'} = [];
@@ -280,6 +292,7 @@ $result_floats{'comment_space_comand_in_float'} = {
           'normalized' => 'Text @ '
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index b82773ac28..081495eb67 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -24,7 +24,7 @@ $result_trees{'complex_float'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'complex_float'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'complex_float'} = {
               'text' => 'Test floats'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -92,7 +94,7 @@ $result_trees{'complex_float'} = {
                   'text' => 'Text'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +103,6 @@ $result_trees{'complex_float'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -109,6 +110,9 @@ $result_trees{'complex_float'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 5,
@@ -132,7 +136,7 @@ $result_trees{'complex_float'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -198,7 +202,7 @@ $result_trees{'complex_float'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -207,9 +211,11 @@ $result_trees{'complex_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -244,7 +250,7 @@ $result_trees{'complex_float'} = {
                   'text' => 'text with a lot of features'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -319,7 +325,7 @@ $result_trees{'complex_float'} = {
                           'text' => 'float example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -339,7 +345,9 @@ $result_trees{'complex_float'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -380,7 +388,7 @@ $result_trees{'complex_float'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -401,7 +409,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'truc'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => ' 
 '
                               },
@@ -409,7 +417,7 @@ $result_trees{'complex_float'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -446,7 +454,7 @@ $result_trees{'complex_float'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -455,9 +463,11 @@ $result_trees{'complex_float'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 36,
@@ -466,7 +476,9 @@ $result_trees{'complex_float'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -503,7 +515,7 @@ $result_trees{'complex_float'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -550,7 +562,7 @@ $result_trees{'complex_float'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -559,9 +571,11 @@ $result_trees{'complex_float'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 42,
@@ -570,7 +584,9 @@ $result_trees{'complex_float'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -919,7 +935,7 @@ $result_trees{'complex_float'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => ' 
 '
                           },
@@ -945,7 +961,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -954,9 +970,11 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 55,
@@ -1032,7 +1050,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'command_as_argument'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1053,7 +1071,7 @@ $result_trees{'complex_float'} = {
                                           'text' => 'truc'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => ' 
 '
                                       },
@@ -1061,7 +1079,7 @@ $result_trees{'complex_float'} = {
                                     }
                                   ],
                                   'cmdname' => 'item',
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'source_info' => {
@@ -1098,7 +1116,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'table'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1107,9 +1125,11 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'table'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 63,
@@ -1118,7 +1138,9 @@ $result_trees{'complex_float'} = {
                         }
                       ],
                       'extra' => {
-                        'command_as_argument' => {},
+                        'command_as_argument' => {}
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1165,7 +1187,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'bracketed'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1305,7 +1327,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'multitable'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1314,9 +1336,11 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'multitable'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 69,
@@ -1339,7 +1363,9 @@ $result_trees{'complex_float'} = {
                             ],
                             'type' => 'bracketed_multitable_prototype'
                           }
-                        ],
+                        ]
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1362,7 +1388,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'float example in caption'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1382,7 +1408,9 @@ $result_trees{'complex_float'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
                               'index_type_command' => 'cindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -1423,7 +1451,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'command_as_argument'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1470,7 +1498,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'itemize'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1479,9 +1507,11 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'itemize'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 77,
@@ -1490,7 +1520,9 @@ $result_trees{'complex_float'} = {
                         }
                       ],
                       'extra' => {
-                        'command_as_argument' => {},
+                        'command_as_argument' => {}
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1804,7 +1836,9 @@ $result_trees{'complex_float'} = {
               ],
               'cmdname' => 'caption',
               'extra' => {
-                'float' => {},
+                'float' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -2066,7 +2100,7 @@ $result_trees{'complex_float'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2075,9 +2109,11 @@ $result_trees{'complex_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 89,
@@ -2093,7 +2129,6 @@ $result_trees{'complex_float'} = {
             ],
             'normalized' => 'text-with-a-lot-of-features',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -2101,6 +2136,9 @@ $result_trees{'complex_float'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 12,
@@ -2113,7 +2151,8 @@ $result_trees{'complex_float'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2130,7 +2169,7 @@ $result_trees{'complex_float'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2150,7 +2189,9 @@ $result_trees{'complex_float'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2167,7 +2208,7 @@ $result_trees{'complex_float'} = {
               'text' => 'A chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2197,7 +2238,7 @@ $result_trees{'complex_float'} = {
                   'text' => 'float with a lot of features and no shortcaption'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -2262,7 +2303,7 @@ $result_trees{'complex_float'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => ' 
 '
                           },
@@ -2288,7 +2329,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -2297,9 +2338,11 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 102,
@@ -2341,7 +2384,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'command_as_argument'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -2362,7 +2405,7 @@ $result_trees{'complex_float'} = {
                                           'text' => 'truc 2'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => ' 
 '
                                       },
@@ -2370,7 +2413,7 @@ $result_trees{'complex_float'} = {
                                     }
                                   ],
                                   'cmdname' => 'item',
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'source_info' => {
@@ -2407,7 +2450,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'table'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -2416,9 +2459,11 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'table'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 108,
@@ -2427,7 +2472,9 @@ $result_trees{'complex_float'} = {
                         }
                       ],
                       'extra' => {
-                        'command_as_argument' => {},
+                        'command_as_argument' => {}
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -2474,7 +2521,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'bracketed'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -2614,7 +2661,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'multitable'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -2623,9 +2670,11 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'multitable'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 114,
@@ -2648,7 +2697,9 @@ $result_trees{'complex_float'} = {
                             ],
                             'type' => 'bracketed_multitable_prototype'
                           }
-                        ],
+                        ]
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -2671,7 +2722,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'float example in caption 2'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -2691,7 +2742,9 @@ $result_trees{'complex_float'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
                               'index_type_command' => 'cindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -2732,7 +2785,7 @@ $result_trees{'complex_float'} = {
                               'type' => 'command_as_argument'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -2779,7 +2832,7 @@ $result_trees{'complex_float'} = {
                                   'text' => 'itemize'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -2788,9 +2841,11 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'itemize'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 122,
@@ -2799,7 +2854,9 @@ $result_trees{'complex_float'} = {
                         }
                       ],
                       'extra' => {
-                        'command_as_argument' => {},
+                        'command_as_argument' => {}
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -3147,7 +3204,9 @@ $result_trees{'complex_float'} = {
               ],
               'cmdname' => 'caption',
               'extra' => {
-                'float' => {},
+                'float' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -3173,7 +3232,7 @@ $result_trees{'complex_float'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3182,9 +3241,11 @@ $result_trees{'complex_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 134,
@@ -3199,7 +3260,6 @@ $result_trees{'complex_float'} = {
               {}
             ],
             'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -3207,6 +3267,9 @@ $result_trees{'complex_float'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 94,
@@ -3260,7 +3323,8 @@ $result_trees{'complex_float'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3511,9 +3575,11 @@ $result_sectioning{'complex_float'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -3524,9 +3590,11 @@ $result_sectioning{'complex_float'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -3555,6 +3623,7 @@ $result_nodes{'complex_float'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -3564,6 +3633,7 @@ $result_nodes{'complex_float'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -3571,12 +3641,14 @@ $result_nodes{'complex_float'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -3594,12 +3666,14 @@ $result_menus{'complex_float'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
@@ -3623,11 +3697,13 @@ $result_floats{'complex_float'} = {
           'cmdname' => 'caption',
           'extra' => {
             'float' => {}
-          }
+          },
+          'info' => {}
         },
         'float_section' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'text-with-a-lot-of-features',
@@ -3646,6 +3722,7 @@ $result_floats{'complex_float'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -3657,11 +3734,13 @@ $result_floats{'complex_float'} = {
           'cmdname' => 'caption',
           'extra' => {
             'float' => {}
-          }
+          },
+          'info' => {}
         },
         'float_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -3676,6 +3755,7 @@ $result_floats{'complex_float'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
diff --git a/tp/t/results/float/empty_caption.pl 
b/tp/t/results/float/empty_caption.pl
index a2e4cf272a..9f9ac72d02 100644
--- a/tp/t/results/float/empty_caption.pl
+++ b/tp/t/results/float/empty_caption.pl
@@ -29,7 +29,7 @@ $result_trees{'empty_caption'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -77,7 +77,7 @@ $result_trees{'empty_caption'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -86,9 +86,11 @@ $result_trees{'empty_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -102,7 +104,6 @@ $result_trees{'empty_caption'} = {
               {}
             ],
             'normalized' => 'b',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -110,6 +111,9 @@ $result_trees{'empty_caption'} = {
               'normalized' => 'a'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -132,7 +136,7 @@ $result_trees{'empty_caption'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -180,7 +184,7 @@ $result_trees{'empty_caption'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -189,9 +193,11 @@ $result_trees{'empty_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -205,11 +211,13 @@ $result_trees{'empty_caption'} = {
             ],
             'normalized' => 'c',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 6,
@@ -224,7 +232,7 @@ $result_trees{'empty_caption'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -292,7 +300,7 @@ $result_trees{'empty_caption'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -301,9 +309,11 @@ $result_trees{'empty_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -388,6 +398,7 @@ $result_floats{'empty_caption'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -433,6 +444,7 @@ $result_floats{'empty_caption'} = {
           'normalized' => 'a'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/float/empty_label_no_space.pl 
b/tp/t/results/float/empty_label_no_space.pl
index 4cf4295d43..9a9921005e 100644
--- a/tp/t/results/float/empty_label_no_space.pl
+++ b/tp/t/results/float/empty_label_no_space.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_label_no_space'} = {
               'type' => 'block_line_arg'
             },
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -41,7 +41,7 @@ $result_trees{'empty_label_no_space'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -50,9 +50,11 @@ $result_trees{'empty_label_no_space'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -61,7 +63,6 @@ $result_trees{'empty_label_no_space'} = {
             }
           ],
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -69,6 +70,9 @@ $result_trees{'empty_label_no_space'} = {
               'normalized' => 'Type'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -107,7 +111,8 @@ $result_floats{'empty_label_no_space'} = {
           ],
           'normalized' => 'Type'
         }
-      }
+      },
+      'info' => {}
     }
   ]
 };
diff --git a/tp/t/results/float/empty_label_no_space_comment.pl 
b/tp/t/results/float/empty_label_no_space_comment.pl
index 144ade15dd..4c881363c6 100644
--- a/tp/t/results/float/empty_label_no_space_comment.pl
+++ b/tp/t/results/float/empty_label_no_space_comment.pl
@@ -55,7 +55,7 @@ $result_trees{'empty_label_no_space_comment'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -64,9 +64,11 @@ $result_trees{'empty_label_no_space_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -75,7 +77,6 @@ $result_trees{'empty_label_no_space_comment'} = {
             }
           ],
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -83,6 +84,9 @@ $result_trees{'empty_label_no_space_comment'} = {
               'normalized' => 'Type'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -121,7 +125,8 @@ $result_floats{'empty_label_no_space_comment'} = {
           ],
           'normalized' => 'Type'
         }
-      }
+      },
+      'info' => {}
     }
   ]
 };
diff --git a/tp/t/results/float/empty_label_with_space.pl 
b/tp/t/results/float/empty_label_with_space.pl
index 3dfd29b9ea..baaa7dbc99 100644
--- a/tp/t/results/float/empty_label_with_space.pl
+++ b/tp/t/results/float/empty_label_with_space.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_label_with_space'} = {
               'type' => 'block_line_arg'
             },
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -41,7 +41,7 @@ $result_trees{'empty_label_with_space'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -50,9 +50,11 @@ $result_trees{'empty_label_with_space'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -61,7 +63,6 @@ $result_trees{'empty_label_with_space'} = {
             }
           ],
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -69,6 +70,9 @@ $result_trees{'empty_label_with_space'} = {
               'normalized' => 'Type'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -107,7 +111,8 @@ $result_floats{'empty_label_with_space'} = {
           ],
           'normalized' => 'Type'
         }
-      }
+      },
+      'info' => {}
     }
   ]
 };
diff --git a/tp/t/results/float/empty_label_with_space_comment.pl 
b/tp/t/results/float/empty_label_with_space_comment.pl
index 369a341824..efcf87c3a9 100644
--- a/tp/t/results/float/empty_label_with_space_comment.pl
+++ b/tp/t/results/float/empty_label_with_space_comment.pl
@@ -40,7 +40,9 @@ $result_trees{'empty_label_with_space_comment'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -56,7 +58,7 @@ $result_trees{'empty_label_with_space_comment'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +67,11 @@ $result_trees{'empty_label_with_space_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -76,7 +80,6 @@ $result_trees{'empty_label_with_space_comment'} = {
             }
           ],
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -84,6 +87,9 @@ $result_trees{'empty_label_with_space_comment'} = {
               'normalized' => 'Type'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -122,7 +128,8 @@ $result_floats{'empty_label_with_space_comment'} = {
           ],
           'normalized' => 'Type'
         }
-      }
+      },
+      'info' => {}
     }
   ]
 };
diff --git a/tp/t/results/float/empty_listoffloats.pl 
b/tp/t/results/float/empty_listoffloats.pl
index e4bb1d2ab0..ccd468a220 100644
--- a/tp/t/results/float/empty_listoffloats.pl
+++ b/tp/t/results/float/empty_listoffloats.pl
@@ -16,7 +16,7 @@ $result_trees{'empty_listoffloats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl 
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index 9bfc5495eb..8e3dde2094 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -34,7 +34,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                   'text' => 'label1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -61,7 +61,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -70,9 +70,11 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -85,11 +87,13 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               {}
             ],
             'normalized' => 'label1',
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
@@ -112,7 +116,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                   'text' => 'label2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -169,7 +173,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -178,9 +182,11 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -194,11 +200,13 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               {}
             ],
             'normalized' => 'label2',
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 6,
@@ -213,7 +221,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -239,7 +247,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -248,9 +256,11 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -277,7 +287,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -333,7 +343,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -342,9 +352,11 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -372,7 +384,7 @@ $result_trees{'empty_listoffloats_with_floats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -454,6 +466,7 @@ $result_floats{'empty_listoffloats_with_floats'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -472,6 +485,7 @@ $result_floats{'empty_listoffloats_with_floats'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 2
       }
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 7ee6570c5e..419d603043 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -14,7 +14,7 @@ $result_trees{'float_copying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,7 +44,7 @@ $result_trees{'float_copying'} = {
                           'text' => 'public domain'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -144,7 +144,7 @@ $result_trees{'float_copying'} = {
                                                   'text' => 'indexed caption 
copying footnote'
                                                 }
                                               ],
-                                              'extra' => {
+                                              'info' => {
                                                 'spaces_after_argument' => '
 '
                                               },
@@ -164,7 +164,9 @@ $result_trees{'float_copying'} = {
                                               'index_ignore_chars' => {},
                                               'index_name' => 'cp',
                                               'index_type_command' => 'cindex'
-                                            },
+                                            }
+                                          },
+                                          'info' => {
                                             'spaces_before_argument' => ' '
                                           },
                                           'source_info' => {
@@ -182,7 +184,7 @@ $result_trees{'float_copying'} = {
                                                   'text' => 'public domain 
function'
                                                 }
                                               ],
-                                              'extra' => {
+                                              'info' => {
                                                 'spaces_after_argument' => '
 '
                                               },
@@ -202,7 +204,9 @@ $result_trees{'float_copying'} = {
                                               'index_ignore_chars' => {},
                                               'index_name' => 'fn',
                                               'index_type_command' => 'findex'
-                                            },
+                                            }
+                                          },
+                                          'info' => {
                                             'spaces_before_argument' => ' '
                                           },
                                           'source_info' => {
@@ -243,7 +247,7 @@ $result_trees{'float_copying'} = {
                                                           'text' => 'Copying 
and floats'
                                                         }
                                                       ],
-                                                      'extra' => {
+                                                      'info' => {
                                                         
'spaces_after_argument' => '
 '
                                                       },
@@ -264,7 +268,9 @@ $result_trees{'float_copying'} = {
                                                         'normalized' => 
'Copying-and-floats'
                                                       }
                                                     ],
-                                                    'normalized' => 
'Copying-and-floats',
+                                                    'normalized' => 
'Copying-and-floats'
+                                                  },
+                                                  'info' => {
                                                     'spaces_before_argument' 
=> ' '
                                                   },
                                                   'source_info' => {
@@ -303,7 +309,7 @@ $result_trees{'float_copying'} = {
                                     }
                                   ],
                                   'cmdname' => 'footnote',
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => '
 '
                                   },
@@ -365,7 +371,7 @@ $result_trees{'float_copying'} = {
                                       'text' => 'indexed caption'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -385,7 +391,9 @@ $result_trees{'float_copying'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
                                   'index_type_command' => 'cindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -403,7 +411,7 @@ $result_trees{'float_copying'} = {
                                       'text' => 'indexed caption function'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -423,7 +431,9 @@ $result_trees{'float_copying'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
                                   'index_type_command' => 'findex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -460,7 +470,7 @@ $result_trees{'float_copying'} = {
                               'text' => 'float'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -469,9 +479,11 @@ $result_trees{'float_copying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'float'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 23,
@@ -485,7 +497,6 @@ $result_trees{'float_copying'} = {
                       {}
                     ],
                     'normalized' => 'public-domain',
-                    'spaces_before_argument' => ' ',
                     'type' => {
                       'content' => [
                         {}
@@ -493,6 +504,9 @@ $result_trees{'float_copying'} = {
                       'normalized' => 'Copyright notice'
                     }
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -507,7 +521,7 @@ $result_trees{'float_copying'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -516,9 +530,11 @@ $result_trees{'float_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 24,
@@ -551,7 +567,7 @@ $result_trees{'float_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -571,7 +587,9 @@ $result_trees{'float_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -588,7 +606,7 @@ $result_trees{'float_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -625,7 +643,7 @@ $result_trees{'float_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -691,7 +709,7 @@ $result_trees{'float_copying'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -700,9 +718,11 @@ $result_trees{'float_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 33,
@@ -722,7 +742,8 @@ $result_trees{'float_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -740,7 +761,7 @@ $result_trees{'float_copying'} = {
               'text' => 'Copying and floats'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -797,7 +818,7 @@ $result_trees{'float_copying'} = {
                   'text' => 'Copyright notice'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -806,7 +827,6 @@ $result_trees{'float_copying'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -814,6 +834,9 @@ $result_trees{'float_copying'} = {
               'normalized' => 'Copyright notice'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 41,
@@ -833,7 +856,7 @@ $result_trees{'float_copying'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -844,7 +867,9 @@ $result_trees{'float_copying'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -861,7 +886,7 @@ $result_trees{'float_copying'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -872,7 +897,9 @@ $result_trees{'float_copying'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -882,7 +909,8 @@ $result_trees{'float_copying'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1000,9 +1028,11 @@ $result_sectioning{'float_copying'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1014,9 +1044,11 @@ $result_sectioning{'float_copying'} = {
                     'isindex' => 1,
                     'normalized' => 'Copying-and-floats'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 'A',
@@ -1045,6 +1077,7 @@ $result_nodes{'float_copying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1054,6 +1087,7 @@ $result_nodes{'float_copying'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1061,6 +1095,7 @@ $result_nodes{'float_copying'} = {
         'associated_section' => {
           'cmdname' => 'appendix',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 'A'
           }
@@ -1068,6 +1103,7 @@ $result_nodes{'float_copying'} = {
         'isindex' => 1,
         'normalized' => 'Copying-and-floats'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1085,6 +1121,7 @@ $result_menus{'float_copying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1092,6 +1129,7 @@ $result_menus{'float_copying'} = {
         'isindex' => 1,
         'normalized' => 'Copying-and-floats'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
@@ -1127,6 +1165,7 @@ $result_floats{'float_copying'} = {
           'normalized' => 'Copyright notice'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/float/float_with_at_commands.pl 
b/tp/t/results/float/float_with_at_commands.pl
index cec8fd8951..0937282517 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -92,7 +92,7 @@ $result_trees{'float_with_at_commands'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -243,7 +243,7 @@ $result_trees{'float_with_at_commands'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -252,9 +252,11 @@ $result_trees{'float_with_at_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -272,7 +274,6 @@ $result_trees{'float_with_at_commands'} = {
               {}
             ],
             'normalized' => 'premi_00e8re-entr_00e9e',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {},
@@ -282,6 +283,9 @@ $result_trees{'float_with_at_commands'} = {
               'normalized' => 'entr@\'ee'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -327,7 +331,7 @@ $result_trees{'float_with_at_commands'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -336,7 +340,6 @@ $result_trees{'float_with_at_commands'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {},
@@ -346,6 +349,9 @@ $result_trees{'float_with_at_commands'} = {
               'normalized' => 'entr@\'ee'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 9,
@@ -423,6 +429,7 @@ $result_floats{'float_with_at_commands'} = {
           'normalized' => 'entr@\'ee'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index f5ca2719a0..9c372d0aeb 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -24,7 +24,7 @@ $result_trees{'footnote_in_caption'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -46,7 +46,7 @@ $result_trees{'footnote_in_caption'} = {
                   'text' => 'fl'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -55,7 +55,6 @@ $result_trees{'footnote_in_caption'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -63,6 +62,9 @@ $result_trees{'footnote_in_caption'} = {
               'normalized' => 'fl'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
@@ -90,7 +92,7 @@ $result_trees{'footnote_in_caption'} = {
                   'text' => 'label'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -170,7 +172,7 @@ $result_trees{'footnote_in_caption'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -179,9 +181,11 @@ $result_trees{'footnote_in_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -195,7 +199,6 @@ $result_trees{'footnote_in_caption'} = {
               {}
             ],
             'normalized' => 'label',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -203,6 +206,9 @@ $result_trees{'footnote_in_caption'} = {
               'normalized' => 'fl'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 5,
@@ -222,7 +228,9 @@ $result_trees{'footnote_in_caption'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -264,14 +272,16 @@ $result_nodes{'footnote_in_caption'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'footnote_in_caption'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'footnote_in_caption'} = [];
@@ -298,6 +308,7 @@ $result_floats{'footnote_in_caption'} = {
           'normalized' => 'fl'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
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 2e4fe57641..7d9682ee48 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -24,7 +24,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -46,7 +46,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
                   'text' => 'fl'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -55,7 +55,6 @@ $result_trees{'footnote_in_caption_and_error'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -63,6 +62,9 @@ $result_trees{'footnote_in_caption_and_error'} = {
               'normalized' => 'fl'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
@@ -90,7 +92,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
                   'text' => 'label'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -178,7 +180,7 @@ $result_trees{'footnote_in_caption_and_error'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -187,9 +189,11 @@ $result_trees{'footnote_in_caption_and_error'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -203,7 +207,6 @@ $result_trees{'footnote_in_caption_and_error'} = {
               {}
             ],
             'normalized' => 'label',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -211,6 +214,9 @@ $result_trees{'footnote_in_caption_and_error'} = {
               'normalized' => 'fl'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 5,
@@ -230,7 +236,9 @@ $result_trees{'footnote_in_caption_and_error'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -272,14 +280,16 @@ $result_nodes{'footnote_in_caption_and_error'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'footnote_in_caption_and_error'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'footnote_in_caption_and_error'} = [
@@ -316,6 +326,7 @@ $result_floats{'footnote_in_caption_and_error'} = {
           'normalized' => 'fl'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/float/listoffloats_with_commands.pl 
b/tp/t/results/float/listoffloats_with_commands.pl
index 16546786c5..f1a3990726 100644
--- a/tp/t/results/float/listoffloats_with_commands.pl
+++ b/tp/t/results/float/listoffloats_with_commands.pl
@@ -63,7 +63,7 @@ $result_trees{'listoffloats_with_commands'} = {
                   'text' => 'me'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -72,7 +72,6 @@ $result_trees{'listoffloats_with_commands'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {},
@@ -84,6 +83,9 @@ $result_trees{'listoffloats_with_commands'} = {
               'normalized' => 'th@\'eor@`eme'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index c9a956ac9d..d5f6e984b3 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -24,7 +24,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'Test floats'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'text with a lot of features'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -137,7 +139,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'caption',
               'extra' => {
-                'float' => {},
+                'float' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -201,7 +205,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -210,9 +214,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -228,7 +234,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'text-with-a-lot-of-features',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -236,6 +241,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 4,
@@ -255,7 +263,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'Text'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -346,7 +354,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -355,9 +363,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -369,7 +379,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -377,6 +386,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 10,
@@ -399,7 +411,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'label but no type'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -490,7 +502,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -499,9 +511,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -517,11 +531,13 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'label-but-no-type',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 17,
@@ -549,7 +565,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'label but no type and no caption'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -580,7 +596,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -589,9 +605,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -605,11 +623,13 @@ $result_trees{'numbering_captions_listoffloats'} = {
               {}
             ],
             'normalized' => 'label-but-no-type-and-no-caption',
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 25,
@@ -629,7 +649,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -660,7 +680,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -669,9 +689,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -699,7 +721,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -785,7 +807,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -794,9 +816,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 40,
@@ -834,7 +858,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'label but no type 2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -925,7 +949,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -934,9 +958,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 47,
@@ -952,11 +978,13 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'label-but-no-type-2',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 42,
@@ -984,7 +1012,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'warning in top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -1076,7 +1104,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1085,9 +1113,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 54,
@@ -1103,7 +1133,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'warning-in-top',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -1111,6 +1140,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Warning'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 49,
@@ -1125,7 +1157,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1387,7 +1419,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1396,9 +1428,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 62,
@@ -1418,7 +1452,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1435,7 +1470,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1455,7 +1490,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1472,7 +1509,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'A chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1502,7 +1539,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'text in chapter'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -1564,7 +1601,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1573,9 +1610,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 71,
@@ -1590,7 +1629,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               {}
             ],
             'normalized' => 'text-in-chapter',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -1598,6 +1636,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 67,
@@ -1625,7 +1666,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'float with a lot of features and no shortcaption'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -1666,7 +1707,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'caption',
               'extra' => {
-                'float' => {},
+                'float' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1687,7 +1730,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1696,9 +1739,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 75,
@@ -1713,7 +1758,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               {}
             ],
             'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -1721,6 +1765,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 73,
@@ -1790,7 +1837,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'theoreme'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -1936,7 +1983,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1945,9 +1992,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 81,
@@ -1962,7 +2011,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               {}
             ],
             'normalized' => 'theoreme',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {},
@@ -1974,6 +2022,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'th@\'eor@`eme'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 77,
@@ -1996,7 +2047,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'label but no type in chapter'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2087,7 +2138,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2096,9 +2147,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 88,
@@ -2114,11 +2167,13 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'label-but-no-type-in-chapter',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 83,
@@ -2146,7 +2201,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'warning in chapter'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -2238,7 +2293,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2247,9 +2302,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 95,
@@ -2265,7 +2322,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'warning-in-chapter',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -2273,6 +2329,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Warning'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 90,
@@ -2287,7 +2346,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2353,7 +2412,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2362,9 +2421,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 99,
@@ -2384,7 +2445,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2401,7 +2463,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2421,7 +2483,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2438,7 +2502,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'A section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2468,7 +2532,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'text in section'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -2505,7 +2569,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2514,9 +2578,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 108,
@@ -2530,7 +2596,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               {}
             ],
             'normalized' => 'text-in-section',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -2538,6 +2603,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 104,
@@ -2550,7 +2618,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2567,7 +2636,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'Unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2587,7 +2656,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'normalized' => 'Unnumbered'
           }
         ],
-        'normalized' => 'Unnumbered',
+        'normalized' => 'Unnumbered'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2604,7 +2675,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'Unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2621,7 +2692,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2687,7 +2758,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2696,9 +2767,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 115,
@@ -2728,7 +2801,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'unnumbered float'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -2815,7 +2888,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2824,9 +2897,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 120,
@@ -2842,7 +2917,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'unnumbered-float',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -2850,6 +2924,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 116,
@@ -2867,7 +2944,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'label but no type in unnumbered'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2958,7 +3035,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2967,9 +3044,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 126,
@@ -2985,11 +3064,13 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'label-but-no-type-in-unnumbered',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 121,
@@ -3007,7 +3088,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3024,7 +3106,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'Section within unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3044,7 +3126,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'normalized' => 'Section-within-unnumbered'
           }
         ],
-        'normalized' => 'Section-within-unnumbered',
+        'normalized' => 'Section-within-unnumbered'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3061,7 +3145,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'Section within unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3096,7 +3180,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'Section within unnumbered float'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -3183,7 +3267,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3192,9 +3276,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 137,
@@ -3210,7 +3296,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'Section-within-unnumbered-float',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -3218,6 +3303,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 133,
@@ -3230,7 +3318,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3247,7 +3336,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'Chapter with unnumbsubsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3267,7 +3356,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'normalized' => 'Chapter-with-unnumbsubsec'
           }
         ],
-        'normalized' => 'Chapter-with-unnumbsubsec',
+        'normalized' => 'Chapter-with-unnumbsubsec'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3284,7 +3375,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'Chapter with unnumbsubsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3301,7 +3392,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3367,7 +3458,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3376,9 +3467,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 144,
@@ -3408,7 +3501,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'Chapter with subsec float'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -3495,7 +3588,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3504,9 +3597,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 149,
@@ -3522,7 +3617,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'Chapter-with-subsec-float',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -3530,6 +3624,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 145,
@@ -3542,7 +3639,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3559,7 +3657,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'unnumbered sec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3579,7 +3677,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'normalized' => 'unnumbered-sec'
           }
         ],
-        'normalized' => 'unnumbered-sec',
+        'normalized' => 'unnumbered-sec'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3596,7 +3696,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'unnumbered sec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3626,7 +3726,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'unnumbered sec float'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -3713,7 +3813,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3722,9 +3822,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 158,
@@ -3740,7 +3842,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'unnumbered-sec-float',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -3748,6 +3849,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 154,
@@ -3770,7 +3874,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'label but no type in unnumbered subsec in chapter'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3861,7 +3965,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3870,9 +3974,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 165,
@@ -3888,11 +3994,13 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 
'label-but-no-type-in-unnumbered-subsec-in-chapter',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 160,
@@ -3905,7 +4013,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3922,7 +4031,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'Appendix for float'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3942,7 +4051,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'normalized' => 'Appendix-for-float'
           }
         ],
-        'normalized' => 'Appendix-for-float',
+        'normalized' => 'Appendix-for-float'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3959,7 +4070,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'Appendix for float'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3989,7 +4100,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'appendix sec float'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -4081,7 +4192,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4090,9 +4201,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 175,
@@ -4108,7 +4221,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'appendix-sec-float',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -4116,6 +4228,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 170,
@@ -4128,7 +4243,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4145,7 +4261,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'list of floats'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4165,7 +4281,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'normalized' => 'list-of-floats'
           }
         ],
-        'normalized' => 'list-of-floats',
+        'normalized' => 'list-of-floats'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4182,7 +4300,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'text' => 'list of floats'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4327,7 +4445,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'cross ref'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -4338,7 +4456,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -4394,7 +4512,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'cross ref'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -4405,7 +4523,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -4416,7 +4534,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -4470,7 +4588,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'cross ref'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -4481,7 +4599,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -4495,7 +4613,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'printed manual title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -4579,7 +4697,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'Text'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4588,7 +4706,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -4596,6 +4713,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 195,
@@ -4652,7 +4772,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'text' => 'me'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4661,7 +4781,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {},
@@ -4673,6 +4792,9 @@ $result_trees{'numbering_captions_listoffloats'} = {
               'normalized' => 'th@\'eor@`eme'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 196,
@@ -4685,7 +4807,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5260,9 +5383,11 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -5273,9 +5398,11 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -5286,9 +5413,11 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -5311,9 +5440,11 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'Unnumbered'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -5324,9 +5455,11 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                         'extra' => {
                           'normalized' => 'Section-within-unnumbered'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_up' => {}
@@ -5348,9 +5481,11 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'Chapter-with-unnumbsubsec'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -5361,9 +5496,11 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                         'extra' => {
                           'normalized' => 'unnumbered-sec'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_up' => {}
@@ -5386,9 +5523,11 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'Appendix-for-float'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 'A',
@@ -5406,9 +5545,11 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'list-of-floats'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -5456,6 +5597,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -5465,6 +5607,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -5472,6 +5615,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -5483,6 +5627,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -5490,12 +5635,14 @@ $result_nodes{'numbering_captions_listoffloats'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
             },
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -5506,6 +5653,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
             'associated_section' => {
               'cmdname' => 'unnumbered',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             },
             'menus' => [
@@ -5515,6 +5663,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
             ],
             'normalized' => 'Unnumbered'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -5522,10 +5671,12 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {}
                 },
                 'normalized' => 'Section-within-unnumbered'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -5536,6 +5687,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 2
                   }
@@ -5547,6 +5699,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                 ],
                 'normalized' => 'Chapter-with-unnumbsubsec'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
@@ -5554,10 +5707,12 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                     'associated_section' => {
                       'cmdname' => 'unnumberedsec',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {}
                     },
                     'normalized' => 'unnumbered-sec'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_up' => {}
                   }
@@ -5568,12 +5723,14 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                     'associated_section' => {
                       'cmdname' => 'appendix',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 'A'
                       }
                     },
                     'normalized' => 'Appendix-for-float'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -5581,10 +5738,12 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                         'associated_section' => {
                           'cmdname' => 'unnumbered',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {}
                         },
                         'normalized' => 'list-of-floats'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_prev' => {},
                         'node_up' => {}
@@ -5629,18 +5788,21 @@ $result_menus{'numbering_captions_listoffloats'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
@@ -5653,12 +5815,14 @@ $result_menus{'numbering_captions_listoffloats'} = {
           'extra' => {
             'normalized' => 'Unnumbered'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Section-within-unnumbered'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
@@ -5671,12 +5835,14 @@ $result_menus{'numbering_captions_listoffloats'} = {
               'extra' => {
                 'normalized' => 'Chapter-with-unnumbsubsec'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'unnumbered-sec'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_up' => {},
                     'menu_up_hash' => {
@@ -5689,12 +5855,14 @@ $result_menus{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'Appendix-for-float'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'list-of-floats'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_prev' => {},
                         'menu_up' => {},
@@ -5762,6 +5930,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'float_section' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'label-but-no-type',
@@ -5775,6 +5944,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -5788,6 +5958,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 2
       }
@@ -5843,6 +6014,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 3
       }
@@ -5859,6 +6031,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'float_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -5874,6 +6047,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
@@ -5890,6 +6064,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'float_section' => {
           'cmdname' => 'unnumbered',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'label-but-no-type-in-unnumbered',
@@ -5903,6 +6078,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 5
       }
@@ -5919,6 +6095,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'float_section' => {
           'cmdname' => 'unnumberedsec',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'label-but-no-type-in-unnumbered-subsec-in-chapter',
@@ -5932,6 +6109,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '2.1'
       }
@@ -5945,7 +6123,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'cmdname' => 'caption',
           'extra' => {
             'float' => {}
-          }
+          },
+          'info' => {}
         },
         'float_section' => {},
         'normalized' => 'text-with-a-lot-of-features',
@@ -5964,6 +6143,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -5992,7 +6172,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
           ],
           'normalized' => 'Text'
         }
-      }
+      },
+      'info' => {}
     },
     {
       'cmdname' => 'float',
@@ -6014,6 +6195,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
@@ -6025,7 +6207,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'cmdname' => 'caption',
           'extra' => {
             'float' => {}
-          }
+          },
+          'info' => {}
         },
         'float_section' => {},
         'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
@@ -6038,6 +6221,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.2'
       }
@@ -6048,6 +6232,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'float_section' => {
           'cmdname' => 'section',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => '1.1'
           }
@@ -6062,6 +6247,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.3'
       }
@@ -6092,6 +6278,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 5
       }
@@ -6108,6 +6295,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'float_section' => {
           'cmdname' => 'section',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'Section-within-unnumbered-float',
@@ -6126,6 +6314,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 6
       }
@@ -6142,6 +6331,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'float_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 2
           }
@@ -6162,6 +6352,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '2.1'
       }
@@ -6192,6 +6383,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '2.2'
       }
@@ -6208,6 +6400,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'float_section' => {
           'cmdname' => 'appendix',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 'A'
           }
@@ -6228,6 +6421,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 'A.1'
       }
@@ -6260,6 +6454,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Warning'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -6290,6 +6485,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Warning'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
@@ -6328,6 +6524,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'th@\'eor@`eme'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index 03e48e99fe..a545ed1c6b 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -29,7 +29,7 @@ $result_trees{'ref_to_float'} = {
                   'text' => 'Label1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -56,7 +56,7 @@ $result_trees{'ref_to_float'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +65,11 @@ $result_trees{'ref_to_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -80,7 +82,6 @@ $result_trees{'ref_to_float'} = {
               {}
             ],
             'normalized' => 'Label1',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -88,6 +89,9 @@ $result_trees{'ref_to_float'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -110,7 +114,7 @@ $result_trees{'ref_to_float'} = {
                   'text' => 'Label2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -137,7 +141,7 @@ $result_trees{'ref_to_float'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -146,9 +150,11 @@ $result_trees{'ref_to_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -161,11 +167,13 @@ $result_trees{'ref_to_float'} = {
               {}
             ],
             'normalized' => 'Label2',
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 5,
@@ -306,6 +314,7 @@ $result_floats{'ref_to_float'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -325,6 +334,7 @@ $result_floats{'ref_to_float'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index 7a46a689e9..153ad02e8d 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -29,7 +29,7 @@ $result_trees{'simple'} = {
                   'text' => 'Label'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -96,9 +96,11 @@ $result_trees{'simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -112,7 +114,6 @@ $result_trees{'simple'} = {
               {}
             ],
             'normalized' => 'Label',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -120,6 +121,9 @@ $result_trees{'simple'} = {
               'normalized' => 'Type'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -174,6 +178,7 @@ $result_floats{'simple'} = {
           'normalized' => 'Type'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index 734c75d52c..458943275c 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -24,7 +24,7 @@ $result_trees{'accent'} = {
               'text' => 'Top node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'accent'} = {
             'normalized' => 'Top-node'
           }
         ],
-        'normalized' => 'Top-node',
+        'normalized' => 'Top-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'accent'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2084,7 +2086,8 @@ $result_trees{'accent'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2268,9 +2271,11 @@ $result_sectioning{'accent'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top-node'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -2288,17 +2293,20 @@ $result_nodes{'accent'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'accent'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'accent'} = [];
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index ef2bdad30a..9f8a570d45 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -24,7 +24,7 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'Top node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'accent_enable_encoding'} = {
             'normalized' => 'Top-node'
           }
         ],
-        'normalized' => 'Top-node',
+        'normalized' => 'Top-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'accent_enable_encoding'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2084,7 +2086,8 @@ $result_trees{'accent_enable_encoding'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2268,9 +2271,11 @@ $result_sectioning{'accent_enable_encoding'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top-node'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -2288,17 +2293,20 @@ $result_nodes{'accent_enable_encoding'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'accent_enable_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'accent_enable_encoding'} = [];
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index 2da6e95ad7..3a6aaaceb2 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -19,7 +19,7 @@ $result_trees{'accentenc'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,9 +30,11 @@ $result_trees{'accentenc'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -58,7 +60,7 @@ $result_trees{'accentenc'} = {
               'text' => 'Top node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -78,7 +80,9 @@ $result_trees{'accentenc'} = {
             'normalized' => 'Top-node'
           }
         ],
-        'normalized' => 'Top-node',
+        'normalized' => 'Top-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -95,7 +99,7 @@ $result_trees{'accentenc'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2118,7 +2122,8 @@ $result_trees{'accentenc'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2305,9 +2310,11 @@ $result_sectioning{'accentenc'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top-node'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -2325,17 +2332,20 @@ $result_nodes{'accentenc'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'accentenc'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'accentenc'} = [];
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index 7441b2b2eb..e6e810e827 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -17,7 +17,7 @@ $result_trees{'accentenc_enable_encoding'} = {
                   'text' => 'ISO-8859-1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'accentenc_enable_encoding'} = {
           'extra' => {
             'input_encoding_name' => 'iso-8859-1',
             'input_perl_encoding' => 'iso-8859-1',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ISO-8859-1'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -53,7 +55,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'Top node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -73,7 +75,9 @@ $result_trees{'accentenc_enable_encoding'} = {
             'normalized' => 'Top-node'
           }
         ],
-        'normalized' => 'Top-node',
+        'normalized' => 'Top-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -90,7 +94,7 @@ $result_trees{'accentenc_enable_encoding'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2113,7 +2117,8 @@ $result_trees{'accentenc_enable_encoding'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2300,9 +2305,11 @@ $result_sectioning{'accentenc_enable_encoding'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top-node'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -2320,17 +2327,20 @@ $result_nodes{'accentenc_enable_encoding'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'accentenc_enable_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'accentenc_enable_encoding'} = [];
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index 2432e5c497..b564b1604e 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -24,7 +24,7 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -78,7 +80,7 @@ $result_trees{'at_commands_in_refs'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2420,7 +2422,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'text' => 'fff'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -2541,7 +2543,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'text' => 'rrr'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -2668,7 +2670,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'text' => 'the someone'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -3802,7 +3804,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'text' => 'text'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -3897,7 +3899,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3906,9 +3908,11 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -3928,7 +3932,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3957,7 +3962,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '}'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3985,7 +3990,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '-_007b-_007d'
           }
         ],
-        'normalized' => '-_007b-_007d',
+        'normalized' => '-_007b-_007d'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4014,7 +4021,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '}'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4029,7 +4036,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4094,7 +4102,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '@'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4146,7 +4154,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           }
         ],
-        'normalized' => '-_0021-_002e-_002e-_003f-_0040',
+        'normalized' => '-_0021-_002e-_002e-_003f-_0040'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4211,7 +4221,7 @@ $result_trees{'at_commands_in_refs'} = {
               'cmdname' => '@'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4226,7 +4236,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4317,7 +4328,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4353,7 +4364,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '_0040-_007b-_007d-_005c-_0023'
           }
         ],
-        'normalized' => '_0040-_007b-_007d-_005c-_0023',
+        'normalized' => '_0040-_007b-_007d-_005c-_0023'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4444,7 +4457,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4459,7 +4472,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4582,7 +4596,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4626,7 +4640,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
           }
         ],
-        'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
+        'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4749,7 +4765,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4764,7 +4780,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4871,7 +4888,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4911,7 +4928,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
           }
         ],
-        'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
+        'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5018,7 +5037,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5033,7 +5052,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5092,7 +5112,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5120,7 +5140,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '_2265-_2264-_2192'
           }
         ],
-        'normalized' => '_2265-_2264-_2192',
+        'normalized' => '_2265-_2264-_2192'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5179,7 +5201,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5194,7 +5216,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5317,7 +5340,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5361,7 +5384,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
           }
         ],
-        'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae',
+        'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5484,7 +5509,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5499,7 +5524,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5590,7 +5616,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5626,7 +5652,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '_21d2-_00b0-a-b-_00e5'
           }
         ],
-        'normalized' => '_21d2-_00b0-a-b-_00e5',
+        'normalized' => '_21d2-_00b0-a-b-_00e5'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5717,7 +5745,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5732,7 +5760,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5967,7 +5996,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -6039,7 +6068,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
           }
         ],
-        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
+        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6274,7 +6305,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -6289,7 +6320,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6546,7 +6578,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -6606,7 +6638,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
           }
         ],
-        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
+        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6863,7 +6897,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -6878,7 +6912,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => '  '
       },
       'source_info' => {
@@ -7036,7 +7071,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7080,7 +7115,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
           }
         ],
-        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e',
+        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7238,7 +7275,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7253,7 +7290,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7357,7 +7395,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7385,7 +7423,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '_0131-_1e14-_1e08'
           }
         ],
-        'normalized' => '_0131-_1e14-_1e08',
+        'normalized' => '_0131-_1e14-_1e08'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7489,7 +7529,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7504,7 +7544,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7611,7 +7652,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7651,7 +7692,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
           }
         ],
-        'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a',
+        'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7758,7 +7801,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7773,7 +7816,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7880,7 +7924,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7920,7 +7964,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
           }
         ],
-        'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+        'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8027,7 +8073,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8042,7 +8088,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8059,7 +8106,7 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => '`` \'\' --- -- ` \''
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8079,7 +8126,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
           }
         ],
-        'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
+        'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8096,7 +8145,7 @@ $result_trees{'at_commands_in_refs'} = {
               'text' => '`` \'\' --- -- ` \''
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8111,7 +8160,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8140,7 +8190,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'fff'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8196,7 +8246,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8224,7 +8274,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'AAA-AAA-BBB'
           }
         ],
-        'normalized' => 'AAA-AAA-BBB',
+        'normalized' => 'AAA-AAA-BBB'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8253,7 +8305,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'fff'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8309,7 +8361,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8324,7 +8376,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8353,7 +8406,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'rrr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8409,7 +8462,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8437,7 +8490,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'CCC-CCC-DDD'
           }
         ],
-        'normalized' => 'CCC-CCC-DDD',
+        'normalized' => 'CCC-CCC-DDD'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8466,7 +8521,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'rrr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8522,7 +8577,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8537,7 +8592,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8572,7 +8628,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'the someone'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8613,7 +8669,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8637,7 +8693,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
           }
         ],
-        'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
+        'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8672,7 +8730,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'the someone'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8713,7 +8771,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8728,7 +8786,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8819,7 +8878,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8843,7 +8902,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'f_002d_002dile1-f_002d_002dile'
           }
         ],
-        'normalized' => 'f_002d_002dile1-f_002d_002dile',
+        'normalized' => 'f_002d_002dile1-f_002d_002dile'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8934,7 +8995,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8949,7 +9010,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8985,7 +9047,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9005,7 +9067,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '-_0040-_007b_007d-_002e-'
           }
         ],
-        'normalized' => '-_0040-_007b_007d-_002e-',
+        'normalized' => '-_0040-_007b_007d-_002e-'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9041,7 +9105,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9056,7 +9120,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9298,7 +9363,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9350,7 +9415,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
           }
         ],
-        'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
+        'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9592,7 +9659,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9607,7 +9674,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9783,7 +9851,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9827,7 +9895,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
           }
         ],
-        'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
+        'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10003,7 +10073,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10018,7 +10088,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10053,7 +10124,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10075,7 +10146,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => '8_002e27in'
           }
         ],
-        'normalized' => '8_002e27in',
+        'normalized' => '8_002e27in'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10110,7 +10183,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10125,7 +10198,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10178,7 +10252,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10202,7 +10276,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'sansserif-slanted'
           }
         ],
-        'normalized' => 'sansserif-slanted',
+        'normalized' => 'sansserif-slanted'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10255,7 +10331,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10270,7 +10346,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10302,7 +10379,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10322,7 +10399,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'indicateurl'
           }
         ],
-        'normalized' => 'indicateurl',
+        'normalized' => 'indicateurl'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10354,7 +10433,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10369,7 +10448,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10422,7 +10502,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10446,7 +10526,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 'gH-3rd'
           }
         ],
-        'normalized' => 'gH-3rd',
+        'normalized' => 'gH-3rd'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10499,7 +10581,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10514,7 +10596,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10564,7 +10647,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'text'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -10610,7 +10693,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10638,7 +10721,9 @@ $result_trees{'at_commands_in_refs'} = {
             'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
           }
         ],
-        'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
+        'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10688,7 +10773,7 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => 'text'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -10734,7 +10819,7 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -12959,7 +13044,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'text' => 'fff'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -13072,7 +13157,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'text' => 'rrr'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -13191,7 +13276,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'text' => 'the someone'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -14253,7 +14338,7 @@ $result_trees{'at_commands_in_refs'} = {
                               'text' => 'text'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -14335,7 +14420,8 @@ $result_trees{'at_commands_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -15696,9 +15782,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -15709,9 +15797,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '-_007b-_007d'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -15728,9 +15818,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -15748,9 +15840,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_0040-_007b-_007d-_005c-_0023'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -15768,9 +15862,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -15788,9 +15884,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 5,
@@ -15808,9 +15906,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_2265-_2264-_2192'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 6,
@@ -15828,9 +15928,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 7,
@@ -15848,9 +15950,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_21d2-_00b0-a-b-_00e5'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 8,
@@ -15868,9 +15972,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 9,
@@ -15888,9 +15994,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 10,
@@ -15908,9 +16016,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 11,
@@ -15928,9 +16038,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_0131-_1e14-_1e08'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 12,
@@ -15948,9 +16060,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 13,
@@ -15968,9 +16082,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 14,
@@ -15988,9 +16104,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 15,
@@ -16008,9 +16126,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'AAA-AAA-BBB'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 16,
@@ -16028,9 +16148,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'CCC-CCC-DDD'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 17,
@@ -16048,9 +16170,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 18,
@@ -16068,9 +16192,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'f_002d_002dile1-f_002d_002dile'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 19,
@@ -16088,9 +16214,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '-_0040-_007b_007d-_002e-'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 20,
@@ -16108,9 +16236,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 21,
@@ -16128,9 +16258,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 22,
@@ -16148,9 +16280,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '8_002e27in'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 23,
@@ -16168,9 +16302,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'sansserif-slanted'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 24,
@@ -16188,9 +16324,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'indicateurl'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 25,
@@ -16208,9 +16346,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'gH-3rd'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 26,
@@ -16228,9 +16368,11 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 27,
@@ -16364,6 +16506,7 @@ $result_nodes{'at_commands_in_refs'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -16373,6 +16516,7 @@ $result_nodes{'at_commands_in_refs'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -16380,12 +16524,14 @@ $result_nodes{'at_commands_in_refs'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => '-_007b-_007d'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -16393,12 +16539,14 @@ $result_nodes{'at_commands_in_refs'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -16406,12 +16554,14 @@ $result_nodes{'at_commands_in_refs'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -16419,12 +16569,14 @@ $result_nodes{'at_commands_in_refs'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 4
                       }
                     },
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -16432,12 +16584,14 @@ $result_nodes{'at_commands_in_refs'} = {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_number' => 5
                           }
                         },
                         'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_next' => {
                           'cmdname' => 'node',
@@ -16445,12 +16599,14 @@ $result_nodes{'at_commands_in_refs'} = {
                             'associated_section' => {
                               'cmdname' => 'chapter',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {
                                 'section_number' => 6
                               }
                             },
                             'normalized' => '_2265-_2264-_2192'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
@@ -16458,12 +16614,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                 'associated_section' => {
                                   'cmdname' => 'chapter',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {
                                     'section_number' => 7
                                   }
                                 },
                                 'normalized' => 
'_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
                               },
+                              'info' => {},
                               'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
@@ -16471,12 +16629,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                     'associated_section' => {
                                       'cmdname' => 'chapter',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'section_number' => 8
                                       }
                                     },
                                     'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
@@ -16484,12 +16644,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                         'associated_section' => {
                                           'cmdname' => 'chapter',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {
                                             'section_number' => 9
                                           }
                                         },
                                         'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'node_next' => {
                                           'cmdname' => 'node',
@@ -16497,12 +16659,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {
                                                 'section_number' => 10
                                               }
                                             },
                                             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'node_next' => {
                                               'cmdname' => 'node',
@@ -16510,12 +16674,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                 'associated_section' => {
                                                   'cmdname' => 'chapter',
                                                   'extra' => {},
+                                                  'info' => {},
                                                   'structure' => {
                                                     'section_number' => 11
                                                   }
                                                 },
                                                 'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
+                                              'info' => {},
                                               'structure' => {
                                                 'node_next' => {
                                                   'cmdname' => 'node',
@@ -16523,12 +16689,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                     'associated_section' => {
                                                       'cmdname' => 'chapter',
                                                       'extra' => {},
+                                                      'info' => {},
                                                       'structure' => {
                                                         'section_number' => 12
                                                       }
                                                     },
                                                     'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
+                                                  'info' => {},
                                                   'structure' => {
                                                     'node_next' => {
                                                       'cmdname' => 'node',
@@ -16536,12 +16704,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                         'associated_section' 
=> {
                                                           'cmdname' => 
'chapter',
                                                           'extra' => {},
+                                                          'info' => {},
                                                           'structure' => {
                                                             'section_number' 
=> 13
                                                           }
                                                         },
                                                         'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
+                                                      'info' => {},
                                                       'structure' => {
                                                         'node_next' => {
                                                           'cmdname' => 'node',
@@ -16549,12 +16719,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                             
'associated_section' => {
                                                               'cmdname' => 
'chapter',
                                                               'extra' => {},
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'section_number' => 14
                                                               }
                                                             },
                                                             'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
+                                                          'info' => {},
                                                           'structure' => {
                                                             'node_next' => {
                                                               'cmdname' => 
'node',
@@ -16562,12 +16734,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                 
'associated_section' => {
                                                                   'cmdname' => 
'chapter',
                                                                   'extra' => 
{},
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'section_number' => 15
                                                                   }
                                                                 },
                                                                 'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
+                                                              'info' => {},
                                                               'structure' => {
                                                                 'node_next' => 
{
                                                                   'cmdname' => 
'node',
@@ -16575,12 +16749,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                     
'associated_section' => {
                                                                       
'cmdname' => 'chapter',
                                                                       'extra' 
=> {},
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'section_number' => 16
                                                                       }
                                                                     },
                                                                     
'normalized' => 'AAA-AAA-BBB'
                                                                   },
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'node_next' => {
                                                                       
'cmdname' => 'node',
@@ -16588,12 +16764,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                         
'associated_section' => {
                                                                           
'cmdname' => 'chapter',
                                                                           
'extra' => {},
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'section_number' => 17
                                                                           }
                                                                         },
                                                                         
'normalized' => 'CCC-CCC-DDD'
                                                                       },
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'node_next' => {
                                                                           
'cmdname' => 'node',
@@ -16601,12 +16779,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                             
'associated_section' => {
                                                                               
'cmdname' => 'chapter',
                                                                               
'extra' => {},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'section_number' => 18
                                                                               }
                                                                             },
                                                                             
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'node_next' => {
                                                                               
'cmdname' => 'node',
@@ -16614,12 +16794,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
 'associated_section' => {
                                                                                
   'cmdname' => 'chapter',
                                                                                
   'extra' => {},
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'section_number' => 19
                                                                                
   }
                                                                                
 },
                                                                                
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'node_next' => {
                                                                                
   'cmdname' => 'node',
@@ -16627,12 +16809,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
     'associated_section' => {
                                                                                
       'cmdname' => 'chapter',
                                                                                
       'extra' => {},
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'section_number' => 20
                                                                                
       }
                                                                                
     },
                                                                                
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'node_next' => {
                                                                                
       'cmdname' => 'node',
@@ -16640,12 +16824,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
         'associated_section' => {
                                                                                
           'cmdname' => 'chapter',
                                                                                
           'extra' => {},
+                                                                               
           'info' => {},
                                                                                
           'structure' => {
                                                                                
             'section_number' => 21
                                                                                
           }
                                                                                
         },
                                                                                
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'node_next' => {
                                                                                
           'cmdname' => 'node',
@@ -16653,12 +16839,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
             'associated_section' => {
                                                                                
               'cmdname' => 'chapter',
                                                                                
               'extra' => {},
+                                                                               
               'info' => {},
                                                                                
               'structure' => {
                                                                                
                 'section_number' => 22
                                                                                
               }
                                                                                
             },
                                                                                
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
+                                                                               
           'info' => {},
                                                                                
           'structure' => {
                                                                                
             'node_next' => {
                                                                                
               'cmdname' => 'node',
@@ -16666,12 +16854,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                 'associated_section' => {
                                                                                
                   'cmdname' => 'chapter',
                                                                                
                   'extra' => {},
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'section_number' => 23
                                                                                
                   }
                                                                                
                 },
                                                                                
                 'normalized' => '8_002e27in'
                                                                                
               },
+                                                                               
               'info' => {},
                                                                                
               'structure' => {
                                                                                
                 'node_next' => {
                                                                                
                   'cmdname' => 'node',
@@ -16679,12 +16869,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                     'associated_section' => {
                                                                                
                       'cmdname' => 'chapter',
                                                                                
                       'extra' => {},
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'section_number' => 24
                                                                                
                       }
                                                                                
                     },
                                                                                
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'node_next' => {
                                                                                
                       'cmdname' => 'node',
@@ -16692,12 +16884,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                         'associated_section' => {
                                                                                
                           'cmdname' => 'chapter',
                                                                                
                           'extra' => {},
+                                                                               
                           'info' => {},
                                                                                
                           'structure' => {
                                                                                
                             'section_number' => 25
                                                                                
                           }
                                                                                
                         },
                                                                                
                         'normalized' => 'indicateurl'
                                                                                
                       },
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'node_next' => {
                                                                                
                           'cmdname' => 'node',
@@ -16705,12 +16899,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                             'associated_section' => {
                                                                                
                               'cmdname' => 'chapter',
                                                                                
                               'extra' => {},
+                                                                               
                               'info' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'section_number' => 26
                                                                                
                               }
                                                                                
                             },
                                                                                
                             'normalized' => 'gH-3rd'
                                                                                
                           },
+                                                                               
                           'info' => {},
                                                                                
                           'structure' => {
                                                                                
                             'node_next' => {
                                                                                
                               'cmdname' => 'node',
@@ -16718,12 +16914,14 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                                 'associated_section' => {
                                                                                
                                   'cmdname' => 'chapter',
                                                                                
                                   'extra' => {},
+                                                                               
                                   'info' => {},
                                                                                
                                   'structure' => {
                                                                                
                                     'section_number' => 27
                                                                                
                                   }
                                                                                
                                 },
                                                                                
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
+                                                                               
                               'info' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'node_prev' => {},
                                                                                
                                 'node_up' => {}
@@ -16897,168 +17095,196 @@ $result_menus{'at_commands_in_refs'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '-_007b-_007d'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => '_2265-_2264-_2192'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 
'_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
                                         'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
                                             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
                                                 'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
+                                              'info' => {},
                                               'structure' => {
                                                 'menu_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
                                                     'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
+                                                  'info' => {},
                                                   'structure' => {
                                                     'menu_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
                                                         'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
+                                                      'info' => {},
                                                       'structure' => {
                                                         'menu_next' => {
                                                           'cmdname' => 'node',
                                                           'extra' => {
                                                             'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
+                                                          'info' => {},
                                                           'structure' => {
                                                             'menu_next' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
                                                                 'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
+                                                              'info' => {},
                                                               'structure' => {
                                                                 'menu_next' => 
{
                                                                   'cmdname' => 
'node',
                                                                   'extra' => {
                                                                     
'normalized' => 'AAA-AAA-BBB'
                                                                   },
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'menu_next' => {
                                                                       
'cmdname' => 'node',
                                                                       'extra' 
=> {
                                                                         
'normalized' => 'CCC-CCC-DDD'
                                                                       },
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'menu_next' => {
                                                                           
'cmdname' => 'node',
                                                                           
'extra' => {
                                                                             
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'menu_next' => {
                                                                               
'cmdname' => 'node',
                                                                               
'extra' => {
                                                                                
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'menu_next' => {
                                                                                
   'cmdname' => 'node',
                                                                                
   'extra' => {
                                                                                
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'menu_next' => {
                                                                                
       'cmdname' => 'node',
                                                                                
       'extra' => {
                                                                                
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'menu_next' => {
                                                                                
           'cmdname' => 'node',
                                                                                
           'extra' => {
                                                                                
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
+                                                                               
           'info' => {},
                                                                                
           'structure' => {
                                                                                
             'menu_next' => {
                                                                                
               'cmdname' => 'node',
                                                                                
               'extra' => {
                                                                                
                 'normalized' => '8_002e27in'
                                                                                
               },
+                                                                               
               'info' => {},
                                                                                
               'structure' => {
                                                                                
                 'menu_next' => {
                                                                                
                   'cmdname' => 'node',
                                                                                
                   'extra' => {
                                                                                
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'menu_next' => {
                                                                                
                       'cmdname' => 'node',
                                                                                
                       'extra' => {
                                                                                
                         'normalized' => 'indicateurl'
                                                                                
                       },
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'menu_next' => {
                                                                                
                           'cmdname' => 'node',
                                                                                
                           'extra' => {
                                                                                
                             'normalized' => 'gH-3rd'
                                                                                
                           },
+                                                                               
                           'info' => {},
                                                                                
                           'structure' => {
                                                                                
                             'menu_next' => {
                                                                                
                               'cmdname' => 'node',
                                                                                
                               'extra' => {
                                                                                
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
+                                                                               
                               'info' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'menu_prev' => {},
                                                                                
                                 'menu_up' => {},
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
index 8d696205e2..cfeaf62dff 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
@@ -19,7 +19,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'at_commands_in_refs_latin1.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'at_commands_in_refs_latin1.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -45,7 +47,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'ISO-8859-15'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -56,9 +58,11 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-15',
                 'input_perl_encoding' => 'iso-8859-15',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-15'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -84,7 +88,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -104,7 +108,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -121,7 +127,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -138,7 +144,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2480,7 +2486,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'text' => 'fff'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -2601,7 +2607,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'text' => 'rrr'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -2728,7 +2734,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'text' => 'the someone'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -3862,7 +3868,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'text' => 'text'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -3957,7 +3963,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3966,9 +3972,11 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
@@ -3988,7 +3996,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4017,7 +4026,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '}'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4045,7 +4054,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '-_007b-_007d'
           }
         ],
-        'normalized' => '-_007b-_007d',
+        'normalized' => '-_007b-_007d'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4074,7 +4085,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '}'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4089,7 +4100,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4154,7 +4166,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '@'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4206,7 +4218,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           }
         ],
-        'normalized' => '-_0021-_002e-_002e-_003f-_0040',
+        'normalized' => '-_0021-_002e-_002e-_003f-_0040'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4271,7 +4285,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'cmdname' => '@'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4286,7 +4300,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4377,7 +4392,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4413,7 +4428,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '_0040-_007b-_007d-_005c-_0023'
           }
         ],
-        'normalized' => '_0040-_007b-_007d-_005c-_0023',
+        'normalized' => '_0040-_007b-_007d-_005c-_0023'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4504,7 +4521,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4519,7 +4536,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4642,7 +4660,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4686,7 +4704,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
           }
         ],
-        'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
+        'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4809,7 +4829,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4824,7 +4844,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4931,7 +4952,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4971,7 +4992,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
           }
         ],
-        'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
+        'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5078,7 +5101,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5093,7 +5116,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5152,7 +5176,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5180,7 +5204,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '_2265-_2264-_2192'
           }
         ],
-        'normalized' => '_2265-_2264-_2192',
+        'normalized' => '_2265-_2264-_2192'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5239,7 +5265,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5254,7 +5280,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5377,7 +5404,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5421,7 +5448,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
           }
         ],
-        'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae',
+        'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5544,7 +5573,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5559,7 +5588,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5650,7 +5680,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5686,7 +5716,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '_21d2-_00b0-a-b-_00e5'
           }
         ],
-        'normalized' => '_21d2-_00b0-a-b-_00e5',
+        'normalized' => '_21d2-_00b0-a-b-_00e5'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5777,7 +5809,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5792,7 +5824,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6027,7 +6060,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -6099,7 +6132,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
           }
         ],
-        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
+        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6334,7 +6369,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -6349,7 +6384,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6606,7 +6642,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -6666,7 +6702,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
           }
         ],
-        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
+        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6923,7 +6961,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -6938,7 +6976,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => '  '
       },
       'source_info' => {
@@ -7096,7 +7135,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7140,7 +7179,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
           }
         ],
-        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e',
+        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7298,7 +7339,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7313,7 +7354,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7417,7 +7459,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7445,7 +7487,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '_0131-_1e14-_1e08'
           }
         ],
-        'normalized' => '_0131-_1e14-_1e08',
+        'normalized' => '_0131-_1e14-_1e08'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7549,7 +7593,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7564,7 +7608,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7671,7 +7716,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7711,7 +7756,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
           }
         ],
-        'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a',
+        'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7818,7 +7865,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7833,7 +7880,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7940,7 +7988,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7980,7 +8028,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
           }
         ],
-        'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+        'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8087,7 +8137,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8102,7 +8152,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8119,7 +8170,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => '`` \'\' --- -- ` \''
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8139,7 +8190,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
           }
         ],
-        'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
+        'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8156,7 +8209,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'text' => '`` \'\' --- -- ` \''
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8171,7 +8224,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8200,7 +8254,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'fff'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8256,7 +8310,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8284,7 +8338,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'AAA-AAA-BBB'
           }
         ],
-        'normalized' => 'AAA-AAA-BBB',
+        'normalized' => 'AAA-AAA-BBB'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8313,7 +8369,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'fff'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8369,7 +8425,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8384,7 +8440,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8413,7 +8470,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'rrr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8469,7 +8526,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8497,7 +8554,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'CCC-CCC-DDD'
           }
         ],
-        'normalized' => 'CCC-CCC-DDD',
+        'normalized' => 'CCC-CCC-DDD'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8526,7 +8585,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'rrr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8582,7 +8641,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8597,7 +8656,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8632,7 +8692,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'the someone'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8673,7 +8733,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8697,7 +8757,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
           }
         ],
-        'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
+        'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8732,7 +8794,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'the someone'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8773,7 +8835,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8788,7 +8850,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8879,7 +8942,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8903,7 +8966,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'f_002d_002dile1-f_002d_002dile'
           }
         ],
-        'normalized' => 'f_002d_002dile1-f_002d_002dile',
+        'normalized' => 'f_002d_002dile1-f_002d_002dile'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8994,7 +9059,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9009,7 +9074,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9045,7 +9111,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9065,7 +9131,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '-_0040-_007b_007d-_002e-'
           }
         ],
-        'normalized' => '-_0040-_007b_007d-_002e-',
+        'normalized' => '-_0040-_007b_007d-_002e-'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9101,7 +9169,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9116,7 +9184,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9358,7 +9427,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9410,7 +9479,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
           }
         ],
-        'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
+        'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9652,7 +9723,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9667,7 +9738,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9843,7 +9915,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9887,7 +9959,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
           }
         ],
-        'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
+        'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10063,7 +10137,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10078,7 +10152,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10113,7 +10188,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10135,7 +10210,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => '8_002e27in'
           }
         ],
-        'normalized' => '8_002e27in',
+        'normalized' => '8_002e27in'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10170,7 +10247,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10185,7 +10262,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10238,7 +10316,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10262,7 +10340,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'sansserif-slanted'
           }
         ],
-        'normalized' => 'sansserif-slanted',
+        'normalized' => 'sansserif-slanted'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10315,7 +10395,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10330,7 +10410,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10362,7 +10443,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10382,7 +10463,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'indicateurl'
           }
         ],
-        'normalized' => 'indicateurl',
+        'normalized' => 'indicateurl'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10414,7 +10497,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10429,7 +10512,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10482,7 +10566,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10506,7 +10590,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 'gH-3rd'
           }
         ],
-        'normalized' => 'gH-3rd',
+        'normalized' => 'gH-3rd'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10559,7 +10645,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10574,7 +10660,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10624,7 +10711,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'text'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -10670,7 +10757,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10698,7 +10785,9 @@ $result_trees{'at_commands_in_refs_latin1'} = {
             'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
           }
         ],
-        'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
+        'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10748,7 +10837,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => 'text'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -10794,7 +10883,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -13019,7 +13108,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'text' => 'fff'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -13132,7 +13221,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'text' => 'rrr'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -13251,7 +13340,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'text' => 'the someone'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -14313,7 +14402,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                               'text' => 'text'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -14395,7 +14484,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -15760,9 +15850,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -15773,9 +15865,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '-_007b-_007d'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -15792,9 +15886,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -15812,9 +15908,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_0040-_007b-_007d-_005c-_0023'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -15832,9 +15930,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -15852,9 +15952,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 5,
@@ -15872,9 +15974,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_2265-_2264-_2192'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 6,
@@ -15892,9 +15996,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 7,
@@ -15912,9 +16018,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_21d2-_00b0-a-b-_00e5'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 8,
@@ -15932,9 +16040,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 9,
@@ -15952,9 +16062,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 10,
@@ -15972,9 +16084,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 11,
@@ -15992,9 +16106,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_0131-_1e14-_1e08'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 12,
@@ -16012,9 +16128,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 13,
@@ -16032,9 +16150,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 14,
@@ -16052,9 +16172,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 15,
@@ -16072,9 +16194,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'AAA-AAA-BBB'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 16,
@@ -16092,9 +16216,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'CCC-CCC-DDD'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 17,
@@ -16112,9 +16238,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 18,
@@ -16132,9 +16260,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'f_002d_002dile1-f_002d_002dile'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 19,
@@ -16152,9 +16282,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '-_0040-_007b_007d-_002e-'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 20,
@@ -16172,9 +16304,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 21,
@@ -16192,9 +16326,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 22,
@@ -16212,9 +16348,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '8_002e27in'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 23,
@@ -16232,9 +16370,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'sansserif-slanted'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 24,
@@ -16252,9 +16392,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'indicateurl'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 25,
@@ -16272,9 +16414,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'gH-3rd'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 26,
@@ -16292,9 +16436,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 27,
@@ -16428,6 +16574,7 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -16437,6 +16584,7 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -16444,12 +16592,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => '-_007b-_007d'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -16457,12 +16607,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -16470,12 +16622,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -16483,12 +16637,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 4
                       }
                     },
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -16496,12 +16652,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_number' => 5
                           }
                         },
                         'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_next' => {
                           'cmdname' => 'node',
@@ -16509,12 +16667,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                             'associated_section' => {
                               'cmdname' => 'chapter',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {
                                 'section_number' => 6
                               }
                             },
                             'normalized' => '_2265-_2264-_2192'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
@@ -16522,12 +16682,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                 'associated_section' => {
                                   'cmdname' => 'chapter',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {
                                     'section_number' => 7
                                   }
                                 },
                                 'normalized' => 
'_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
                               },
+                              'info' => {},
                               'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
@@ -16535,12 +16697,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                     'associated_section' => {
                                       'cmdname' => 'chapter',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'section_number' => 8
                                       }
                                     },
                                     'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
@@ -16548,12 +16712,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                         'associated_section' => {
                                           'cmdname' => 'chapter',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {
                                             'section_number' => 9
                                           }
                                         },
                                         'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'node_next' => {
                                           'cmdname' => 'node',
@@ -16561,12 +16727,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {
                                                 'section_number' => 10
                                               }
                                             },
                                             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'node_next' => {
                                               'cmdname' => 'node',
@@ -16574,12 +16742,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                 'associated_section' => {
                                                   'cmdname' => 'chapter',
                                                   'extra' => {},
+                                                  'info' => {},
                                                   'structure' => {
                                                     'section_number' => 11
                                                   }
                                                 },
                                                 'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
+                                              'info' => {},
                                               'structure' => {
                                                 'node_next' => {
                                                   'cmdname' => 'node',
@@ -16587,12 +16757,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                     'associated_section' => {
                                                       'cmdname' => 'chapter',
                                                       'extra' => {},
+                                                      'info' => {},
                                                       'structure' => {
                                                         'section_number' => 12
                                                       }
                                                     },
                                                     'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
+                                                  'info' => {},
                                                   'structure' => {
                                                     'node_next' => {
                                                       'cmdname' => 'node',
@@ -16600,12 +16772,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                         'associated_section' 
=> {
                                                           'cmdname' => 
'chapter',
                                                           'extra' => {},
+                                                          'info' => {},
                                                           'structure' => {
                                                             'section_number' 
=> 13
                                                           }
                                                         },
                                                         'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
+                                                      'info' => {},
                                                       'structure' => {
                                                         'node_next' => {
                                                           'cmdname' => 'node',
@@ -16613,12 +16787,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                             
'associated_section' => {
                                                               'cmdname' => 
'chapter',
                                                               'extra' => {},
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'section_number' => 14
                                                               }
                                                             },
                                                             'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
+                                                          'info' => {},
                                                           'structure' => {
                                                             'node_next' => {
                                                               'cmdname' => 
'node',
@@ -16626,12 +16802,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                 
'associated_section' => {
                                                                   'cmdname' => 
'chapter',
                                                                   'extra' => 
{},
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'section_number' => 15
                                                                   }
                                                                 },
                                                                 'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
+                                                              'info' => {},
                                                               'structure' => {
                                                                 'node_next' => 
{
                                                                   'cmdname' => 
'node',
@@ -16639,12 +16817,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                     
'associated_section' => {
                                                                       
'cmdname' => 'chapter',
                                                                       'extra' 
=> {},
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'section_number' => 16
                                                                       }
                                                                     },
                                                                     
'normalized' => 'AAA-AAA-BBB'
                                                                   },
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'node_next' => {
                                                                       
'cmdname' => 'node',
@@ -16652,12 +16832,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                         
'associated_section' => {
                                                                           
'cmdname' => 'chapter',
                                                                           
'extra' => {},
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'section_number' => 17
                                                                           }
                                                                         },
                                                                         
'normalized' => 'CCC-CCC-DDD'
                                                                       },
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'node_next' => {
                                                                           
'cmdname' => 'node',
@@ -16665,12 +16847,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                             
'associated_section' => {
                                                                               
'cmdname' => 'chapter',
                                                                               
'extra' => {},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'section_number' => 18
                                                                               }
                                                                             },
                                                                             
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'node_next' => {
                                                                               
'cmdname' => 'node',
@@ -16678,12 +16862,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
 'associated_section' => {
                                                                                
   'cmdname' => 'chapter',
                                                                                
   'extra' => {},
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'section_number' => 19
                                                                                
   }
                                                                                
 },
                                                                                
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'node_next' => {
                                                                                
   'cmdname' => 'node',
@@ -16691,12 +16877,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
     'associated_section' => {
                                                                                
       'cmdname' => 'chapter',
                                                                                
       'extra' => {},
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'section_number' => 20
                                                                                
       }
                                                                                
     },
                                                                                
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'node_next' => {
                                                                                
       'cmdname' => 'node',
@@ -16704,12 +16892,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
         'associated_section' => {
                                                                                
           'cmdname' => 'chapter',
                                                                                
           'extra' => {},
+                                                                               
           'info' => {},
                                                                                
           'structure' => {
                                                                                
             'section_number' => 21
                                                                                
           }
                                                                                
         },
                                                                                
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'node_next' => {
                                                                                
           'cmdname' => 'node',
@@ -16717,12 +16907,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
             'associated_section' => {
                                                                                
               'cmdname' => 'chapter',
                                                                                
               'extra' => {},
+                                                                               
               'info' => {},
                                                                                
               'structure' => {
                                                                                
                 'section_number' => 22
                                                                                
               }
                                                                                
             },
                                                                                
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
+                                                                               
           'info' => {},
                                                                                
           'structure' => {
                                                                                
             'node_next' => {
                                                                                
               'cmdname' => 'node',
@@ -16730,12 +16922,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                 'associated_section' => {
                                                                                
                   'cmdname' => 'chapter',
                                                                                
                   'extra' => {},
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'section_number' => 23
                                                                                
                   }
                                                                                
                 },
                                                                                
                 'normalized' => '8_002e27in'
                                                                                
               },
+                                                                               
               'info' => {},
                                                                                
               'structure' => {
                                                                                
                 'node_next' => {
                                                                                
                   'cmdname' => 'node',
@@ -16743,12 +16937,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                     'associated_section' => {
                                                                                
                       'cmdname' => 'chapter',
                                                                                
                       'extra' => {},
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'section_number' => 24
                                                                                
                       }
                                                                                
                     },
                                                                                
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'node_next' => {
                                                                                
                       'cmdname' => 'node',
@@ -16756,12 +16952,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                         'associated_section' => {
                                                                                
                           'cmdname' => 'chapter',
                                                                                
                           'extra' => {},
+                                                                               
                           'info' => {},
                                                                                
                           'structure' => {
                                                                                
                             'section_number' => 25
                                                                                
                           }
                                                                                
                         },
                                                                                
                         'normalized' => 'indicateurl'
                                                                                
                       },
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'node_next' => {
                                                                                
                           'cmdname' => 'node',
@@ -16769,12 +16967,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                             'associated_section' => {
                                                                                
                               'cmdname' => 'chapter',
                                                                                
                               'extra' => {},
+                                                                               
                               'info' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'section_number' => 26
                                                                                
                               }
                                                                                
                             },
                                                                                
                             'normalized' => 'gH-3rd'
                                                                                
                           },
+                                                                               
                           'info' => {},
                                                                                
                           'structure' => {
                                                                                
                             'node_next' => {
                                                                                
                               'cmdname' => 'node',
@@ -16782,12 +16982,14 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                                 'associated_section' => {
                                                                                
                                   'cmdname' => 'chapter',
                                                                                
                                   'extra' => {},
+                                                                               
                                   'info' => {},
                                                                                
                                   'structure' => {
                                                                                
                                     'section_number' => 27
                                                                                
                                   }
                                                                                
                                 },
                                                                                
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
+                                                                               
                               'info' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'node_prev' => {},
                                                                                
                                 'node_up' => {}
@@ -16961,168 +17163,196 @@ $result_menus{'at_commands_in_refs_latin1'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '-_007b-_007d'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => '_2265-_2264-_2192'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 
'_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
                                         'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
                                             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
                                                 'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
+                                              'info' => {},
                                               'structure' => {
                                                 'menu_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
                                                     'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
+                                                  'info' => {},
                                                   'structure' => {
                                                     'menu_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
                                                         'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
+                                                      'info' => {},
                                                       'structure' => {
                                                         'menu_next' => {
                                                           'cmdname' => 'node',
                                                           'extra' => {
                                                             'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
+                                                          'info' => {},
                                                           'structure' => {
                                                             'menu_next' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
                                                                 'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
+                                                              'info' => {},
                                                               'structure' => {
                                                                 'menu_next' => 
{
                                                                   'cmdname' => 
'node',
                                                                   'extra' => {
                                                                     
'normalized' => 'AAA-AAA-BBB'
                                                                   },
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'menu_next' => {
                                                                       
'cmdname' => 'node',
                                                                       'extra' 
=> {
                                                                         
'normalized' => 'CCC-CCC-DDD'
                                                                       },
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'menu_next' => {
                                                                           
'cmdname' => 'node',
                                                                           
'extra' => {
                                                                             
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'menu_next' => {
                                                                               
'cmdname' => 'node',
                                                                               
'extra' => {
                                                                                
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'menu_next' => {
                                                                                
   'cmdname' => 'node',
                                                                                
   'extra' => {
                                                                                
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'menu_next' => {
                                                                                
       'cmdname' => 'node',
                                                                                
       'extra' => {
                                                                                
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'menu_next' => {
                                                                                
           'cmdname' => 'node',
                                                                                
           'extra' => {
                                                                                
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
+                                                                               
           'info' => {},
                                                                                
           'structure' => {
                                                                                
             'menu_next' => {
                                                                                
               'cmdname' => 'node',
                                                                                
               'extra' => {
                                                                                
                 'normalized' => '8_002e27in'
                                                                                
               },
+                                                                               
               'info' => {},
                                                                                
               'structure' => {
                                                                                
                 'menu_next' => {
                                                                                
                   'cmdname' => 'node',
                                                                                
                   'extra' => {
                                                                                
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'menu_next' => {
                                                                                
                       'cmdname' => 'node',
                                                                                
                       'extra' => {
                                                                                
                         'normalized' => 'indicateurl'
                                                                                
                       },
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'menu_next' => {
                                                                                
                           'cmdname' => 'node',
                                                                                
                           'extra' => {
                                                                                
                             'normalized' => 'gH-3rd'
                                                                                
                           },
+                                                                               
                           'info' => {},
                                                                                
                           'structure' => {
                                                                                
                             'menu_next' => {
                                                                                
                               'cmdname' => 'node',
                                                                                
                               'extra' => {
                                                                                
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
+                                                                               
                               'info' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'menu_prev' => {},
                                                                                
                                 'menu_up' => {},
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
index ed34063c40..0cb3ed5da5 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
@@ -19,7 +19,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'at_commands_in_refs_utf8.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'at_commands_in_refs_utf8.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -45,7 +47,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'utf-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -56,9 +58,11 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'utf-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -84,7 +88,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -104,7 +108,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -121,7 +127,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -138,7 +144,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2480,7 +2486,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'text' => 'fff'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -2601,7 +2607,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'text' => 'rrr'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -2728,7 +2734,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'text' => 'the someone'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -3862,7 +3868,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'text' => 'text'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -3957,7 +3963,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3966,9 +3972,11 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
@@ -3988,7 +3996,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4017,7 +4026,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '}'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4045,7 +4054,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '-_007b-_007d'
           }
         ],
-        'normalized' => '-_007b-_007d',
+        'normalized' => '-_007b-_007d'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4074,7 +4085,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '}'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4089,7 +4100,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4154,7 +4166,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '@'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4206,7 +4218,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           }
         ],
-        'normalized' => '-_0021-_002e-_002e-_003f-_0040',
+        'normalized' => '-_0021-_002e-_002e-_003f-_0040'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4271,7 +4285,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'cmdname' => '@'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4286,7 +4300,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4377,7 +4392,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4413,7 +4428,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '_0040-_007b-_007d-_005c-_0023'
           }
         ],
-        'normalized' => '_0040-_007b-_007d-_005c-_0023',
+        'normalized' => '_0040-_007b-_007d-_005c-_0023'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4504,7 +4521,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4519,7 +4536,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4642,7 +4660,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4686,7 +4704,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
           }
         ],
-        'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
+        'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4809,7 +4829,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4824,7 +4844,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4931,7 +4952,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4971,7 +4992,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
           }
         ],
-        'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
+        'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5078,7 +5101,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5093,7 +5116,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5152,7 +5176,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5180,7 +5204,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '_2265-_2264-_2192'
           }
         ],
-        'normalized' => '_2265-_2264-_2192',
+        'normalized' => '_2265-_2264-_2192'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5239,7 +5265,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5254,7 +5280,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5377,7 +5404,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5421,7 +5448,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
           }
         ],
-        'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae',
+        'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5544,7 +5573,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5559,7 +5588,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5650,7 +5680,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5686,7 +5716,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '_21d2-_00b0-a-b-_00e5'
           }
         ],
-        'normalized' => '_21d2-_00b0-a-b-_00e5',
+        'normalized' => '_21d2-_00b0-a-b-_00e5'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -5777,7 +5809,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -5792,7 +5824,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6027,7 +6060,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -6099,7 +6132,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
           }
         ],
-        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
+        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6334,7 +6369,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -6349,7 +6384,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6606,7 +6642,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -6666,7 +6702,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
           }
         ],
-        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
+        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -6923,7 +6961,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -6938,7 +6976,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => '  '
       },
       'source_info' => {
@@ -7096,7 +7135,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7140,7 +7179,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
           }
         ],
-        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e',
+        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7298,7 +7339,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7313,7 +7354,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7417,7 +7459,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7445,7 +7487,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '_0131-_1e14-_1e08'
           }
         ],
-        'normalized' => '_0131-_1e14-_1e08',
+        'normalized' => '_0131-_1e14-_1e08'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7549,7 +7593,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7564,7 +7608,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7671,7 +7716,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7711,7 +7756,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
           }
         ],
-        'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a',
+        'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7818,7 +7865,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7833,7 +7880,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -7940,7 +7988,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -7980,7 +8028,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
           }
         ],
-        'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+        'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8087,7 +8137,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8102,7 +8152,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8119,7 +8170,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => '`` \'\' --- -- ` \''
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8139,7 +8190,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
           }
         ],
-        'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
+        'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8156,7 +8209,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'text' => '`` \'\' --- -- ` \''
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8171,7 +8224,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8200,7 +8254,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'fff'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8256,7 +8310,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8284,7 +8338,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'AAA-AAA-BBB'
           }
         ],
-        'normalized' => 'AAA-AAA-BBB',
+        'normalized' => 'AAA-AAA-BBB'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8313,7 +8369,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'fff'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8369,7 +8425,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8384,7 +8440,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8413,7 +8470,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'rrr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8469,7 +8526,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8497,7 +8554,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'CCC-CCC-DDD'
           }
         ],
-        'normalized' => 'CCC-CCC-DDD',
+        'normalized' => 'CCC-CCC-DDD'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8526,7 +8585,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'rrr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8582,7 +8641,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8597,7 +8656,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8632,7 +8692,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'the someone'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8673,7 +8733,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8697,7 +8757,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
           }
         ],
-        'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
+        'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8732,7 +8794,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'the someone'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -8773,7 +8835,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8788,7 +8850,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8879,7 +8942,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -8903,7 +8966,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'f_002d_002dile1-f_002d_002dile'
           }
         ],
-        'normalized' => 'f_002d_002dile1-f_002d_002dile',
+        'normalized' => 'f_002d_002dile1-f_002d_002dile'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -8994,7 +9059,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9009,7 +9074,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9045,7 +9111,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9065,7 +9131,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '-_0040-_007b_007d-_002e-'
           }
         ],
-        'normalized' => '-_0040-_007b_007d-_002e-',
+        'normalized' => '-_0040-_007b_007d-_002e-'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9101,7 +9169,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9116,7 +9184,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9358,7 +9427,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9410,7 +9479,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
           }
         ],
-        'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
+        'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9652,7 +9723,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9667,7 +9738,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -9843,7 +9915,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -9887,7 +9959,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
           }
         ],
-        'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
+        'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10063,7 +10137,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10078,7 +10152,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10113,7 +10188,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10135,7 +10210,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => '8_002e27in'
           }
         ],
-        'normalized' => '8_002e27in',
+        'normalized' => '8_002e27in'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10170,7 +10247,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10185,7 +10262,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10238,7 +10316,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10262,7 +10340,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'sansserif-slanted'
           }
         ],
-        'normalized' => 'sansserif-slanted',
+        'normalized' => 'sansserif-slanted'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10315,7 +10395,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10330,7 +10410,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10362,7 +10443,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10382,7 +10463,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'indicateurl'
           }
         ],
-        'normalized' => 'indicateurl',
+        'normalized' => 'indicateurl'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10414,7 +10497,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10429,7 +10512,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10482,7 +10566,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10506,7 +10590,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 'gH-3rd'
           }
         ],
-        'normalized' => 'gH-3rd',
+        'normalized' => 'gH-3rd'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10559,7 +10645,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10574,7 +10660,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10624,7 +10711,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'text'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -10670,7 +10757,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -10698,7 +10785,9 @@ $result_trees{'at_commands_in_refs_utf8'} = {
             'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
           }
         ],
-        'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
+        'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -10748,7 +10837,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => 'text'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -10794,7 +10883,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -13019,7 +13108,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'text' => 'fff'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -13132,7 +13221,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'text' => 'rrr'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -13251,7 +13340,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'text' => 'the someone'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -14313,7 +14402,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                               'text' => 'text'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -14395,7 +14484,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -15760,9 +15850,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -15773,9 +15865,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '-_007b-_007d'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -15792,9 +15886,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -15812,9 +15908,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_0040-_007b-_007d-_005c-_0023'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -15832,9 +15930,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -15852,9 +15952,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 5,
@@ -15872,9 +15974,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_2265-_2264-_2192'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 6,
@@ -15892,9 +15996,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 7,
@@ -15912,9 +16018,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_21d2-_00b0-a-b-_00e5'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 8,
@@ -15932,9 +16040,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 9,
@@ -15952,9 +16062,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 10,
@@ -15972,9 +16084,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 11,
@@ -15992,9 +16106,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_0131-_1e14-_1e08'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 12,
@@ -16012,9 +16128,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 13,
@@ -16032,9 +16150,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 14,
@@ -16052,9 +16172,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 15,
@@ -16072,9 +16194,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'AAA-AAA-BBB'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 16,
@@ -16092,9 +16216,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'CCC-CCC-DDD'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 17,
@@ -16112,9 +16238,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 18,
@@ -16132,9 +16260,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'f_002d_002dile1-f_002d_002dile'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 19,
@@ -16152,9 +16282,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '-_0040-_007b_007d-_002e-'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 20,
@@ -16172,9 +16304,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 21,
@@ -16192,9 +16326,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 22,
@@ -16212,9 +16348,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '8_002e27in'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 23,
@@ -16232,9 +16370,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'sansserif-slanted'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 24,
@@ -16252,9 +16392,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'indicateurl'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 25,
@@ -16272,9 +16414,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'gH-3rd'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 26,
@@ -16292,9 +16436,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 27,
@@ -16428,6 +16574,7 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -16437,6 +16584,7 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -16444,12 +16592,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => '-_007b-_007d'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -16457,12 +16607,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -16470,12 +16622,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -16483,12 +16637,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 4
                       }
                     },
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -16496,12 +16652,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_number' => 5
                           }
                         },
                         'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_next' => {
                           'cmdname' => 'node',
@@ -16509,12 +16667,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                             'associated_section' => {
                               'cmdname' => 'chapter',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {
                                 'section_number' => 6
                               }
                             },
                             'normalized' => '_2265-_2264-_2192'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
@@ -16522,12 +16682,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                 'associated_section' => {
                                   'cmdname' => 'chapter',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {
                                     'section_number' => 7
                                   }
                                 },
                                 'normalized' => 
'_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
                               },
+                              'info' => {},
                               'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
@@ -16535,12 +16697,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                     'associated_section' => {
                                       'cmdname' => 'chapter',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'section_number' => 8
                                       }
                                     },
                                     'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
@@ -16548,12 +16712,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                         'associated_section' => {
                                           'cmdname' => 'chapter',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {
                                             'section_number' => 9
                                           }
                                         },
                                         'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'node_next' => {
                                           'cmdname' => 'node',
@@ -16561,12 +16727,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {
                                                 'section_number' => 10
                                               }
                                             },
                                             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'node_next' => {
                                               'cmdname' => 'node',
@@ -16574,12 +16742,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                 'associated_section' => {
                                                   'cmdname' => 'chapter',
                                                   'extra' => {},
+                                                  'info' => {},
                                                   'structure' => {
                                                     'section_number' => 11
                                                   }
                                                 },
                                                 'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
+                                              'info' => {},
                                               'structure' => {
                                                 'node_next' => {
                                                   'cmdname' => 'node',
@@ -16587,12 +16757,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                     'associated_section' => {
                                                       'cmdname' => 'chapter',
                                                       'extra' => {},
+                                                      'info' => {},
                                                       'structure' => {
                                                         'section_number' => 12
                                                       }
                                                     },
                                                     'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
+                                                  'info' => {},
                                                   'structure' => {
                                                     'node_next' => {
                                                       'cmdname' => 'node',
@@ -16600,12 +16772,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                         'associated_section' 
=> {
                                                           'cmdname' => 
'chapter',
                                                           'extra' => {},
+                                                          'info' => {},
                                                           'structure' => {
                                                             'section_number' 
=> 13
                                                           }
                                                         },
                                                         'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
+                                                      'info' => {},
                                                       'structure' => {
                                                         'node_next' => {
                                                           'cmdname' => 'node',
@@ -16613,12 +16787,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                             
'associated_section' => {
                                                               'cmdname' => 
'chapter',
                                                               'extra' => {},
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'section_number' => 14
                                                               }
                                                             },
                                                             'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
+                                                          'info' => {},
                                                           'structure' => {
                                                             'node_next' => {
                                                               'cmdname' => 
'node',
@@ -16626,12 +16802,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                 
'associated_section' => {
                                                                   'cmdname' => 
'chapter',
                                                                   'extra' => 
{},
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'section_number' => 15
                                                                   }
                                                                 },
                                                                 'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
+                                                              'info' => {},
                                                               'structure' => {
                                                                 'node_next' => 
{
                                                                   'cmdname' => 
'node',
@@ -16639,12 +16817,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                     
'associated_section' => {
                                                                       
'cmdname' => 'chapter',
                                                                       'extra' 
=> {},
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'section_number' => 16
                                                                       }
                                                                     },
                                                                     
'normalized' => 'AAA-AAA-BBB'
                                                                   },
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'node_next' => {
                                                                       
'cmdname' => 'node',
@@ -16652,12 +16832,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                         
'associated_section' => {
                                                                           
'cmdname' => 'chapter',
                                                                           
'extra' => {},
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'section_number' => 17
                                                                           }
                                                                         },
                                                                         
'normalized' => 'CCC-CCC-DDD'
                                                                       },
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'node_next' => {
                                                                           
'cmdname' => 'node',
@@ -16665,12 +16847,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                             
'associated_section' => {
                                                                               
'cmdname' => 'chapter',
                                                                               
'extra' => {},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'section_number' => 18
                                                                               }
                                                                             },
                                                                             
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'node_next' => {
                                                                               
'cmdname' => 'node',
@@ -16678,12 +16862,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
 'associated_section' => {
                                                                                
   'cmdname' => 'chapter',
                                                                                
   'extra' => {},
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'section_number' => 19
                                                                                
   }
                                                                                
 },
                                                                                
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'node_next' => {
                                                                                
   'cmdname' => 'node',
@@ -16691,12 +16877,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
     'associated_section' => {
                                                                                
       'cmdname' => 'chapter',
                                                                                
       'extra' => {},
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'section_number' => 20
                                                                                
       }
                                                                                
     },
                                                                                
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'node_next' => {
                                                                                
       'cmdname' => 'node',
@@ -16704,12 +16892,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
         'associated_section' => {
                                                                                
           'cmdname' => 'chapter',
                                                                                
           'extra' => {},
+                                                                               
           'info' => {},
                                                                                
           'structure' => {
                                                                                
             'section_number' => 21
                                                                                
           }
                                                                                
         },
                                                                                
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'node_next' => {
                                                                                
           'cmdname' => 'node',
@@ -16717,12 +16907,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
             'associated_section' => {
                                                                                
               'cmdname' => 'chapter',
                                                                                
               'extra' => {},
+                                                                               
               'info' => {},
                                                                                
               'structure' => {
                                                                                
                 'section_number' => 22
                                                                                
               }
                                                                                
             },
                                                                                
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
+                                                                               
           'info' => {},
                                                                                
           'structure' => {
                                                                                
             'node_next' => {
                                                                                
               'cmdname' => 'node',
@@ -16730,12 +16922,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                 'associated_section' => {
                                                                                
                   'cmdname' => 'chapter',
                                                                                
                   'extra' => {},
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'section_number' => 23
                                                                                
                   }
                                                                                
                 },
                                                                                
                 'normalized' => '8_002e27in'
                                                                                
               },
+                                                                               
               'info' => {},
                                                                                
               'structure' => {
                                                                                
                 'node_next' => {
                                                                                
                   'cmdname' => 'node',
@@ -16743,12 +16937,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                     'associated_section' => {
                                                                                
                       'cmdname' => 'chapter',
                                                                                
                       'extra' => {},
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'section_number' => 24
                                                                                
                       }
                                                                                
                     },
                                                                                
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'node_next' => {
                                                                                
                       'cmdname' => 'node',
@@ -16756,12 +16952,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                         'associated_section' => {
                                                                                
                           'cmdname' => 'chapter',
                                                                                
                           'extra' => {},
+                                                                               
                           'info' => {},
                                                                                
                           'structure' => {
                                                                                
                             'section_number' => 25
                                                                                
                           }
                                                                                
                         },
                                                                                
                         'normalized' => 'indicateurl'
                                                                                
                       },
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'node_next' => {
                                                                                
                           'cmdname' => 'node',
@@ -16769,12 +16967,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                             'associated_section' => {
                                                                                
                               'cmdname' => 'chapter',
                                                                                
                               'extra' => {},
+                                                                               
                               'info' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'section_number' => 26
                                                                                
                               }
                                                                                
                             },
                                                                                
                             'normalized' => 'gH-3rd'
                                                                                
                           },
+                                                                               
                           'info' => {},
                                                                                
                           'structure' => {
                                                                                
                             'node_next' => {
                                                                                
                               'cmdname' => 'node',
@@ -16782,12 +16982,14 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                                 'associated_section' => {
                                                                                
                                   'cmdname' => 'chapter',
                                                                                
                                   'extra' => {},
+                                                                               
                                   'info' => {},
                                                                                
                                   'structure' => {
                                                                                
                                     'section_number' => 27
                                                                                
                                   }
                                                                                
                                 },
                                                                                
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
+                                                                               
                               'info' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'node_prev' => {},
                                                                                
                                 'node_up' => {}
@@ -16961,168 +17163,196 @@ $result_menus{'at_commands_in_refs_utf8'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '-_007b-_007d'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => '_2265-_2264-_2192'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 
'_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
                                         'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
                                             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
                                                 'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
+                                              'info' => {},
                                               'structure' => {
                                                 'menu_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
                                                     'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
+                                                  'info' => {},
                                                   'structure' => {
                                                     'menu_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
                                                         'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
+                                                      'info' => {},
                                                       'structure' => {
                                                         'menu_next' => {
                                                           'cmdname' => 'node',
                                                           'extra' => {
                                                             'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
+                                                          'info' => {},
                                                           'structure' => {
                                                             'menu_next' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
                                                                 'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
+                                                              'info' => {},
                                                               'structure' => {
                                                                 'menu_next' => 
{
                                                                   'cmdname' => 
'node',
                                                                   'extra' => {
                                                                     
'normalized' => 'AAA-AAA-BBB'
                                                                   },
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'menu_next' => {
                                                                       
'cmdname' => 'node',
                                                                       'extra' 
=> {
                                                                         
'normalized' => 'CCC-CCC-DDD'
                                                                       },
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'menu_next' => {
                                                                           
'cmdname' => 'node',
                                                                           
'extra' => {
                                                                             
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'menu_next' => {
                                                                               
'cmdname' => 'node',
                                                                               
'extra' => {
                                                                                
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'menu_next' => {
                                                                                
   'cmdname' => 'node',
                                                                                
   'extra' => {
                                                                                
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'menu_next' => {
                                                                                
       'cmdname' => 'node',
                                                                                
       'extra' => {
                                                                                
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'menu_next' => {
                                                                                
           'cmdname' => 'node',
                                                                                
           'extra' => {
                                                                                
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
+                                                                               
           'info' => {},
                                                                                
           'structure' => {
                                                                                
             'menu_next' => {
                                                                                
               'cmdname' => 'node',
                                                                                
               'extra' => {
                                                                                
                 'normalized' => '8_002e27in'
                                                                                
               },
+                                                                               
               'info' => {},
                                                                                
               'structure' => {
                                                                                
                 'menu_next' => {
                                                                                
                   'cmdname' => 'node',
                                                                                
                   'extra' => {
                                                                                
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'menu_next' => {
                                                                                
                       'cmdname' => 'node',
                                                                                
                       'extra' => {
                                                                                
                         'normalized' => 'indicateurl'
                                                                                
                       },
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'menu_next' => {
                                                                                
                           'cmdname' => 'node',
                                                                                
                           'extra' => {
                                                                                
                             'normalized' => 'gH-3rd'
                                                                                
                           },
+                                                                               
                           'info' => {},
                                                                                
                           'structure' => {
                                                                                
                             'menu_next' => {
                                                                                
                               'cmdname' => 'node',
                                                                                
                               'extra' => {
                                                                                
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
+                                                                               
                               'info' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'menu_prev' => {},
                                                                                
                                 'menu_up' => {},
diff --git a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
index 9c17492d30..25385908ec 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
@@ -39,7 +39,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                       'text' => 'char_latin1_latin1_in_refs.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'char_latin1_latin1_in_refs.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 3,
@@ -70,7 +72,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                       'text' => 'iso-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -81,9 +83,11 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'iso-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 5,
@@ -109,7 +113,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -129,7 +133,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -146,7 +152,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -163,7 +169,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -425,7 +431,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -434,9 +440,11 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 16,
@@ -456,7 +464,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -473,7 +482,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -494,7 +503,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
             'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
           }
         ],
-        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
+        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -511,7 +522,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -533,7 +544,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -544,7 +555,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -559,7 +572,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -576,7 +590,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => "\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -596,7 +610,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
             'normalized' => '_00e9'
           }
         ],
-        'normalized' => '_00e9',
+        'normalized' => '_00e9'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -613,7 +629,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => "\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -628,7 +644,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -645,7 +662,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => "\x{e0} \x{e8} \x{f9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -665,7 +682,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
             'normalized' => '_00e0-_00e8-_00f9'
           }
         ],
-        'normalized' => '_00e0-_00e8-_00f9',
+        'normalized' => '_00e0-_00e8-_00f9'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -682,7 +701,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => "\x{e0} \x{e8} \x{f9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -697,7 +716,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -714,7 +734,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -734,7 +754,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
             'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
           }
         ],
-        'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
+        'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -751,7 +773,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -766,7 +788,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -783,7 +806,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => "\x{e7}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -803,7 +826,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
             'normalized' => '_00e7'
           }
         ],
-        'normalized' => '_00e7',
+        'normalized' => '_00e7'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -820,7 +845,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'text' => "\x{e7}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1007,7 +1032,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1027,7 +1052,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1045,7 +1072,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'text' => "\x{c4} \x{cb} \x{cf} \x{d6} \x{dc}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1065,7 +1092,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1083,7 +1112,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'text' => "\x{e9}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1103,7 +1132,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1121,7 +1152,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'text' => "\x{e8}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1141,7 +1172,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1159,7 +1192,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1179,7 +1212,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1197,7 +1232,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'text' => "\x{e7}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1217,7 +1252,9 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1233,7 +1270,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1410,9 +1448,11 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1424,9 +1464,11 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                     'isindex' => 1,
                     'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1443,9 +1485,11 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e9'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1463,9 +1507,11 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e0-_00e8-_00f9'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -1483,9 +1529,11 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -1503,9 +1551,11 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e7'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 5,
@@ -1551,6 +1601,7 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1560,6 +1611,7 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1567,6 +1619,7 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1574,6 +1627,7 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
         'isindex' => 1,
         'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1581,12 +1635,14 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => '_00e9'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1594,12 +1650,14 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => '_00e0-_00e8-_00f9'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -1607,12 +1665,14 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 4
                       }
                     },
                     'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -1620,12 +1680,14 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_number' => 5
                           }
                         },
                         'normalized' => '_00e7'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_prev' => {},
                         'node_up' => {}
@@ -1667,6 +1729,7 @@ $result_menus{'char_latin1_latin1_in_refs'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1674,30 +1737,35 @@ $result_menus{'char_latin1_latin1_in_refs'} = {
         'isindex' => 1,
         'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '_00e9'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_00e0-_00e8-_00f9'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => '_00e7'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_prev' => {},
                         'menu_up' => {},
diff --git a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
index 62f0f2d942..9016a14a43 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
@@ -39,7 +39,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                       'text' => 'char_latin1_utf8_in_refs.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'char_latin1_utf8_in_refs.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'char_latin1_utf8_in_refs.texi',
                 'line_nr' => 3,
@@ -70,7 +72,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                       'text' => 'utf-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -81,9 +83,11 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'utf-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'char_latin1_utf8_in_refs.texi',
                 'line_nr' => 5,
@@ -109,7 +113,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -147,7 +153,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -169,7 +175,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -180,7 +186,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -197,7 +205,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -459,7 +467,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -468,9 +476,11 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'char_latin1_utf8_in_refs.texi',
                 'line_nr' => 18,
@@ -490,7 +500,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -507,7 +518,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -527,7 +538,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
             'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
           }
         ],
-        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
+        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -544,7 +557,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -559,7 +572,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -576,7 +590,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => "\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -596,7 +610,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
             'normalized' => '_00e9'
           }
         ],
-        'normalized' => '_00e9',
+        'normalized' => '_00e9'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -613,7 +629,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => "\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -628,7 +644,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -645,7 +662,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => "\x{e0} \x{e8} \x{f9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -665,7 +682,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
             'normalized' => '_00e0-_00e8-_00f9'
           }
         ],
-        'normalized' => '_00e0-_00e8-_00f9',
+        'normalized' => '_00e0-_00e8-_00f9'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -682,7 +701,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => "\x{e0} \x{e8} \x{f9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -697,7 +716,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -714,7 +734,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -734,7 +754,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
             'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
           }
         ],
-        'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
+        'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -751,7 +773,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -766,7 +788,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -783,7 +806,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => "\x{e7}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -803,7 +826,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
             'normalized' => '_00e7'
           }
         ],
-        'normalized' => '_00e7',
+        'normalized' => '_00e7'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -820,7 +845,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'text' => "\x{e7}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1007,7 +1032,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1027,7 +1052,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1045,7 +1072,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'text' => "\x{c4} \x{cb} \x{cf} \x{d6} \x{dc}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1065,7 +1092,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1083,7 +1112,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'text' => "\x{e9}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1103,7 +1132,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1121,7 +1152,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'text' => "\x{e8}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1141,7 +1172,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1159,7 +1192,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1179,7 +1212,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1197,7 +1232,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'text' => "\x{e7}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1217,7 +1252,9 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1233,7 +1270,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1411,9 +1449,11 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
               'isindex' => 1,
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1424,9 +1464,11 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1443,9 +1485,11 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e9'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1463,9 +1507,11 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e0-_00e8-_00f9'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -1483,9 +1529,11 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -1503,9 +1551,11 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e7'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 5,
@@ -1551,6 +1601,7 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
@@ -1561,6 +1612,7 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1568,12 +1620,14 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1581,12 +1635,14 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => '_00e9'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1594,12 +1650,14 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => '_00e0-_00e8-_00f9'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -1607,12 +1665,14 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 4
                       }
                     },
                     'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -1620,12 +1680,14 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_number' => 5
                           }
                         },
                         'normalized' => '_00e7'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_prev' => {},
                         'node_up' => {}
@@ -1668,36 +1730,42 @@ $result_menus{'char_latin1_utf8_in_refs'} = {
     'isindex' => 1,
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '_00e9'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_00e0-_00e8-_00f9'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => '_00e7'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_prev' => {},
                         'menu_up' => {},
diff --git a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
index 1376b2c608..8d99fe9cd7 100644
--- a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
@@ -34,7 +34,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                       'text' => 'char_latin2_latin2_in_refs.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'char_latin2_latin2_in_refs.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'char_latin2_latin2_in_refs.texi',
                 'line_nr' => 2,
@@ -65,7 +67,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                       'text' => 'ISO-8859-2'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -76,9 +78,11 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-2',
                 'input_perl_encoding' => 'iso-8859-2',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-2'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'char_latin2_latin2_in_refs.texi',
                 'line_nr' => 4,
@@ -104,7 +108,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,9 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +148,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -179,7 +185,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                           'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -199,7 +205,9 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                         'normalized' => '_0104-_0105-_02db-_0118-_0119'
                       }
                     ],
-                    'normalized' => '_0104-_0105-_02db-_0118-_0119',
+                    'normalized' => '_0104-_0105-_02db-_0118-_0119'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -241,7 +249,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -252,7 +260,9 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -285,7 +295,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -351,7 +361,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -360,9 +370,11 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'char_latin2_latin2_in_refs.texi',
                 'line_nr' => 16,
@@ -382,7 +394,8 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -400,7 +413,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -422,7 +435,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                   'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -442,7 +455,9 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -458,7 +473,8 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -547,9 +563,11 @@ $result_sectioning{'char_latin2_latin2_in_refs'} = {
               'isindex' => 1,
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -560,9 +578,11 @@ $result_sectioning{'char_latin2_latin2_in_refs'} = {
                   'extra' => {
                     'normalized' => '_0104-_0105-_02db-_0118-_0119'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -591,6 +611,7 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
@@ -601,6 +622,7 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -608,12 +630,14 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => '_0104-_0105-_02db-_0118-_0119'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -632,12 +656,14 @@ $result_menus{'char_latin2_latin2_in_refs'} = {
     'isindex' => 1,
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_0104-_0105-_02db-_0118-_0119'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git 
a/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl 
b/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
index dc36999f89..949d0ac332 100644
--- a/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
+++ b/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
@@ -17,7 +17,7 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -101,7 +103,7 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -169,7 +171,7 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -178,9 +180,11 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index 07a4f09b77..44319de36a 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -29,7 +29,7 @@ $result_trees{'japanese_shift_jis'} = {
                       'text' => 'shift_jis'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'japanese_shift_jis'} = {
               'extra' => {
                 'input_encoding_name' => 'shift_jis',
                 'input_perl_encoding' => 'shiftjis',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'shift_jis'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
                 'line_nr' => 2,
@@ -62,7 +64,7 @@ $result_trees{'japanese_shift_jis'} = {
                       'text' => 'japanese_shift_jis.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +73,11 @@ $result_trees{'japanese_shift_jis'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'japanese_shift_jis.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
                 'line_nr' => 3,
@@ -88,7 +92,7 @@ $result_trees{'japanese_shift_jis'} = {
                       'text' => 'GNU LilyPond -- Manuel d\'initiation japanese'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,7 +100,8 @@ $result_trees{'japanese_shift_jis'} = {
                 }
               ],
               'cmdname' => 'settitle',
-              'extra' => {
+              'extra' => {},
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -118,7 +123,7 @@ $result_trees{'japanese_shift_jis'} = {
                       'text' => 'ja'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -127,9 +132,11 @@ $result_trees{'japanese_shift_jis'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ja'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
                 'line_nr' => 6,
@@ -155,7 +162,7 @@ $result_trees{'japanese_shift_jis'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -175,7 +182,9 @@ $result_trees{'japanese_shift_jis'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -192,7 +201,7 @@ $result_trees{'japanese_shift_jis'} = {
               'text' => "GNU LilyPond --- 
\x{5b66}\x{7fd2}\x{30de}\x{30cb}\x{30e5}\x{30a2}\x{30eb}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -209,7 +218,7 @@ $result_trees{'japanese_shift_jis'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -327,7 +336,7 @@ $result_trees{'japanese_shift_jis'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -336,9 +345,11 @@ $result_trees{'japanese_shift_jis'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
                 'line_nr' => 20,
@@ -379,7 +390,7 @@ $result_trees{'japanese_shift_jis'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -494,7 +505,7 @@ $result_trees{'japanese_shift_jis'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -503,9 +514,11 @@ $result_trees{'japanese_shift_jis'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
                 'line_nr' => 28,
@@ -525,7 +538,8 @@ $result_trees{'japanese_shift_jis'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -542,7 +556,7 @@ $result_trees{'japanese_shift_jis'} = {
               'text' => 'Preface'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -562,7 +576,9 @@ $result_trees{'japanese_shift_jis'} = {
             'normalized' => 'Preface'
           }
         ],
-        'normalized' => 'Preface',
+        'normalized' => 'Preface'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -579,7 +595,7 @@ $result_trees{'japanese_shift_jis'} = {
               'text' => 'Preface'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -613,7 +629,8 @@ $result_trees{'japanese_shift_jis'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -630,7 +647,7 @@ $result_trees{'japanese_shift_jis'} = {
               'text' => 'Introduction'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -650,7 +667,9 @@ $result_trees{'japanese_shift_jis'} = {
             'normalized' => 'Introduction'
           }
         ],
-        'normalized' => 'Introduction',
+        'normalized' => 'Introduction'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -667,7 +686,7 @@ $result_trees{'japanese_shift_jis'} = {
               'text' => 'Introduction'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -696,7 +715,8 @@ $result_trees{'japanese_shift_jis'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -809,9 +829,11 @@ $result_sectioning{'japanese_shift_jis'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -822,9 +844,11 @@ $result_sectioning{'japanese_shift_jis'} = {
                   'extra' => {
                     'normalized' => 'Preface'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -841,9 +865,11 @@ $result_sectioning{'japanese_shift_jis'} = {
                   'extra' => {
                     'normalized' => 'Introduction'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -877,6 +903,7 @@ $result_nodes{'japanese_shift_jis'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -886,6 +913,7 @@ $result_nodes{'japanese_shift_jis'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -893,12 +921,14 @@ $result_nodes{'japanese_shift_jis'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Preface'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -906,12 +936,14 @@ $result_nodes{'japanese_shift_jis'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'Introduction'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -935,18 +967,21 @@ $result_menus{'japanese_shift_jis'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Preface'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Introduction'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl 
b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
index e35105ca2d..ef33b3c511 100644
--- a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
@@ -34,7 +34,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
                       'text' => 'iso-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'iso-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'manual_simple_latin1_with_error.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'manual_simple_latin1_with_error'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'text' => "Test\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'manual_simple_latin1_with_error'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'text' => "\x{e9}sseul\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -169,7 +174,9 @@ $result_trees{'manual_simple_latin1_with_error'} = {
             'normalized' => '_00e9sseul_00e9'
           }
         ],
-        'normalized' => '_00e9sseul_00e9',
+        'normalized' => '_00e9sseul_00e9'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -186,7 +193,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'text' => "Chapitr\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -206,7 +213,9 @@ $result_trees{'manual_simple_latin1_with_error'} = {
             'normalized' => 'Chapitr_00e9'
           }
         ],
-        'normalized' => 'Chapitr_00e9',
+        'normalized' => 'Chapitr_00e9'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -223,7 +232,7 @@ $result_trees{'manual_simple_latin1_with_error'} = {
               'text' => "Chapitr\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -248,7 +257,8 @@ $result_trees{'manual_simple_latin1_with_error'} = {
 '
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -305,9 +315,11 @@ $result_sectioning{'manual_simple_latin1_with_error'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -318,9 +330,11 @@ $result_sectioning{'manual_simple_latin1_with_error'} = {
                   'extra' => {
                     'normalized' => 'Chapitr_00e9'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -349,10 +363,12 @@ $result_nodes{'manual_simple_latin1_with_error'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -360,12 +376,14 @@ $result_nodes{'manual_simple_latin1_with_error'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapitr_00e9'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -381,6 +399,7 @@ $result_menus{'manual_simple_latin1_with_error'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl 
b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
index 873f8af254..fb2833feaa 100644
--- a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
@@ -39,7 +39,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,9 @@ $result_trees{'manual_simple_utf8_with_error'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               'text' => "Test\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,8 @@ $result_trees{'manual_simple_utf8_with_error'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +111,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               'text' => "\x{e9}sseul\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -135,7 +138,9 @@ $result_trees{'manual_simple_utf8_with_error'} = {
             'normalized' => '_00e9sseul_00e9'
           }
         ],
-        'normalized' => '_00e9sseul_00e9',
+        'normalized' => '_00e9sseul_00e9'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -152,7 +157,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               'text' => "Chapitr\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -172,7 +177,9 @@ $result_trees{'manual_simple_utf8_with_error'} = {
             'normalized' => 'Chapitr_00e9'
           }
         ],
-        'normalized' => 'Chapitr_00e9',
+        'normalized' => 'Chapitr_00e9'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -189,7 +196,7 @@ $result_trees{'manual_simple_utf8_with_error'} = {
               'text' => "Chapitr\x{e9}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -214,7 +221,8 @@ $result_trees{'manual_simple_utf8_with_error'} = {
 '
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -268,9 +276,11 @@ $result_sectioning{'manual_simple_utf8_with_error'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -281,9 +291,11 @@ $result_sectioning{'manual_simple_utf8_with_error'} = {
                   'extra' => {
                     'normalized' => 'Chapitr_00e9'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -312,10 +324,12 @@ $result_nodes{'manual_simple_utf8_with_error'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -323,12 +337,14 @@ $result_nodes{'manual_simple_utf8_with_error'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapitr_00e9'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -344,6 +360,7 @@ $result_menus{'manual_simple_utf8_with_error'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl 
b/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
index 0fcd28017d..fb364eb341 100644
--- a/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
+++ b/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
@@ -73,7 +73,7 @@ $result_trees{'no_documentencoding_and_insertions'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -141,7 +141,7 @@ $result_trees{'no_documentencoding_and_insertions'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -150,9 +150,11 @@ $result_trees{'no_documentencoding_and_insertions'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index 9c6cf87d0e..fc4c297e4b 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -50,7 +50,7 @@ $result_trees{'sample_utf8'} = {
                       'text' => 'sample_utf8.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,9 +59,11 @@ $result_trees{'sample_utf8'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'sample_utf8.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'sample_utf8'} = {
                       'text' => "Sample \x{793a}\x{4f8b} \x{104}\x{118} \x{f9}"
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -84,7 +86,8 @@ $result_trees{'sample_utf8'} = {
                 }
               ],
               'cmdname' => 'settitle',
-              'extra' => {
+              'extra' => {},
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -101,7 +104,7 @@ $result_trees{'sample_utf8'} = {
                       'text' => 'UTF-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -112,9 +115,11 @@ $result_trees{'sample_utf8'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'UTF-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
                 'line_nr' => 5,
@@ -145,7 +150,7 @@ $result_trees{'sample_utf8'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -189,7 +194,7 @@ $result_trees{'sample_utf8'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -198,9 +203,11 @@ $result_trees{'sample_utf8'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'sample_utf8.texi',
                     'line_nr' => 13,
@@ -222,7 +229,7 @@ $result_trees{'sample_utf8'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -239,7 +246,7 @@ $result_trees{'sample_utf8'} = {
                           'text' => "\x{6807}\x{9898}\x{793a}\x{4f8b} 
\x{104}\x{118} ae \x{105}\x{119} \x{c2} \x{f9}"
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -247,7 +254,7 @@ $result_trees{'sample_utf8'} = {
                     }
                   ],
                   'cmdname' => 'title',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -314,7 +321,7 @@ $result_trees{'sample_utf8'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -323,9 +330,11 @@ $result_trees{'sample_utf8'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'sample_utf8.texi',
                     'line_nr' => 21,
@@ -394,7 +403,7 @@ $result_trees{'sample_utf8'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -414,7 +423,9 @@ $result_trees{'sample_utf8'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -431,7 +442,7 @@ $result_trees{'sample_utf8'} = {
               'text' => "Texinfo\x{4e2d}\x{6587}\x{793a}\x{4f8b}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -468,7 +479,7 @@ $result_trees{'sample_utf8'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -636,7 +647,7 @@ $result_trees{'sample_utf8'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -645,9 +656,11 @@ $result_trees{'sample_utf8'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
                 'line_nr' => 38,
@@ -672,7 +685,8 @@ $result_trees{'sample_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -689,7 +703,7 @@ $result_trees{'sample_utf8'} = {
               'text' => "\x{7b2c}\x{4e00}\x{7ae0}\x{ff08}First Chapter\x{ff09}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -709,7 +723,9 @@ $result_trees{'sample_utf8'} = {
             'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
           }
         ],
-        'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09',
+        'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -726,7 +742,7 @@ $result_trees{'sample_utf8'} = {
               'text' => "\x{7b2c}\x{4e00}\x{7ae0}\x{ff08}First Chapter\x{ff09}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -748,7 +764,7 @@ $result_trees{'sample_utf8'} = {
                   'text' => 'chapter, first'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -768,7 +784,9 @@ $result_trees{'sample_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -797,7 +815,7 @@ $result_trees{'sample_utf8'} = {
                       'text' => "\x{53e6}\x{4e00}\x{4e2a}\x{ff0c}index entry"
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -817,7 +835,9 @@ $result_trees{'sample_utf8'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -835,7 +855,7 @@ $result_trees{'sample_utf8'} = {
                       'text' => "\x{104}\x{118} ae \x{105}\x{119}"
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -855,7 +875,9 @@ $result_trees{'sample_utf8'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -873,7 +895,7 @@ $result_trees{'sample_utf8'} = {
                       'text' => "\x{e9} \x{c2}"
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -893,7 +915,9 @@ $result_trees{'sample_utf8'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -928,7 +952,7 @@ $result_trees{'sample_utf8'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1010,7 +1034,7 @@ $result_trees{'sample_utf8'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1019,9 +1043,11 @@ $result_trees{'sample_utf8'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
                 'line_nr' => 59,
@@ -1044,7 +1070,8 @@ $result_trees{'sample_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1061,7 +1088,7 @@ $result_trees{'sample_utf8'} = {
               'text' => "Second Chapter AE \x{104}\x{118} ae \x{105}\x{119}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1081,7 +1108,9 @@ $result_trees{'sample_utf8'} = {
             'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
           }
         ],
-        'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119',
+        'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1098,7 +1127,7 @@ $result_trees{'sample_utf8'} = {
               'text' => "Chapter 2 AE \x{104}\x{118} ae \x{105}\x{119}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1127,7 +1156,8 @@ $result_trees{'sample_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1144,7 +1174,7 @@ $result_trees{'sample_utf8'} = {
               'text' => 'Index node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1165,7 +1195,9 @@ $result_trees{'sample_utf8'} = {
             'normalized' => 'Index-node'
           }
         ],
-        'normalized' => 'Index-node',
+        'normalized' => 'Index-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1182,7 +1214,7 @@ $result_trees{'sample_utf8'} = {
               'text' => 'Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1204,7 +1236,7 @@ $result_trees{'sample_utf8'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1215,7 +1247,9 @@ $result_trees{'sample_utf8'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1230,7 +1264,8 @@ $result_trees{'sample_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1405,9 +1440,11 @@ $result_sectioning{'sample_utf8'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1418,9 +1455,11 @@ $result_sectioning{'sample_utf8'} = {
                   'extra' => {
                     'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1437,9 +1476,11 @@ $result_sectioning{'sample_utf8'} = {
                   'extra' => {
                     'normalized' => 
'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1458,9 +1499,11 @@ $result_sectioning{'sample_utf8'} = {
                     'isindex' => 1,
                     'normalized' => 'Index-node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -1497,6 +1540,7 @@ $result_nodes{'sample_utf8'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1506,6 +1550,7 @@ $result_nodes{'sample_utf8'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1513,12 +1558,14 @@ $result_nodes{'sample_utf8'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1526,12 +1573,14 @@ $result_nodes{'sample_utf8'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1539,11 +1588,13 @@ $result_nodes{'sample_utf8'} = {
                 'associated_section' => {
                   'cmdname' => 'unnumbered',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {}
                 },
                 'isindex' => 1,
                 'normalized' => 'Index-node'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -1573,18 +1624,21 @@ $result_menus{'sample_utf8'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
@@ -1592,6 +1646,7 @@ $result_menus{'sample_utf8'} = {
                 'isindex' => 1,
                 'normalized' => 'Index-node'
               },
+              'info' => {},
               'structure' => {
                 'menu_prev' => {},
                 'menu_up' => {},
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index a8294dfed8..c5c824d267 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -19,7 +19,7 @@ $result_trees{'weird_accents'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,9 +30,11 @@ $result_trees{'weird_accents'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -58,7 +60,7 @@ $result_trees{'weird_accents'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -78,7 +80,9 @@ $result_trees{'weird_accents'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -95,7 +99,7 @@ $result_trees{'weird_accents'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -110,7 +114,8 @@ $result_trees{'weird_accents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -127,7 +132,7 @@ $result_trees{'weird_accents'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -147,7 +152,9 @@ $result_trees{'weird_accents'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -164,7 +171,7 @@ $result_trees{'weird_accents'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -469,7 +476,8 @@ $result_trees{'weird_accents'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -535,9 +543,11 @@ $result_sectioning{'weird_accents'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -548,9 +558,11 @@ $result_sectioning{'weird_accents'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -579,10 +591,12 @@ $result_nodes{'weird_accents'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -590,12 +604,14 @@ $result_nodes{'weird_accents'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -611,6 +627,7 @@ $result_menus{'weird_accents'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl 
b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
index 4740cbb884..b1d019a856 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -19,7 +19,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,9 +30,11 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -58,7 +60,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -78,7 +80,9 @@ $result_trees{'weird_accents_disable_encoding'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -95,7 +99,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -110,7 +114,8 @@ $result_trees{'weird_accents_disable_encoding'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -127,7 +132,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -147,7 +152,9 @@ $result_trees{'weird_accents_disable_encoding'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -164,7 +171,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -469,7 +476,8 @@ $result_trees{'weird_accents_disable_encoding'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -535,9 +543,11 @@ $result_sectioning{'weird_accents_disable_encoding'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -548,9 +558,11 @@ $result_sectioning{'weird_accents_disable_encoding'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -579,10 +591,12 @@ $result_nodes{'weird_accents_disable_encoding'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -590,12 +604,14 @@ $result_nodes{'weird_accents_disable_encoding'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -611,6 +627,7 @@ $result_menus{'weird_accents_disable_encoding'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index 5c0def3111..2697a847f9 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -34,7 +34,7 @@ $result_trees{'cond'} = {
                       'text' => 'cond.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'cond'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cond.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 2,
@@ -71,7 +73,7 @@ $result_trees{'cond'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,7 @@ $result_trees{'cond'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -114,7 +116,7 @@ $result_trees{'cond'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -123,9 +125,11 @@ $result_trees{'cond'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 8,
@@ -195,7 +199,7 @@ $result_trees{'cond'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -215,7 +219,7 @@ $result_trees{'cond'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -224,9 +228,11 @@ $result_trees{'cond'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 30,
@@ -277,7 +283,9 @@ $result_trees{'cond'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -350,14 +358,16 @@ $result_nodes{'cond'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'cond'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'cond'} = [];
diff --git a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index 252ddbec6c..80ff41215f 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -34,7 +34,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                       'text' => 'cond.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cond.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 2,
@@ -71,7 +73,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -114,7 +116,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -123,9 +125,11 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 8,
@@ -195,7 +199,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -221,7 +225,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -230,9 +234,11 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 30,
@@ -283,7 +289,9 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -357,14 +365,16 @@ $result_nodes{'cond_ifhtml_ifinfo_iftex'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'cond_ifhtml_ifinfo_iftex'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'cond_ifhtml_ifinfo_iftex'} = [];
diff --git a/tp/t/results/formatting/cond_info.pl 
b/tp/t/results/formatting/cond_info.pl
index d0dec3651e..967849fe27 100644
--- a/tp/t/results/formatting/cond_info.pl
+++ b/tp/t/results/formatting/cond_info.pl
@@ -34,7 +34,7 @@ $result_trees{'cond_info'} = {
                       'text' => 'cond.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'cond_info'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cond.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 2,
@@ -71,7 +73,7 @@ $result_trees{'cond_info'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,7 @@ $result_trees{'cond_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -108,7 +110,7 @@ $result_trees{'cond_info'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -117,9 +119,11 @@ $result_trees{'cond_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 8,
@@ -189,7 +193,7 @@ $result_trees{'cond_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -209,7 +213,7 @@ $result_trees{'cond_info'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -218,9 +222,11 @@ $result_trees{'cond_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 30,
@@ -271,7 +277,9 @@ $result_trees{'cond_info'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -343,14 +351,16 @@ $result_nodes{'cond_info'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'cond_info'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'cond_info'} = [];
diff --git a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
index 6520b5759c..8ca5290868 100644
--- a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
@@ -34,7 +34,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                       'text' => 'cond.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cond.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 2,
@@ -71,7 +73,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -114,7 +116,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -123,9 +125,11 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 8,
@@ -195,7 +199,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -221,7 +225,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -230,9 +234,11 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 30,
@@ -283,7 +289,9 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -357,14 +365,16 @@ $result_nodes{'cond_info_ifhtml_ifinfo_iftex'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'cond_info_ifhtml_ifinfo_iftex'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'cond_info_ifhtml_ifinfo_iftex'} = [];
diff --git a/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index c221440770..28d7ed5706 100644
--- a/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -34,7 +34,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                       'text' => 'cond.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cond.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 2,
@@ -71,7 +73,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -108,7 +110,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -117,9 +119,11 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 8,
@@ -189,7 +193,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -209,7 +213,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -218,9 +222,11 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 30,
@@ -271,7 +277,9 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -343,14 +351,16 @@ $result_nodes{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 
{
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = [];
diff --git a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index 1f90bf55a8..7fa47eefcd 100644
--- a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -34,7 +34,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                       'text' => 'cond.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cond.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 2,
@@ -71,7 +73,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -108,7 +110,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -117,9 +119,11 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 8,
@@ -189,7 +193,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -209,7 +213,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -218,9 +222,11 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 30,
@@ -271,7 +277,9 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -343,14 +351,16 @@ $result_nodes{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'cond_no-ifhtml_no-ifinfo_no-iftex'} = [];
diff --git a/tp/t/results/formatting/cond_xml.pl 
b/tp/t/results/formatting/cond_xml.pl
index 859f63682d..1fe3eef9e7 100644
--- a/tp/t/results/formatting/cond_xml.pl
+++ b/tp/t/results/formatting/cond_xml.pl
@@ -34,7 +34,7 @@ $result_trees{'cond_xml'} = {
                       'text' => 'cond.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'cond_xml'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cond.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 2,
@@ -71,7 +73,7 @@ $result_trees{'cond_xml'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,7 @@ $result_trees{'cond_xml'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -108,7 +110,7 @@ $result_trees{'cond_xml'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -117,9 +119,11 @@ $result_trees{'cond_xml'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 8,
@@ -189,7 +193,7 @@ $result_trees{'cond_xml'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -209,7 +213,7 @@ $result_trees{'cond_xml'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -218,9 +222,11 @@ $result_trees{'cond_xml'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 30,
@@ -271,7 +277,9 @@ $result_trees{'cond_xml'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -343,14 +351,16 @@ $result_nodes{'cond_xml'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'cond_xml'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'cond_xml'} = [];
diff --git a/tp/t/results/formatting/defcondx_Dbar.pl 
b/tp/t/results/formatting/defcondx_Dbar.pl
index 5e8fb979ef..0e16f43be0 100644
--- a/tp/t/results/formatting/defcondx_Dbar.pl
+++ b/tp/t/results/formatting/defcondx_Dbar.pl
@@ -34,7 +34,7 @@ $result_trees{'defcondx_Dbar'} = {
                       'text' => 'defxcond.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'defcondx_Dbar'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defxcond.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'defxcond.texi',
                 'line_nr' => 2,
@@ -190,7 +192,9 @@ $result_trees{'defcondx_Dbar'} = {
                 'def_parsed_hash' => {
                   'category' => {}
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -232,7 +236,7 @@ $result_trees{'defcondx_Dbar'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -241,9 +245,11 @@ $result_trees{'defcondx_Dbar'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'defxcond.texi',
                 'line_nr' => 16,
@@ -251,7 +257,7 @@ $result_trees{'defcondx_Dbar'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/formatting/defcondx_Ubar.pl 
b/tp/t/results/formatting/defcondx_Ubar.pl
index 5fcd08f39a..920e45fc68 100644
--- a/tp/t/results/formatting/defcondx_Ubar.pl
+++ b/tp/t/results/formatting/defcondx_Ubar.pl
@@ -34,7 +34,7 @@ $result_trees{'defcondx_Ubar'} = {
                       'text' => 'defxcond.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'defcondx_Ubar'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defxcond.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'defxcond.texi',
                 'line_nr' => 2,
@@ -189,7 +191,7 @@ $result_trees{'defcondx_Ubar'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -198,9 +200,11 @@ $result_trees{'defcondx_Ubar'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'defxcond.texi',
                 'line_nr' => 16,
@@ -208,7 +212,7 @@ $result_trees{'defcondx_Ubar'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/formatting/direntry_dircategory_info_split.pl 
b/tp/t/results/formatting/direntry_dircategory_info_split.pl
index cd6f968501..9ce1bac310 100644
--- a/tp/t/results/formatting/direntry_dircategory_info_split.pl
+++ b/tp/t/results/formatting/direntry_dircategory_info_split.pl
@@ -39,7 +39,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                       'text' => 'direntry_dircategory.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'direntry_dircategory_info_split'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry_dircategory.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
                 'line_nr' => 3,
@@ -91,7 +93,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                       'text' => '?\'\''
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -99,7 +101,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                 }
               ],
               'cmdname' => 'dircategory',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -111,7 +113,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -216,7 +218,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                           'text' => 'direntry'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -225,9 +227,11 @@ $result_trees{'direntry_dircategory_info_split'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'direntry'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'direntry_dircategory.texi',
                     'line_nr' => 8,
@@ -254,7 +258,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                       'text' => 'cat2'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -262,7 +266,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                 }
               ],
               'cmdname' => 'dircategory',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -274,7 +278,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -368,7 +372,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                           'text' => 'direntry'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -377,9 +381,11 @@ $result_trees{'direntry_dircategory_info_split'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'direntry'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'direntry_dircategory.texi',
                     'line_nr' => 16,
@@ -417,7 +423,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -437,7 +443,9 @@ $result_trees{'direntry_dircategory_info_split'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -454,7 +462,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
               'text' => 'Test dircategory and direntry'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -485,7 +493,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                   'text' => 'in text'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -493,7 +501,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
             }
           ],
           'cmdname' => 'dircategory',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -505,7 +513,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -589,7 +597,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                       'text' => 'direntry'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -598,9 +606,11 @@ $result_trees{'direntry_dircategory_info_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
                 'line_nr' => 26,
@@ -622,7 +632,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -688,7 +698,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -697,9 +707,11 @@ $result_trees{'direntry_dircategory_info_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
                 'line_nr' => 30,
@@ -719,7 +731,8 @@ $result_trees{'direntry_dircategory_info_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -736,7 +749,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -756,7 +769,9 @@ $result_trees{'direntry_dircategory_info_split'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -773,7 +788,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -802,7 +817,8 @@ $result_trees{'direntry_dircategory_info_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -915,9 +931,11 @@ $result_sectioning{'direntry_dircategory_info_split'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -928,9 +946,11 @@ $result_sectioning{'direntry_dircategory_info_split'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -959,6 +979,7 @@ $result_nodes{'direntry_dircategory_info_split'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -968,6 +989,7 @@ $result_nodes{'direntry_dircategory_info_split'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -975,12 +997,14 @@ $result_nodes{'direntry_dircategory_info_split'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -998,12 +1022,14 @@ $result_menus{'direntry_dircategory_info_split'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/formatting/documentlanguage_set_option.pl 
b/tp/t/results/formatting/documentlanguage_set_option.pl
index 7256b29cf3..0617bc3afc 100644
--- a/tp/t/results/formatting/documentlanguage_set_option.pl
+++ b/tp/t/results/formatting/documentlanguage_set_option.pl
@@ -50,7 +50,7 @@ $result_trees{'documentlanguage_set_option'} = {
                       'text' => 'documentlanguage_set.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,9 +59,11 @@ $result_trees{'documentlanguage_set_option'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'documentlanguage_set.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'documentlanguage_set.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'documentlanguage_set_option'} = {
                       'text' => 'pt'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -85,9 +87,11 @@ $result_trees{'documentlanguage_set_option'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'pt'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'documentlanguage_set.texi',
                 'line_nr' => 4,
@@ -108,7 +112,7 @@ $result_trees{'documentlanguage_set_option'} = {
                       'text' => 'documentlanguage set'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -116,7 +120,8 @@ $result_trees{'documentlanguage_set_option'} = {
                 }
               ],
               'cmdname' => 'settitle',
-              'extra' => {
+              'extra' => {},
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -144,7 +149,7 @@ $result_trees{'documentlanguage_set_option'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -164,7 +169,9 @@ $result_trees{'documentlanguage_set_option'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +191,7 @@ $result_trees{'documentlanguage_set_option'} = {
               'text' => 'documentlanguage set'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -213,7 +220,8 @@ $result_trees{'documentlanguage_set_option'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -271,9 +279,11 @@ $result_sectioning{'documentlanguage_set_option'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -291,17 +301,20 @@ $result_nodes{'documentlanguage_set_option'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'documentlanguage_set_option'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'documentlanguage_set_option'} = [];
diff --git a/tp/t/results/formatting/documentlanguage_set_option_info.pl 
b/tp/t/results/formatting/documentlanguage_set_option_info.pl
index 7de523c27f..6f0c4f86b8 100644
--- a/tp/t/results/formatting/documentlanguage_set_option_info.pl
+++ b/tp/t/results/formatting/documentlanguage_set_option_info.pl
@@ -50,7 +50,7 @@ $result_trees{'documentlanguage_set_option_info'} = {
                       'text' => 'documentlanguage_set.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,9 +59,11 @@ $result_trees{'documentlanguage_set_option_info'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'documentlanguage_set.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'documentlanguage_set.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'documentlanguage_set_option_info'} = {
                       'text' => 'pt'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -85,9 +87,11 @@ $result_trees{'documentlanguage_set_option_info'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'pt'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'documentlanguage_set.texi',
                 'line_nr' => 4,
@@ -108,7 +112,7 @@ $result_trees{'documentlanguage_set_option_info'} = {
                       'text' => 'documentlanguage set'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -116,7 +120,7 @@ $result_trees{'documentlanguage_set_option_info'} = {
                 }
               ],
               'cmdname' => 'settitle',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -144,7 +148,7 @@ $result_trees{'documentlanguage_set_option_info'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -164,7 +168,9 @@ $result_trees{'documentlanguage_set_option_info'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +190,7 @@ $result_trees{'documentlanguage_set_option_info'} = {
               'text' => 'documentlanguage set'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -213,7 +219,8 @@ $result_trees{'documentlanguage_set_option_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -271,9 +278,11 @@ $result_sectioning{'documentlanguage_set_option_info'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -291,17 +300,20 @@ $result_nodes{'documentlanguage_set_option_info'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'documentlanguage_set_option_info'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'documentlanguage_set_option_info'} = [];
diff --git a/tp/t/results/formatting/documentlanguage_set_unknown.pl 
b/tp/t/results/formatting/documentlanguage_set_unknown.pl
index d4e275eb2a..a16698915b 100644
--- a/tp/t/results/formatting/documentlanguage_set_unknown.pl
+++ b/tp/t/results/formatting/documentlanguage_set_unknown.pl
@@ -50,7 +50,7 @@ $result_trees{'documentlanguage_set_unknown'} = {
                       'text' => 'documentlanguage_set.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,9 +59,11 @@ $result_trees{'documentlanguage_set_unknown'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'documentlanguage_set.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'documentlanguage_set.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'documentlanguage_set_unknown'} = {
                       'text' => 'pt'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -85,9 +87,11 @@ $result_trees{'documentlanguage_set_unknown'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'pt'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'documentlanguage_set.texi',
                 'line_nr' => 4,
@@ -108,7 +112,7 @@ $result_trees{'documentlanguage_set_unknown'} = {
                       'text' => 'documentlanguage set'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -116,7 +120,8 @@ $result_trees{'documentlanguage_set_unknown'} = {
                 }
               ],
               'cmdname' => 'settitle',
-              'extra' => {
+              'extra' => {},
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -144,7 +149,7 @@ $result_trees{'documentlanguage_set_unknown'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -164,7 +169,9 @@ $result_trees{'documentlanguage_set_unknown'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +191,7 @@ $result_trees{'documentlanguage_set_unknown'} = {
               'text' => 'documentlanguage set'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -213,7 +220,8 @@ $result_trees{'documentlanguage_set_unknown'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -271,9 +279,11 @@ $result_sectioning{'documentlanguage_set_unknown'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -291,17 +301,20 @@ $result_nodes{'documentlanguage_set_unknown'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'documentlanguage_set_unknown'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'documentlanguage_set_unknown'} = [];
diff --git a/tp/t/results/formatting/float_copying.pl 
b/tp/t/results/formatting/float_copying.pl
index a66e4d1cdb..a8b9812866 100644
--- a/tp/t/results/formatting/float_copying.pl
+++ b/tp/t/results/formatting/float_copying.pl
@@ -39,7 +39,7 @@ $result_trees{'float_copying'} = {
                       'text' => 'float_copying.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'float_copying'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float_copying.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'float_copying.texi',
                 'line_nr' => 3,
@@ -65,7 +67,7 @@ $result_trees{'float_copying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -95,7 +97,7 @@ $result_trees{'float_copying'} = {
                           'text' => 'public domain'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -195,7 +197,7 @@ $result_trees{'float_copying'} = {
                                                   'text' => 'indexed caption 
copying footnote'
                                                 }
                                               ],
-                                              'extra' => {
+                                              'info' => {
                                                 'spaces_after_argument' => '
 '
                                               },
@@ -215,7 +217,9 @@ $result_trees{'float_copying'} = {
                                               'index_ignore_chars' => {},
                                               'index_name' => 'cp',
                                               'index_type_command' => 'cindex'
-                                            },
+                                            }
+                                          },
+                                          'info' => {
                                             'spaces_before_argument' => ' '
                                           },
                                           'source_info' => {
@@ -233,7 +237,7 @@ $result_trees{'float_copying'} = {
                                                   'text' => 'public domain 
function'
                                                 }
                                               ],
-                                              'extra' => {
+                                              'info' => {
                                                 'spaces_after_argument' => '
 '
                                               },
@@ -253,7 +257,9 @@ $result_trees{'float_copying'} = {
                                               'index_ignore_chars' => {},
                                               'index_name' => 'fn',
                                               'index_type_command' => 'findex'
-                                            },
+                                            }
+                                          },
+                                          'info' => {
                                             'spaces_before_argument' => ' '
                                           },
                                           'source_info' => {
@@ -294,7 +300,7 @@ $result_trees{'float_copying'} = {
                                                           'text' => 'Copying 
and floats'
                                                         }
                                                       ],
-                                                      'extra' => {
+                                                      'info' => {
                                                         
'spaces_after_argument' => '
 '
                                                       },
@@ -315,7 +321,9 @@ $result_trees{'float_copying'} = {
                                                         'normalized' => 
'Copying-and-floats'
                                                       }
                                                     ],
-                                                    'normalized' => 
'Copying-and-floats',
+                                                    'normalized' => 
'Copying-and-floats'
+                                                  },
+                                                  'info' => {
                                                     'spaces_before_argument' 
=> ' '
                                                   },
                                                   'source_info' => {
@@ -354,7 +362,7 @@ $result_trees{'float_copying'} = {
                                     }
                                   ],
                                   'cmdname' => 'footnote',
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => '
 '
                                   },
@@ -416,7 +424,7 @@ $result_trees{'float_copying'} = {
                                       'text' => 'indexed caption'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -436,7 +444,9 @@ $result_trees{'float_copying'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
                                   'index_type_command' => 'cindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -454,7 +464,7 @@ $result_trees{'float_copying'} = {
                                       'text' => 'indexed caption function'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -474,7 +484,9 @@ $result_trees{'float_copying'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
                                   'index_type_command' => 'findex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -511,7 +523,7 @@ $result_trees{'float_copying'} = {
                               'text' => 'float'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -520,9 +532,11 @@ $result_trees{'float_copying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'float'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => 'float_copying.texi',
                         'line_nr' => 27,
@@ -536,7 +550,6 @@ $result_trees{'float_copying'} = {
                       {}
                     ],
                     'normalized' => 'public-domain',
-                    'spaces_before_argument' => ' ',
                     'type' => {
                       'content' => [
                         {}
@@ -544,6 +557,9 @@ $result_trees{'float_copying'} = {
                       'normalized' => 'Copyright notice'
                     }
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'float_copying.texi',
                     'line_nr' => 7,
@@ -558,7 +574,7 @@ $result_trees{'float_copying'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -567,9 +583,11 @@ $result_trees{'float_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'float_copying.texi',
                     'line_nr' => 28,
@@ -602,7 +620,7 @@ $result_trees{'float_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -622,7 +640,9 @@ $result_trees{'float_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -639,7 +659,7 @@ $result_trees{'float_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -661,7 +681,7 @@ $result_trees{'float_copying'} = {
                   'text' => 'Top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -681,7 +701,9 @@ $result_trees{'float_copying'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -807,7 +829,7 @@ $result_trees{'float_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -873,7 +895,7 @@ $result_trees{'float_copying'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -882,9 +904,11 @@ $result_trees{'float_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'float_copying.texi',
                 'line_nr' => 43,
@@ -904,7 +928,8 @@ $result_trees{'float_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -922,7 +947,7 @@ $result_trees{'float_copying'} = {
               'text' => 'Copying and floats'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1050,7 +1075,7 @@ $result_trees{'float_copying'} = {
                   'text' => 'listofloats'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1070,7 +1095,9 @@ $result_trees{'float_copying'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1128,7 +1155,7 @@ $result_trees{'float_copying'} = {
                   'text' => 'listoffloats'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1136,7 +1163,7 @@ $result_trees{'float_copying'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1153,7 +1180,7 @@ $result_trees{'float_copying'} = {
                   'text' => 'Copyright notice'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1162,7 +1189,6 @@ $result_trees{'float_copying'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -1170,6 +1196,9 @@ $result_trees{'float_copying'} = {
               'normalized' => 'Copyright notice'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => 'float_copying.texi',
             'line_nr' => 61,
@@ -1189,7 +1218,7 @@ $result_trees{'float_copying'} = {
                   'text' => 'printindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1197,7 +1226,7 @@ $result_trees{'float_copying'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1214,7 +1243,7 @@ $result_trees{'float_copying'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1225,7 +1254,9 @@ $result_trees{'float_copying'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1242,7 +1273,7 @@ $result_trees{'float_copying'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1253,7 +1284,9 @@ $result_trees{'float_copying'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1268,7 +1301,8 @@ $result_trees{'float_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1454,9 +1488,11 @@ $result_sectioning{'float_copying'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1468,9 +1504,11 @@ $result_sectioning{'float_copying'} = {
                     'isindex' => 1,
                     'normalized' => 'Copying-and-floats'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 'A',
@@ -1499,6 +1537,7 @@ $result_nodes{'float_copying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1508,6 +1547,7 @@ $result_nodes{'float_copying'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1515,6 +1555,7 @@ $result_nodes{'float_copying'} = {
         'associated_section' => {
           'cmdname' => 'appendix',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 'A'
           }
@@ -1522,6 +1563,7 @@ $result_nodes{'float_copying'} = {
         'isindex' => 1,
         'normalized' => 'Copying-and-floats'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1539,6 +1581,7 @@ $result_menus{'float_copying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1546,6 +1589,7 @@ $result_menus{'float_copying'} = {
         'isindex' => 1,
         'normalized' => 'Copying-and-floats'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
@@ -1581,6 +1625,7 @@ $result_floats{'float_copying'} = {
           'normalized' => 'Copyright notice'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/formatting/simplest_test_date_in_header.pl 
b/tp/t/results/formatting/simplest_test_date_in_header.pl
index eca2df23a3..a77155c3c5 100644
--- a/tp/t/results/formatting/simplest_test_date_in_header.pl
+++ b/tp/t/results/formatting/simplest_test_date_in_header.pl
@@ -39,7 +39,7 @@ $result_trees{'simplest_test_date_in_header'} = {
                       'text' => 'simplest.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'simplest_test_date_in_header'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'simplest.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'simplest.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'simplest_test_date_in_header'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -123,7 +125,9 @@ $result_trees{'simplest_test_date_in_header'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -170,14 +174,16 @@ $result_nodes{'simplest_test_date_in_header'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'simplest_test_date_in_header'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'simplest_test_date_in_header'} = [];
diff --git a/tp/t/results/formatting/simplest_test_prefix.pl 
b/tp/t/results/formatting/simplest_test_prefix.pl
index 8ae9b65761..ee45ae97f7 100644
--- a/tp/t/results/formatting/simplest_test_prefix.pl
+++ b/tp/t/results/formatting/simplest_test_prefix.pl
@@ -39,7 +39,7 @@ $result_trees{'simplest_test_prefix'} = {
                       'text' => 'simplest.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'simplest_test_prefix'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'simplest.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'simplest.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'simplest_test_prefix'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -123,7 +125,9 @@ $result_trees{'simplest_test_prefix'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -170,14 +174,16 @@ $result_nodes{'simplest_test_prefix'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'simplest_test_prefix'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'simplest_test_prefix'} = [];
diff --git a/tp/t/results/formatting/simplest_test_prefix_info.pl 
b/tp/t/results/formatting/simplest_test_prefix_info.pl
index 0a3504477d..ad4e5db764 100644
--- a/tp/t/results/formatting/simplest_test_prefix_info.pl
+++ b/tp/t/results/formatting/simplest_test_prefix_info.pl
@@ -39,7 +39,7 @@ $result_trees{'simplest_test_prefix_info'} = {
                       'text' => 'simplest.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'simplest_test_prefix_info'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'simplest.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'simplest.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'simplest_test_prefix_info'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -123,7 +125,9 @@ $result_trees{'simplest_test_prefix_info'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -170,14 +174,16 @@ $result_nodes{'simplest_test_prefix_info'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'simplest_test_prefix_info'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'simplest_test_prefix_info'} = [];
diff --git a/tp/t/results/formatting/split_for_format_not_split.pl 
b/tp/t/results/formatting/split_for_format_not_split.pl
index 2cfce1f569..9725cf0d24 100644
--- a/tp/t/results/formatting/split_for_format_not_split.pl
+++ b/tp/t/results/formatting/split_for_format_not_split.pl
@@ -39,7 +39,7 @@ $result_trees{'split_for_format_not_split'} = {
                       'text' => 'simplest.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'split_for_format_not_split'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'simplest.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'simplest.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'split_for_format_not_split'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -123,7 +125,9 @@ $result_trees{'split_for_format_not_split'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -170,14 +174,16 @@ $result_nodes{'split_for_format_not_split'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'split_for_format_not_split'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'split_for_format_not_split'} = [];
diff --git a/tp/t/results/formatting/split_nocopying.pl 
b/tp/t/results/formatting/split_nocopying.pl
index 725fa67892..53b47093ca 100644
--- a/tp/t/results/formatting/split_nocopying.pl
+++ b/tp/t/results/formatting/split_nocopying.pl
@@ -34,7 +34,7 @@ $result_trees{'split_nocopying'} = {
                       'text' => 'split-nocopying.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'split_nocopying'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'split-nocopying.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'split_nocopying.texi',
                 'line_nr' => 2,
@@ -71,7 +73,7 @@ $result_trees{'split_nocopying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,9 @@ $result_trees{'split_nocopying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +112,7 @@ $result_trees{'split_nocopying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -139,7 +143,7 @@ $result_trees{'split_nocopying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -205,7 +209,7 @@ $result_trees{'split_nocopying'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -214,9 +218,11 @@ $result_trees{'split_nocopying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'split_nocopying.texi',
                 'line_nr' => 11,
@@ -236,7 +242,8 @@ $result_trees{'split_nocopying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -253,7 +260,7 @@ $result_trees{'split_nocopying'} = {
               'text' => 'Ch1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -273,7 +280,9 @@ $result_trees{'split_nocopying'} = {
             'normalized' => 'Ch1'
           }
         ],
-        'normalized' => 'Ch1',
+        'normalized' => 'Ch1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -290,7 +299,7 @@ $result_trees{'split_nocopying'} = {
               'text' => 'Ch1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -319,7 +328,8 @@ $result_trees{'split_nocopying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -395,9 +405,11 @@ $result_sectioning{'split_nocopying'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -408,9 +420,11 @@ $result_sectioning{'split_nocopying'} = {
                   'extra' => {
                     'normalized' => 'Ch1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -439,6 +453,7 @@ $result_nodes{'split_nocopying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -448,6 +463,7 @@ $result_nodes{'split_nocopying'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -455,12 +471,14 @@ $result_nodes{'split_nocopying'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Ch1'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -478,12 +496,14 @@ $result_menus{'split_nocopying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Ch1'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/formatting/split_nocopying_split.pl 
b/tp/t/results/formatting/split_nocopying_split.pl
index 2dc545176c..b68b566df0 100644
--- a/tp/t/results/formatting/split_nocopying_split.pl
+++ b/tp/t/results/formatting/split_nocopying_split.pl
@@ -34,7 +34,7 @@ $result_trees{'split_nocopying_split'} = {
                       'text' => 'split-nocopying.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'split_nocopying_split'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'split-nocopying.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'split_nocopying.texi',
                 'line_nr' => 2,
@@ -71,7 +73,7 @@ $result_trees{'split_nocopying_split'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,9 @@ $result_trees{'split_nocopying_split'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +112,7 @@ $result_trees{'split_nocopying_split'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -139,7 +143,7 @@ $result_trees{'split_nocopying_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -205,7 +209,7 @@ $result_trees{'split_nocopying_split'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -214,9 +218,11 @@ $result_trees{'split_nocopying_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'split_nocopying.texi',
                 'line_nr' => 11,
@@ -236,7 +242,8 @@ $result_trees{'split_nocopying_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -253,7 +260,7 @@ $result_trees{'split_nocopying_split'} = {
               'text' => 'Ch1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -273,7 +280,9 @@ $result_trees{'split_nocopying_split'} = {
             'normalized' => 'Ch1'
           }
         ],
-        'normalized' => 'Ch1',
+        'normalized' => 'Ch1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -290,7 +299,7 @@ $result_trees{'split_nocopying_split'} = {
               'text' => 'Ch1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -319,7 +328,8 @@ $result_trees{'split_nocopying_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -395,9 +405,11 @@ $result_sectioning{'split_nocopying_split'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -408,9 +420,11 @@ $result_sectioning{'split_nocopying_split'} = {
                   'extra' => {
                     'normalized' => 'Ch1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -439,6 +453,7 @@ $result_nodes{'split_nocopying_split'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -448,6 +463,7 @@ $result_nodes{'split_nocopying_split'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -455,12 +471,14 @@ $result_nodes{'split_nocopying_split'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Ch1'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -478,12 +496,14 @@ $result_menus{'split_nocopying_split'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Ch1'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index 44516b31d1..a5bccd9793 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -315,7 +315,7 @@ $result_trees{'texi_bib_example'} = {
                       'text' => 'my-file-with-bib.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -324,9 +324,11 @@ $result_trees{'texi_bib_example'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'my-file-with-bib.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'bib-example.texi',
                 'line_nr' => 23,
@@ -341,7 +343,7 @@ $result_trees{'texi_bib_example'} = {
                       'text' => 'Texinfo with a Bibliography and References'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -349,7 +351,8 @@ $result_trees{'texi_bib_example'} = {
                 }
               ],
               'cmdname' => 'settitle',
-              'extra' => {
+              'extra' => {},
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -2635,7 +2638,7 @@ $result_trees{'texi_bib_example'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2644,9 +2647,11 @@ $result_trees{'texi_bib_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
                     'line_nr' => 164,
@@ -2728,7 +2733,7 @@ $result_trees{'texi_bib_example'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2737,9 +2742,11 @@ $result_trees{'texi_bib_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
                     'line_nr' => 171,
@@ -2845,7 +2852,7 @@ $result_trees{'texi_bib_example'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2854,9 +2861,11 @@ $result_trees{'texi_bib_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
                     'line_nr' => 182,
@@ -2962,7 +2971,7 @@ $result_trees{'texi_bib_example'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2971,9 +2980,11 @@ $result_trees{'texi_bib_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
                     'line_nr' => 193,
@@ -3083,7 +3094,7 @@ $result_trees{'texi_bib_example'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -3092,9 +3103,11 @@ $result_trees{'texi_bib_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
                     'line_nr' => 207,
@@ -3147,7 +3160,7 @@ $result_trees{'texi_bib_example'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -3156,9 +3169,11 @@ $result_trees{'texi_bib_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
                     'line_nr' => 211,
@@ -3293,7 +3308,7 @@ $result_trees{'texi_bib_example'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -3302,9 +3317,11 @@ $result_trees{'texi_bib_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'my-bib-macros.texi',
                     'line_nr' => 230,
@@ -3425,7 +3442,7 @@ $result_trees{'texi_bib_example'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3445,7 +3462,9 @@ $result_trees{'texi_bib_example'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3462,7 +3481,7 @@ $result_trees{'texi_bib_example'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3479,7 +3498,7 @@ $result_trees{'texi_bib_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3609,7 +3628,7 @@ $result_trees{'texi_bib_example'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3618,9 +3637,11 @@ $result_trees{'texi_bib_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'bib-example.texi',
                 'line_nr' => 38,
@@ -3640,7 +3661,8 @@ $result_trees{'texi_bib_example'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3657,7 +3679,7 @@ $result_trees{'texi_bib_example'} = {
               'text' => 'Introduction'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3677,7 +3699,9 @@ $result_trees{'texi_bib_example'} = {
             'normalized' => 'Introduction'
           }
         ],
-        'normalized' => 'Introduction',
+        'normalized' => 'Introduction'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3694,7 +3718,7 @@ $result_trees{'texi_bib_example'} = {
               'text' => 'Introduction'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3752,7 +3776,7 @@ $result_trees{'texi_bib_example'} = {
                       'text' => 'LaTeX2e'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -3768,7 +3792,7 @@ $result_trees{'texi_bib_example'} = {
                           'text' => 'References'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -3788,7 +3812,9 @@ $result_trees{'texi_bib_example'} = {
                         'normalized' => 'References'
                       }
                     ],
-                    'normalized' => 'References',
+                    'normalized' => 'References'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -3831,7 +3857,8 @@ $result_trees{'texi_bib_example'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3849,7 +3876,7 @@ $result_trees{'texi_bib_example'} = {
               'text' => 'References'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3877,7 +3904,7 @@ $result_trees{'texi_bib_example'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3988,7 +4015,7 @@ $result_trees{'texi_bib_example'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3997,9 +4024,11 @@ $result_trees{'texi_bib_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'bib-example.texi',
                 'line_nr' => 56,
@@ -4008,7 +4037,9 @@ $result_trees{'texi_bib_example'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4023,7 +4054,8 @@ $result_trees{'texi_bib_example'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4447,9 +4479,11 @@ $result_sectioning{'texi_bib_example'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -4460,9 +4494,11 @@ $result_sectioning{'texi_bib_example'} = {
                   'extra' => {
                     'normalized' => 'Introduction'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -4479,9 +4515,11 @@ $result_sectioning{'texi_bib_example'} = {
                   'extra' => {
                     'normalized' => 'References'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -4515,6 +4553,7 @@ $result_nodes{'texi_bib_example'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -4524,6 +4563,7 @@ $result_nodes{'texi_bib_example'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -4531,12 +4571,14 @@ $result_nodes{'texi_bib_example'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Introduction'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -4544,12 +4586,14 @@ $result_nodes{'texi_bib_example'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'References'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -4573,18 +4617,21 @@ $result_menus{'texi_bib_example'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Introduction'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'References'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/formatting/texi_cond.pl 
b/tp/t/results/formatting/texi_cond.pl
index b4904aeec4..147c822cb9 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -34,7 +34,7 @@ $result_trees{'texi_cond'} = {
                       'text' => 'cond.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'texi_cond'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cond.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 2,
@@ -71,7 +73,7 @@ $result_trees{'texi_cond'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,7 @@ $result_trees{'texi_cond'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -114,7 +116,7 @@ $result_trees{'texi_cond'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -123,9 +125,11 @@ $result_trees{'texi_cond'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 8,
@@ -195,7 +199,7 @@ $result_trees{'texi_cond'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -215,7 +219,7 @@ $result_trees{'texi_cond'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -224,9 +228,11 @@ $result_trees{'texi_cond'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cond.texi',
                 'line_nr' => 30,
@@ -277,7 +283,9 @@ $result_trees{'texi_cond'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -350,14 +358,16 @@ $result_nodes{'texi_cond'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'texi_cond'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'texi_cond'} = [];
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index 307f1e9c58..8a243be1f5 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -39,7 +39,7 @@ $result_trees{'texi_glossary'} = {
                       'text' => 'glossary'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'texi_glossary'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'glossary'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 3,
@@ -84,7 +86,7 @@ $result_trees{'texi_glossary'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -93,9 +95,11 @@ $result_trees{'texi_glossary'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'glossary.texi',
                     'line_nr' => 7,
@@ -150,7 +154,7 @@ $result_trees{'texi_glossary'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -159,9 +163,11 @@ $result_trees{'texi_glossary'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'glossary.texi',
                     'line_nr' => 13,
@@ -274,7 +280,7 @@ $result_trees{'texi_glossary'} = {
                                   'text' => 'macro'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -283,9 +289,11 @@ $result_trees{'texi_glossary'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'macro'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'glossary.texi',
                             'line_nr' => 29,
@@ -306,7 +314,7 @@ $result_trees{'texi_glossary'} = {
                               'text' => 'macro'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -315,9 +323,11 @@ $result_trees{'texi_glossary'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'macro'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => 'glossary.texi',
                         'line_nr' => 30,
@@ -348,7 +358,7 @@ $result_trees{'texi_glossary'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -357,9 +367,11 @@ $result_trees{'texi_glossary'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'glossary.texi',
                     'line_nr' => 33,
@@ -396,7 +408,7 @@ $result_trees{'texi_glossary'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -416,7 +428,9 @@ $result_trees{'texi_glossary'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -433,7 +447,7 @@ $result_trees{'texi_glossary'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -450,7 +464,7 @@ $result_trees{'texi_glossary'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -516,7 +530,7 @@ $result_trees{'texi_glossary'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -525,9 +539,11 @@ $result_trees{'texi_glossary'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 40,
@@ -649,7 +665,7 @@ $result_trees{'texi_glossary'} = {
                               'text' => 'macro'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -658,9 +674,11 @@ $result_trees{'texi_glossary'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'macro'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => 'glossary.texi',
                         'line_nr' => 42,
@@ -681,7 +699,7 @@ $result_trees{'texi_glossary'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -690,9 +708,11 @@ $result_trees{'texi_glossary'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'glossary.texi',
                     'line_nr' => 42,
@@ -758,7 +778,7 @@ $result_trees{'texi_glossary'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -767,9 +787,11 @@ $result_trees{'texi_glossary'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'glossary.texi',
                     'line_nr' => 42,
@@ -913,7 +935,7 @@ $result_trees{'texi_glossary'} = {
                               'text' => 'macro'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -922,9 +944,11 @@ $result_trees{'texi_glossary'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'macro'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => 'glossary.texi',
                         'line_nr' => 43,
@@ -945,7 +969,7 @@ $result_trees{'texi_glossary'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -954,9 +978,11 @@ $result_trees{'texi_glossary'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'glossary.texi',
                     'line_nr' => 43,
@@ -1022,7 +1048,7 @@ $result_trees{'texi_glossary'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1031,9 +1057,11 @@ $result_trees{'texi_glossary'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'glossary.texi',
                     'line_nr' => 43,
@@ -1064,7 +1092,8 @@ $result_trees{'texi_glossary'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1081,7 +1110,7 @@ $result_trees{'texi_glossary'} = {
               'text' => 'glossary'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1101,7 +1130,9 @@ $result_trees{'texi_glossary'} = {
             'normalized' => 'glossary'
           }
         ],
-        'normalized' => 'glossary',
+        'normalized' => 'glossary'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1118,7 +1149,7 @@ $result_trees{'texi_glossary'} = {
               'text' => 'glossary'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1165,7 +1196,8 @@ $result_trees{'texi_glossary'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1307,9 +1339,11 @@ $result_sectioning{'texi_glossary'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1320,9 +1354,11 @@ $result_sectioning{'texi_glossary'} = {
                   'extra' => {
                     'normalized' => 'glossary'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1351,6 +1387,7 @@ $result_nodes{'texi_glossary'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1360,6 +1397,7 @@ $result_nodes{'texi_glossary'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1367,12 +1405,14 @@ $result_nodes{'texi_glossary'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'glossary'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1390,12 +1430,14 @@ $result_menus{'texi_glossary'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'glossary'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index b631c87040..c520126c5d 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -12,7 +12,7 @@ $result_trees{'heading_in_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -58,7 +58,7 @@ $result_trees{'heading_in_copying'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -66,7 +66,7 @@ $result_trees{'heading_in_copying'} = {
                 }
               ],
               'cmdname' => 'heading',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -83,7 +83,7 @@ $result_trees{'heading_in_copying'} = {
                       'text' => 'cindex copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -103,7 +103,9 @@ $result_trees{'heading_in_copying'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -150,7 +152,7 @@ $result_trees{'heading_in_copying'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -158,7 +160,7 @@ $result_trees{'heading_in_copying'} = {
                 }
               ],
               'cmdname' => 'subheading',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -175,7 +177,7 @@ $result_trees{'heading_in_copying'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -184,9 +186,11 @@ $result_trees{'heading_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -216,7 +220,7 @@ $result_trees{'heading_in_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -258,7 +262,9 @@ $result_trees{'heading_in_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -299,14 +305,16 @@ $result_nodes{'heading_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'heading_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'heading_in_copying'} = [];
diff --git a/tp/t/results/heading/heading_in_example.pl 
b/tp/t/results/heading/heading_in_example.pl
index 75cb314ffd..d62050449c 100644
--- a/tp/t/results/heading/heading_in_example.pl
+++ b/tp/t/results/heading/heading_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'heading_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -53,7 +53,7 @@ $result_trees{'heading_in_example'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -61,7 +61,7 @@ $result_trees{'heading_in_example'} = {
                 }
               ],
               'cmdname' => 'heading',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -78,7 +78,7 @@ $result_trees{'heading_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -87,9 +87,11 @@ $result_trees{'heading_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/heading/heading_in_quotation.pl 
b/tp/t/results/heading/heading_in_quotation.pl
index c995c40731..03a08aab98 100644
--- a/tp/t/results/heading/heading_in_quotation.pl
+++ b/tp/t/results/heading/heading_in_quotation.pl
@@ -12,7 +12,7 @@ $result_trees{'heading_in_quotation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -58,7 +58,7 @@ $result_trees{'heading_in_quotation'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -66,7 +66,7 @@ $result_trees{'heading_in_quotation'} = {
                 }
               ],
               'cmdname' => 'heading',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -88,7 +88,7 @@ $result_trees{'heading_in_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -97,9 +97,11 @@ $result_trees{'heading_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/html_tests/acronym_in_node_and_section.pl 
b/tp/t/results/html_tests/acronym_in_node_and_section.pl
index fc9bafc921..87f394fe90 100644
--- a/tp/t/results/html_tests/acronym_in_node_and_section.pl
+++ b/tp/t/results/html_tests/acronym_in_node_and_section.pl
@@ -18,7 +18,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'acronym_in_node_and_section'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -70,7 +72,8 @@ $result_trees{'acronym_in_node_and_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -87,7 +90,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +110,9 @@ $result_trees{'acronym_in_node_and_section'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +129,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -139,7 +144,8 @@ $result_trees{'acronym_in_node_and_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -156,7 +162,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'text' => 'sec define'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -176,7 +182,9 @@ $result_trees{'acronym_in_node_and_section'} = {
             'normalized' => 'sec-define'
           }
         ],
-        'normalized' => 'sec-define',
+        'normalized' => 'sec-define'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -193,7 +201,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               'text' => 'define'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -225,7 +233,7 @@ $result_trees{'acronym_in_node_and_section'} = {
                       'text' => 'Good Hypo Jolly'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -251,7 +259,8 @@ $result_trees{'acronym_in_node_and_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -286,7 +295,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -308,7 +317,9 @@ $result_trees{'acronym_in_node_and_section'} = {
             'normalized' => 'sec-here-is-GHJ'
           }
         ],
-        'normalized' => 'sec-here-is-GHJ',
+        'normalized' => 'sec-here-is-GHJ'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -343,7 +354,7 @@ $result_trees{'acronym_in_node_and_section'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -388,7 +399,8 @@ $result_trees{'acronym_in_node_and_section'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -457,9 +469,11 @@ $result_sectioning{'acronym_in_node_and_section'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -470,9 +484,11 @@ $result_sectioning{'acronym_in_node_and_section'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -483,9 +499,11 @@ $result_sectioning{'acronym_in_node_and_section'} = {
                         'extra' => {
                           'normalized' => 'sec-define'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -500,9 +518,11 @@ $result_sectioning{'acronym_in_node_and_section'} = {
                         'extra' => {
                           'normalized' => 'sec-here-is-GHJ'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.2',
@@ -541,10 +561,12 @@ $result_nodes{'acronym_in_node_and_section'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -552,12 +574,14 @@ $result_nodes{'acronym_in_node_and_section'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -573,6 +597,7 @@ $result_menus{'acronym_in_node_and_section'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
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 b1bb76b076..d172b7c870 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
@@ -18,7 +18,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -26,7 +26,8 @@ $result_trees{'character_number_leading_toc_stoc'} = {
         }
       ],
       'cmdname' => 'top',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -43,7 +44,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
               'text' => '0'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -51,7 +52,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -68,7 +69,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
               'text' => '_'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +77,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
         }
       ],
       'cmdname' => 'unnumbered',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +94,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
               'text' => '?'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -148,7 +149,7 @@ $result_trees{'character_number_leading_toc_stoc'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -192,11 +193,12 @@ $result_sectioning{'character_number_leading_toc_stoc'} = 
{
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -207,12 +209,12 @@ $result_sectioning{'character_number_leading_toc_stoc'} = 
{
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_up' => {}
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index 550f322092..d1dfcfe5cb 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -39,7 +39,7 @@ $result_trees{'check_htmlxref'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -50,7 +50,7 @@ $result_trees{'check_htmlxref'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -67,7 +67,7 @@ $result_trees{'check_htmlxref'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -104,7 +104,9 @@ $result_trees{'check_htmlxref'} = {
             ]
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -121,7 +123,7 @@ $result_trees{'check_htmlxref'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -153,7 +155,7 @@ $result_trees{'check_htmlxref'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -164,7 +166,7 @@ $result_trees{'check_htmlxref'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -175,7 +177,7 @@ $result_trees{'check_htmlxref'} = {
                       'text' => 'no_existing_no_manual.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -215,7 +217,7 @@ $result_trees{'check_htmlxref'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -226,7 +228,7 @@ $result_trees{'check_htmlxref'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -237,7 +239,7 @@ $result_trees{'check_htmlxref'} = {
                       'text' => 'no_existing_no_manual.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -272,7 +274,7 @@ $result_trees{'check_htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -441,7 +443,7 @@ $result_trees{'check_htmlxref'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -450,9 +452,11 @@ $result_trees{'check_htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -472,7 +476,8 @@ $result_trees{'check_htmlxref'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -503,7 +508,7 @@ $result_trees{'check_htmlxref'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -536,7 +541,9 @@ $result_trees{'check_htmlxref'} = {
             ]
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -567,7 +574,7 @@ $result_trees{'check_htmlxref'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -587,7 +594,7 @@ $result_trees{'check_htmlxref'} = {
               'text' => 'node in dir'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -622,7 +629,9 @@ $result_trees{'check_htmlxref'} = {
             'normalized' => 'node-in-dir'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -639,7 +648,7 @@ $result_trees{'check_htmlxref'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -647,7 +656,8 @@ $result_trees{'check_htmlxref'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -728,9 +738,11 @@ $result_sectioning{'check_htmlxref'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -741,9 +753,11 @@ $result_sectioning{'check_htmlxref'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -772,6 +786,7 @@ $result_nodes{'check_htmlxref'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -781,12 +796,14 @@ $result_nodes{'check_htmlxref'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'extra' => {
@@ -827,12 +844,14 @@ $result_menus{'check_htmlxref'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'extra' => {
diff --git a/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl 
b/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
index 3c1c025d87..8c758f9573 100644
--- a/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
+++ b/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
@@ -39,7 +39,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -50,7 +50,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -67,7 +67,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -104,7 +104,9 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
             ]
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -121,7 +123,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -153,7 +155,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -164,7 +166,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -175,7 +177,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                       'text' => 'no_existing_no_manual.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -215,7 +217,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -226,7 +228,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -237,7 +239,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                       'text' => 'no_existing_no_manual.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -272,7 +274,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -441,7 +443,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -450,9 +452,11 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -472,7 +476,8 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -503,7 +508,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -536,7 +541,9 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
             ]
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -567,7 +574,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -587,7 +594,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'text' => 'node in dir'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -622,7 +629,9 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
             'normalized' => 'node-in-dir'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -639,7 +648,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -647,7 +656,8 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -728,9 +738,11 @@ $result_sectioning{'check_htmlxref_ignore_ref_top_up'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -741,9 +753,11 @@ $result_sectioning{'check_htmlxref_ignore_ref_top_up'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -772,6 +786,7 @@ $result_nodes{'check_htmlxref_ignore_ref_top_up'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -781,12 +796,14 @@ $result_nodes{'check_htmlxref_ignore_ref_top_up'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'extra' => {
@@ -827,12 +844,14 @@ $result_menus{'check_htmlxref_ignore_ref_top_up'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'extra' => {
diff --git a/tp/t/results/html_tests/check_htmlxref_menu.pl 
b/tp/t/results/html_tests/check_htmlxref_menu.pl
index a7921cfb2b..a0db114cdd 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -39,7 +39,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -50,7 +50,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -67,7 +67,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -104,7 +104,9 @@ $result_trees{'check_htmlxref_menu'} = {
             ]
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -121,7 +123,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -153,7 +155,7 @@ $result_trees{'check_htmlxref_menu'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -164,7 +166,7 @@ $result_trees{'check_htmlxref_menu'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -175,7 +177,7 @@ $result_trees{'check_htmlxref_menu'} = {
                       'text' => 'no_existing_no_manual.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -215,7 +217,7 @@ $result_trees{'check_htmlxref_menu'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -226,7 +228,7 @@ $result_trees{'check_htmlxref_menu'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -237,7 +239,7 @@ $result_trees{'check_htmlxref_menu'} = {
                       'text' => 'no_existing_no_manual.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -272,7 +274,7 @@ $result_trees{'check_htmlxref_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -441,7 +443,7 @@ $result_trees{'check_htmlxref_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -450,9 +452,11 @@ $result_trees{'check_htmlxref_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -472,7 +476,8 @@ $result_trees{'check_htmlxref_menu'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -503,7 +508,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -536,7 +541,9 @@ $result_trees{'check_htmlxref_menu'} = {
             ]
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -567,7 +574,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -587,7 +594,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'text' => 'node in dir'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -622,7 +629,9 @@ $result_trees{'check_htmlxref_menu'} = {
             'normalized' => 'node-in-dir'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -639,7 +648,7 @@ $result_trees{'check_htmlxref_menu'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -647,7 +656,8 @@ $result_trees{'check_htmlxref_menu'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -728,9 +738,11 @@ $result_sectioning{'check_htmlxref_menu'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -741,9 +753,11 @@ $result_sectioning{'check_htmlxref_menu'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -772,6 +786,7 @@ $result_nodes{'check_htmlxref_menu'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -781,12 +796,14 @@ $result_nodes{'check_htmlxref_menu'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'extra' => {
@@ -827,12 +844,14 @@ $result_menus{'check_htmlxref_menu'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'extra' => {
diff --git a/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl 
b/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
index 9447319f28..cf43ee8e73 100644
--- a/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
+++ b/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -50,7 +50,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -67,7 +67,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -104,7 +104,9 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
             ]
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -121,7 +123,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -153,7 +155,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -164,7 +166,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -175,7 +177,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                       'text' => 'no_existing_no_manual.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -215,7 +217,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -226,7 +228,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -237,7 +239,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                       'text' => 'no_existing_no_manual.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -272,7 +274,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -441,7 +443,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -450,9 +452,11 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -472,7 +476,8 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -503,7 +508,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -536,7 +541,9 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
             ]
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -567,7 +574,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -587,7 +594,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'text' => 'node in dir'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -622,7 +629,9 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
             'normalized' => 'node-in-dir'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -639,7 +648,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -647,7 +656,8 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -728,9 +738,11 @@ $result_sectioning{'check_htmlxref_no_use_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -741,9 +753,11 @@ $result_sectioning{'check_htmlxref_no_use_nodes'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -772,6 +786,7 @@ $result_nodes{'check_htmlxref_no_use_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -781,12 +796,14 @@ $result_nodes{'check_htmlxref_no_use_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'extra' => {
@@ -827,12 +844,14 @@ $result_menus{'check_htmlxref_no_use_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'extra' => {
diff --git a/tp/t/results/html_tests/commands_in_abbr.pl 
b/tp/t/results/html_tests/commands_in_abbr.pl
index 36a3825592..68fd54e0d3 100644
--- a/tp/t/results/html_tests/commands_in_abbr.pl
+++ b/tp/t/results/html_tests/commands_in_abbr.pl
@@ -45,7 +45,7 @@ $result_trees{'commands_in_abbr'} = {
                       'text' => ' -- b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -73,7 +73,7 @@ $result_trees{'commands_in_abbr'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -118,7 +118,7 @@ $result_trees{'commands_in_abbr'} = {
                           'text' => ' -- b'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -146,7 +146,7 @@ $result_trees{'commands_in_abbr'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -155,9 +155,11 @@ $result_trees{'commands_in_abbr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/html_tests/commands_in_alt.pl 
b/tp/t/results/html_tests/commands_in_alt.pl
index 9ed9d040ee..0c31f6be1d 100644
--- a/tp/t/results/html_tests/commands_in_alt.pl
+++ b/tp/t/results/html_tests/commands_in_alt.pl
@@ -74,7 +74,7 @@ $result_trees{'commands_in_alt'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -153,7 +153,7 @@ $result_trees{'commands_in_alt'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -162,9 +162,11 @@ $result_trees{'commands_in_alt'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
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 7cdf7b6a42..284975bb8e 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -12,7 +12,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -144,7 +144,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                           'text' => 'deftypefun'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -153,9 +153,11 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'deftypefun'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -163,7 +165,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -180,7 +182,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -189,9 +191,11 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -238,7 +242,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -249,7 +253,9 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -294,7 +300,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -314,7 +320,9 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -331,7 +339,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -468,7 +476,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                       'text' => 'deftypefun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -477,9 +485,11 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -487,7 +497,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -502,7 +512,8 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -575,9 +586,11 @@ $result_sectioning{'deftypefnnewline_for_copying_after'} = 
{
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -595,17 +608,20 @@ $result_nodes{'deftypefnnewline_for_copying_after'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'deftypefnnewline_for_copying_after'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'deftypefnnewline_for_copying_after'} = [];
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index fd9f8fc6f5..7eb9283787 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -22,7 +22,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,9 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -50,7 +52,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -182,7 +184,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                           'text' => 'deftypefun'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -191,9 +193,11 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'deftypefun'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -201,7 +205,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -218,7 +222,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -227,9 +231,11 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -259,7 +265,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -279,7 +285,9 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -296,7 +304,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -433,7 +441,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                       'text' => 'deftypefun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -442,9 +450,11 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -452,7 +462,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -467,7 +477,8 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -536,9 +547,11 @@ $result_sectioning{'deftypefnnewline_for_copying_before'} 
= {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -556,17 +569,20 @@ $result_nodes{'deftypefnnewline_for_copying_before'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'deftypefnnewline_for_copying_before'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'deftypefnnewline_for_copying_before'} = [];
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index a2e74742c6..b09396c31f 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -12,7 +12,7 @@ $result_trees{'documentdescription'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -207,7 +207,7 @@ $result_trees{'documentdescription'} = {
                       'text' => 'documentdescription'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -216,9 +216,11 @@ $result_trees{'documentdescription'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'documentdescription'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -248,7 +250,7 @@ $result_trees{'documentdescription'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -256,7 +258,8 @@ $result_trees{'documentdescription'} = {
         }
       ],
       'cmdname' => 'top',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -288,6 +291,7 @@ $result_sectioning{'documentdescription'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
diff --git a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index a48750c70d..09380af612 100644
--- a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -66,7 +66,7 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +86,9 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -103,7 +105,7 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -118,7 +120,8 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -171,9 +174,11 @@ 
$result_sectioning{'empty_lines_at_beginning_no_setfilename'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -191,17 +196,20 @@ $result_nodes{'empty_lines_at_beginning_no_setfilename'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'empty_lines_at_beginning_no_setfilename'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'empty_lines_at_beginning_no_setfilename'} = [];
diff --git 
a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
index a9a1565893..1e6cfa6a8c 100644
--- 
a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
+++ 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
@@ -41,7 +41,7 @@ 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'} = {
                   'text' => 'centered'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -49,7 +49,7 @@ 
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
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 186a1963d0..1f9c2c181e 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
@@ -17,7 +17,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
                   'text' => 'separate'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
           'extra' => {
             'misc_args' => [
               'separate'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -53,7 +55,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -73,7 +75,9 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -90,7 +94,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -140,7 +144,8 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -157,7 +162,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -177,7 +182,9 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -194,7 +201,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -209,7 +216,8 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -259,9 +267,11 @@ 
$result_sectioning{'footnotestyle_separate_html_text_no_monolithic'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -272,9 +282,11 @@ 
$result_sectioning{'footnotestyle_separate_html_text_no_monolithic'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -303,10 +315,12 @@ 
$result_nodes{'footnotestyle_separate_html_text_no_monolithic'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -314,12 +328,14 @@ 
$result_nodes{'footnotestyle_separate_html_text_no_monolithic'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -335,6 +351,7 @@ 
$result_menus{'footnotestyle_separate_html_text_no_monolithic'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index 9ccc60d1ab..7330b64133 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -19,7 +19,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'footnotestyle_separate_late'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -71,7 +73,8 @@ $result_trees{'footnotestyle_separate_late'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -96,7 +99,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'text' => 'chap f'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -116,7 +119,9 @@ $result_trees{'footnotestyle_separate_late'} = [
               'normalized' => 'chap-f'
             }
           ],
-          'normalized' => 'chap-f',
+          'normalized' => 'chap-f'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -133,7 +138,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'text' => 'Chapter f'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -185,7 +190,8 @@ $result_trees{'footnotestyle_separate_late'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -210,7 +216,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'text' => 'chap s'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -230,7 +236,9 @@ $result_trees{'footnotestyle_separate_late'} = [
               'normalized' => 'chap-s'
             }
           ],
-          'normalized' => 'chap-s',
+          'normalized' => 'chap-s'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -247,7 +255,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                 'text' => 'Chapter s'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -306,7 +314,7 @@ $result_trees{'footnotestyle_separate_late'} = [
                     'text' => 'separate'
                   }
                 ],
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -317,7 +325,9 @@ $result_trees{'footnotestyle_separate_late'} = [
             'extra' => {
               'misc_args' => [
                 'separate'
-              ],
+              ]
+            },
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'source_info' => {
@@ -327,7 +337,8 @@ $result_trees{'footnotestyle_separate_late'} = [
             }
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -396,6 +407,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -410,6 +422,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
                           'extra' => {
                             'normalized' => 'chap-f'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -426,6 +439,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
                                 'extra' => {
                                   'normalized' => 'chap-s'
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {}
                                 }
@@ -473,6 +487,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_childs' => [
@@ -481,6 +496,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
               'extra' => {
                 'associated_node' => {}
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_level' => 1,
@@ -495,6 +511,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
               'extra' => {
                 'associated_node' => {}
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_level' => 1,
@@ -564,6 +581,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -579,6 +597,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
                       'associated_section' => {
                         'cmdname' => 'chapter',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'section_number' => 1
@@ -586,6 +605,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
                       },
                       'normalized' => 'chap-f'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_next' => {
@@ -594,6 +614,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
                           'associated_section' => {
                             'cmdname' => 'chapter',
                             'extra' => {},
+                            'info' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -619,6 +640,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
                           },
                           'normalized' => 'chap-s'
                         },
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'node_prev' => {},
@@ -663,6 +685,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'node_next' => {}
@@ -713,6 +736,7 @@ $result_menus{'footnotestyle_separate_late'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -727,6 +751,7 @@ $result_menus{'footnotestyle_separate_late'} = {
                 'extra' => {
                   'normalized' => 'chap-f'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {}
                 }
@@ -743,6 +768,7 @@ $result_menus{'footnotestyle_separate_late'} = {
                       'extra' => {
                         'normalized' => 'chap-s'
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {}
                       }
@@ -834,6 +860,7 @@ $result_elements{'footnotestyle_separate_late'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -848,6 +875,7 @@ $result_elements{'footnotestyle_separate_late'} = [
               'extra' => {
                 'normalized' => 'chap-f'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {}
               }
@@ -864,6 +892,7 @@ $result_elements{'footnotestyle_separate_late'} = [
                     'extra' => {
                       'normalized' => 'chap-s'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index c92882c4ab..6717c09f80 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -17,7 +17,7 @@ $result_trees{'html_in_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'html_in_copying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -69,7 +69,7 @@ $result_trees{'html_in_copying'} = {
                           'text' => 'html'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -78,9 +78,11 @@ $result_trees{'html_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -102,7 +104,7 @@ $result_trees{'html_in_copying'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -111,9 +113,11 @@ $result_trees{'html_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -143,7 +147,7 @@ $result_trees{'html_in_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -163,7 +167,9 @@ $result_trees{'html_in_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -180,7 +186,7 @@ $result_trees{'html_in_copying'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -195,7 +201,8 @@ $result_trees{'html_in_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -242,9 +249,11 @@ $result_sectioning{'html_in_copying'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -262,17 +271,20 @@ $result_nodes{'html_in_copying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'html_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'html_in_copying'} = [];
diff --git a/tp/t/results/html_tests/index_and_node_same_name.pl 
b/tp/t/results/html_tests/index_and_node_same_name.pl
index 61bb8384d5..08c78a5fad 100644
--- a/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -18,7 +18,7 @@ $result_trees{'index_and_node_same_name'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -26,7 +26,8 @@ $result_trees{'index_and_node_same_name'} = {
         }
       ],
       'cmdname' => 'top',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -43,7 +44,7 @@ $result_trees{'index_and_node_same_name'} = {
               'text' => 'index node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -65,7 +66,7 @@ $result_trees{'index_and_node_same_name'} = {
                   'text' => 'node'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -85,7 +86,9 @@ $result_trees{'index_and_node_same_name'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -103,7 +106,7 @@ $result_trees{'index_and_node_same_name'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -114,7 +117,9 @@ $result_trees{'index_and_node_same_name'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -142,7 +147,9 @@ $result_trees{'index_and_node_same_name'} = {
             'normalized' => 'index-node'
           }
         ],
-        'normalized' => 'index-node',
+        'normalized' => 'index-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -182,6 +189,7 @@ $result_sectioning{'index_and_node_same_name'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -198,7 +206,8 @@ $result_nodes{'index_and_node_same_name'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'index-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'index_and_node_same_name'} = {
@@ -206,7 +215,8 @@ $result_menus{'index_and_node_same_name'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'index-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'index_and_node_same_name'} = [];
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index 3aa9842c5e..cc7cfa409f 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -19,7 +19,7 @@ $result_trees{'index_below'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -34,7 +34,8 @@ $result_trees{'index_below'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -59,7 +60,7 @@ $result_trees{'index_below'} = [
                 'text' => 'chap'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -74,7 +75,8 @@ $result_trees{'index_below'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -99,7 +101,7 @@ $result_trees{'index_below'} = [
                 'text' => 'sec'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -121,7 +123,7 @@ $result_trees{'index_below'} = [
                     'text' => 'entry'
                   }
                 ],
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -140,7 +142,9 @@ $result_trees{'index_below'} = [
                 'index_ignore_chars' => {},
                 'index_name' => 'cp',
                 'index_type_command' => 'cindex'
-              },
+              }
+            },
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'source_info' => {
@@ -158,7 +162,7 @@ $result_trees{'index_below'} = [
                     'text' => 'cp'
                   }
                 ],
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -169,7 +173,9 @@ $result_trees{'index_below'} = [
             'extra' => {
               'misc_args' => [
                 'cp'
-              ],
+              ]
+            },
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'source_info' => {
@@ -179,7 +185,8 @@ $result_trees{'index_below'} = [
             }
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -230,6 +237,7 @@ $result_sectioning{'index_below'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -242,12 +250,14 @@ $result_sectioning{'index_below'} = {
                     'unit_command' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_childs' => [
                           {
                             'cmdname' => 'section',
                             'extra' => {},
+                            'info' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -353,6 +363,7 @@ $result_elements{'index_below'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -365,6 +376,7 @@ $result_elements{'index_below'} = [
             'unit_command' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -380,6 +392,7 @@ $result_elements{'index_below'} = [
                   'unit_command' => {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => '1.1'
diff --git a/tp/t/results/html_tests/itemize_arguments.pl 
b/tp/t/results/html_tests/itemize_arguments.pl
index 25ca4287d6..b4ac6e0512 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -22,7 +22,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => '---'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -84,7 +86,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -106,7 +108,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => 'a\'\'b\'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -149,7 +151,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -158,9 +160,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -168,7 +172,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -205,7 +209,7 @@ $result_trees{'itemize_arguments'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -269,7 +273,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -278,9 +282,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -288,7 +294,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -310,7 +316,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => 'a``b`c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -353,7 +359,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -362,9 +368,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -372,7 +380,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -394,7 +402,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => 'a\'"'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -437,7 +445,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -446,9 +454,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -456,7 +466,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -478,7 +488,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => 'b\\<&'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -521,7 +531,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -530,9 +540,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -540,7 +552,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -568,7 +580,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -627,7 +639,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -636,9 +648,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -647,7 +661,9 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -710,7 +726,7 @@ $result_trees{'itemize_arguments'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -800,7 +816,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -809,9 +825,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -819,7 +837,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -852,7 +870,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -911,7 +929,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -920,9 +938,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -931,7 +951,9 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -966,7 +988,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1025,7 +1047,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1034,9 +1056,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 40,
@@ -1044,7 +1068,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1072,7 +1096,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1115,7 +1139,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1124,9 +1148,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1135,7 +1161,9 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1170,7 +1198,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1229,7 +1257,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1238,9 +1266,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 48,
@@ -1248,7 +1278,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1270,7 +1300,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => '*'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1319,7 +1349,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1328,9 +1358,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 52,
@@ -1338,7 +1370,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1360,7 +1392,7 @@ $result_trees{'itemize_arguments'} = {
                   'cmdname' => '{'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1409,7 +1441,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1418,9 +1450,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 56,
@@ -1428,7 +1462,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1461,7 +1495,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1520,7 +1554,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1529,9 +1563,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 60,
@@ -1540,7 +1576,9 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1575,7 +1613,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1634,7 +1672,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1643,9 +1681,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 64,
@@ -1653,7 +1693,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1686,7 +1726,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1745,7 +1785,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1754,9 +1794,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 68,
@@ -1765,7 +1807,9 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1800,7 +1844,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1859,7 +1903,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1868,9 +1912,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 72,
@@ -1878,7 +1924,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1941,7 +1987,7 @@ $result_trees{'itemize_arguments'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2041,7 +2087,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2050,9 +2096,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 76,
@@ -2060,7 +2108,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2123,7 +2171,7 @@ $result_trees{'itemize_arguments'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2223,7 +2271,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2232,9 +2280,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 80,
@@ -2242,7 +2292,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2387,7 +2437,7 @@ $result_trees{'itemize_arguments'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2559,7 +2609,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2568,9 +2618,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 84,
@@ -2578,7 +2630,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2723,7 +2775,7 @@ $result_trees{'itemize_arguments'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2895,7 +2947,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2904,9 +2956,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 88,
@@ -2914,7 +2968,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3050,7 +3104,7 @@ $result_trees{'itemize_arguments'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3213,7 +3267,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3222,9 +3276,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 92,
@@ -3232,7 +3288,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3260,7 +3316,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3319,7 +3375,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3328,9 +3384,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 96,
@@ -3339,7 +3397,9 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3375,7 +3435,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3437,7 +3497,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3446,9 +3506,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 100,
@@ -3457,7 +3519,9 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3495,7 +3559,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3557,7 +3621,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3566,9 +3630,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 104,
@@ -3576,7 +3642,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3638,7 +3704,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3700,7 +3766,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3709,9 +3775,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 110,
@@ -3720,7 +3788,9 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3758,7 +3828,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3820,7 +3890,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3829,9 +3899,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 114,
@@ -3839,7 +3911,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3872,7 +3944,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3931,7 +4003,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3940,9 +4012,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 118,
@@ -3951,7 +4025,9 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3986,7 +4062,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4045,7 +4121,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4054,9 +4130,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 122,
@@ -4064,7 +4142,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4086,7 +4164,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => 'fr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4095,9 +4173,11 @@ $result_trees{'itemize_arguments'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 124,
@@ -4123,7 +4203,7 @@ $result_trees{'itemize_arguments'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4182,7 +4262,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4191,9 +4271,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 127,
@@ -4202,7 +4284,9 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4237,7 +4321,7 @@ $result_trees{'itemize_arguments'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4296,7 +4380,7 @@ $result_trees{'itemize_arguments'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4305,9 +4389,11 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 131,
@@ -4315,7 +4401,7 @@ $result_trees{'itemize_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
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 f6ef3450ce..bf7b162c25 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -22,7 +22,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => '---'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -84,7 +86,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -106,7 +108,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => 'a\'\'b\'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -149,7 +151,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -158,9 +160,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -168,7 +172,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -205,7 +209,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -269,7 +273,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -278,9 +282,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -288,7 +294,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -310,7 +316,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => 'a``b`c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -353,7 +359,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -362,9 +368,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -372,7 +380,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -394,7 +402,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => 'a\'"'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -437,7 +445,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -446,9 +454,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -456,7 +466,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -478,7 +488,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => 'b\\<&'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -521,7 +531,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -530,9 +540,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -540,7 +552,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -568,7 +580,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -627,7 +639,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -636,9 +648,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -647,7 +661,9 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -710,7 +726,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -800,7 +816,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -809,9 +825,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -819,7 +837,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -852,7 +870,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -911,7 +929,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -920,9 +938,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -931,7 +951,9 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -966,7 +988,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1025,7 +1047,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1034,9 +1056,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 40,
@@ -1044,7 +1068,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1072,7 +1096,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1115,7 +1139,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1124,9 +1148,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1135,7 +1161,9 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1170,7 +1198,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1229,7 +1257,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1238,9 +1266,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 48,
@@ -1248,7 +1278,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1270,7 +1300,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => '*'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1319,7 +1349,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1328,9 +1358,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 52,
@@ -1338,7 +1370,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1360,7 +1392,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'cmdname' => '{'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1409,7 +1441,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1418,9 +1450,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 56,
@@ -1428,7 +1462,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1461,7 +1495,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1520,7 +1554,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1529,9 +1563,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 60,
@@ -1540,7 +1576,9 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1575,7 +1613,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1634,7 +1672,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1643,9 +1681,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 64,
@@ -1653,7 +1693,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1686,7 +1726,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1745,7 +1785,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1754,9 +1794,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 68,
@@ -1765,7 +1807,9 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1800,7 +1844,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1859,7 +1903,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1868,9 +1912,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 72,
@@ -1878,7 +1924,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1941,7 +1987,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2041,7 +2087,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2050,9 +2096,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 76,
@@ -2060,7 +2108,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2123,7 +2171,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2223,7 +2271,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2232,9 +2280,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 80,
@@ -2242,7 +2292,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2387,7 +2437,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2559,7 +2609,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2568,9 +2618,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 84,
@@ -2578,7 +2630,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2723,7 +2775,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2895,7 +2947,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2904,9 +2956,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 88,
@@ -2914,7 +2968,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3050,7 +3104,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3213,7 +3267,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3222,9 +3276,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 92,
@@ -3232,7 +3288,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3260,7 +3316,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3319,7 +3375,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3328,9 +3384,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 96,
@@ -3339,7 +3397,9 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3375,7 +3435,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3437,7 +3497,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3446,9 +3506,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 100,
@@ -3457,7 +3519,9 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3495,7 +3559,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3557,7 +3621,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3566,9 +3630,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 104,
@@ -3576,7 +3642,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3638,7 +3704,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3700,7 +3766,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3709,9 +3775,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 110,
@@ -3720,7 +3788,9 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3758,7 +3828,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3820,7 +3890,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3829,9 +3899,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 114,
@@ -3839,7 +3911,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3872,7 +3944,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3931,7 +4003,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3940,9 +4012,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 118,
@@ -3951,7 +4025,9 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3986,7 +4062,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4045,7 +4121,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4054,9 +4130,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 122,
@@ -4064,7 +4142,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4086,7 +4164,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => 'fr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4095,9 +4173,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 124,
@@ -4123,7 +4203,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4182,7 +4262,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4191,9 +4271,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 127,
@@ -4202,7 +4284,9 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -4237,7 +4321,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                   'text' => ' a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4296,7 +4380,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4305,9 +4389,11 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 131,
@@ -4315,7 +4401,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo.pl
index ec186e9d51..c3840b052f 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo.pl
@@ -12,7 +12,7 @@ $result_trees{'mathjax_with_texinfo'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -114,7 +114,7 @@ $result_trees{'mathjax_with_texinfo'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -123,9 +123,11 @@ $result_trees{'mathjax_with_texinfo'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
index ca107318b9..bc9bbe2f2d 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
@@ -16,7 +16,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -118,7 +118,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -127,9 +127,11 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
index fd8dc08970..abf2b22fd3 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
@@ -12,7 +12,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -114,7 +114,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -123,9 +123,11 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git 
a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
index 0793b4456e..428ce52bde 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
@@ -12,7 +12,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -114,7 +114,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -123,9 +123,11 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/html_tests/raw_html.pl 
b/tp/t/results/html_tests/raw_html.pl
index 06308258d9..59decf1ea6 100644
--- a/tp/t/results/html_tests/raw_html.pl
+++ b/tp/t/results/html_tests/raw_html.pl
@@ -12,7 +12,7 @@ $result_trees{'raw_html'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -38,7 +38,7 @@ $result_trees{'raw_html'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -47,9 +47,11 @@ $result_trees{'raw_html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 9d55e1c8ca..db98c2436e 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -19,7 +19,7 @@ $result_trees{'redirection_same_labels'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'redirection_same_labels'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'redirection_same_labels'} = [
                 'text' => 'the top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'redirection_same_labels'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -246,7 +248,7 @@ $result_trees{'redirection_same_labels'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -255,9 +257,11 @@ $result_trees{'redirection_same_labels'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 10,
@@ -277,7 +281,8 @@ $result_trees{'redirection_same_labels'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -302,7 +307,7 @@ $result_trees{'redirection_same_labels'} = [
                 'text' => 'umlaut'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -322,7 +327,9 @@ $result_trees{'redirection_same_labels'} = [
               'normalized' => 'umlaut'
             }
           ],
-          'normalized' => 'umlaut',
+          'normalized' => 'umlaut'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -339,7 +346,7 @@ $result_trees{'redirection_same_labels'} = [
                 'text' => 'umlaut'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -356,7 +363,7 @@ $result_trees{'redirection_same_labels'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -516,7 +523,7 @@ $result_trees{'redirection_same_labels'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -525,9 +532,11 @@ $result_trees{'redirection_same_labels'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 18,
@@ -547,7 +556,8 @@ $result_trees{'redirection_same_labels'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -579,7 +589,7 @@ $result_trees{'redirection_same_labels'} = [
                 }
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -606,7 +616,9 @@ $result_trees{'redirection_same_labels'} = [
               'normalized' => '_00ef'
             }
           ],
-          'normalized' => '_00ef',
+          'normalized' => '_00ef'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -653,7 +665,7 @@ $result_trees{'redirection_same_labels'} = [
                 }
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -680,7 +692,9 @@ $result_trees{'redirection_same_labels'} = [
               'normalized' => '_0129'
             }
           ],
-          'normalized' => '_0129',
+          'normalized' => '_0129'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -705,7 +719,7 @@ $result_trees{'redirection_same_labels'} = [
                 'text' => 'circumflex'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -725,7 +739,9 @@ $result_trees{'redirection_same_labels'} = [
               'normalized' => 'circumflex'
             }
           ],
-          'normalized' => 'circumflex',
+          'normalized' => 'circumflex'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -742,7 +758,7 @@ $result_trees{'redirection_same_labels'} = [
                 'text' => 'circumflex'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -759,7 +775,7 @@ $result_trees{'redirection_same_labels'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -840,7 +856,7 @@ $result_trees{'redirection_same_labels'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -849,9 +865,11 @@ $result_trees{'redirection_same_labels'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 29,
@@ -871,7 +889,8 @@ $result_trees{'redirection_same_labels'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -903,7 +922,7 @@ $result_trees{'redirection_same_labels'} = [
                 }
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -923,7 +942,9 @@ $result_trees{'redirection_same_labels'} = [
               'normalized' => '_00ee'
             }
           ],
-          'normalized' => '_00ee',
+          'normalized' => '_00ee'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1031,6 +1052,7 @@ $result_sectioning{'redirection_same_labels'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -1048,11 +1070,13 @@ $result_sectioning{'redirection_same_labels'} = {
                               'extra' => {
                                 'normalized' => 'umlaut'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -1077,11 +1101,13 @@ $result_sectioning{'redirection_same_labels'} = {
                                     'extra' => {
                                       'normalized' => 'circumflex'
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {}
                                     }
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_level' => 1,
@@ -1136,6 +1162,7 @@ $result_sectioning{'redirection_same_labels'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_childs' => [
@@ -1201,6 +1228,7 @@ $result_nodes{'redirection_same_labels'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -1213,6 +1241,7 @@ $result_nodes{'redirection_same_labels'} = {
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -1228,6 +1257,7 @@ $result_nodes{'redirection_same_labels'} = {
                         'unit_command' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 2
@@ -1283,6 +1313,7 @@ $result_nodes{'redirection_same_labels'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -1296,6 +1327,7 @@ $result_nodes{'redirection_same_labels'} = {
         ],
         'normalized' => 'umlaut'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_child' => {
@@ -1303,6 +1335,7 @@ $result_nodes{'redirection_same_labels'} = {
           'extra' => {
             'normalized' => '_00ef'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'node_next' => {
@@ -1310,6 +1343,7 @@ $result_nodes{'redirection_same_labels'} = {
               'extra' => {
                 'normalized' => '_0129'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'node_prev' => {},
@@ -1330,6 +1364,7 @@ $result_nodes{'redirection_same_labels'} = {
             ],
             'normalized' => 'circumflex'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_child' => {
@@ -1337,6 +1372,7 @@ $result_nodes{'redirection_same_labels'} = {
               'extra' => {
                 'normalized' => '_00ee'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'node_up' => {}
@@ -1407,12 +1443,14 @@ $result_menus{'redirection_same_labels'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -1425,6 +1463,7 @@ $result_menus{'redirection_same_labels'} = {
               'unit_command' => {
                 'cmdname' => 'chapter',
                 'extra' => {},
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -1440,6 +1479,7 @@ $result_menus{'redirection_same_labels'} = {
                     'unit_command' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_number' => 2
@@ -1491,6 +1531,7 @@ $result_menus{'redirection_same_labels'} = {
       'extra' => {
         'normalized' => 'umlaut'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_child' => {
@@ -1498,6 +1539,7 @@ $result_menus{'redirection_same_labels'} = {
           'extra' => {
             'normalized' => '_00ef'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_next' => {
@@ -1505,6 +1547,7 @@ $result_menus{'redirection_same_labels'} = {
               'extra' => {
                 'normalized' => '_0129'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'menu_prev' => {},
@@ -1525,6 +1568,7 @@ $result_menus{'redirection_same_labels'} = {
           'extra' => {
             'normalized' => 'circumflex'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_child' => {
@@ -1532,6 +1576,7 @@ $result_menus{'redirection_same_labels'} = {
               'extra' => {
                 'normalized' => '_00ee'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'menu_up' => {},
@@ -1611,6 +1656,7 @@ $result_elements{'redirection_same_labels'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -1623,6 +1669,7 @@ $result_elements{'redirection_same_labels'} = [
             'unit_command' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -1638,6 +1685,7 @@ $result_elements{'redirection_same_labels'} = [
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 2
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index aa8203f8e6..755a6a803e 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -18,7 +18,7 @@ $result_trees{'ref_in_preformatted'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'ref_in_preformatted'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +101,7 @@ $result_trees{'ref_in_preformatted'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -110,9 +110,11 @@ $result_trees{'ref_in_preformatted'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -134,7 +136,7 @@ $result_trees{'ref_in_preformatted'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -173,7 +175,7 @@ $result_trees{'ref_in_preformatted'} = {
                               'text' => 'nnn the node name'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -193,7 +195,9 @@ $result_trees{'ref_in_preformatted'} = {
                             'normalized' => 'nnn-the-node-name'
                           }
                         ],
-                        'normalized' => 'nnn-the-node-name',
+                        'normalized' => 'nnn-the-node-name'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -231,7 +235,7 @@ $result_trees{'ref_in_preformatted'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -240,9 +244,11 @@ $result_trees{'ref_in_preformatted'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -274,7 +280,9 @@ $result_trees{'ref_in_preformatted'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -330,12 +338,14 @@ $result_nodes{'ref_in_preformatted'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'nnn-the-node-name'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -353,12 +363,14 @@ $result_menus{'ref_in_preformatted'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'nnn-the-node-name'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index 0a86f65f82..57fd973a0c 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -18,7 +18,7 @@ $result_trees{'shortcontents_no_top'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -33,7 +33,7 @@ $result_trees{'shortcontents_no_top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +50,7 @@ $result_trees{'shortcontents_no_top'} = {
               'text' => 'chap2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -65,7 +65,7 @@ $result_trees{'shortcontents_no_top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -82,7 +82,7 @@ $result_trees{'shortcontents_no_top'} = {
               'text' => 'sec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -112,7 +112,7 @@ $result_trees{'shortcontents_no_top'} = {
           }
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -151,7 +151,7 @@ $result_sectioning{'shortcontents_no_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'chapter',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -160,12 +160,12 @@ $result_sectioning{'shortcontents_no_top'} = {
       },
       {
         'cmdname' => 'chapter',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'section',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => '2.1',
diff --git a/tp/t/results/html_tests/shorttitlepage.pl 
b/tp/t/results/html_tests/shorttitlepage.pl
index a422851de7..3e0b50c7f9 100644
--- a/tp/t/results/html_tests/shorttitlepage.pl
+++ b/tp/t/results/html_tests/shorttitlepage.pl
@@ -17,7 +17,7 @@ $result_trees{'shorttitlepage'} = {
                   'text' => 'html-shorttitlepage.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -26,9 +26,11 @@ $result_trees{'shorttitlepage'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'html-shorttitlepage.info'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -85,7 +87,7 @@ $result_trees{'shorttitlepage'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -93,7 +95,8 @@ $result_trees{'shorttitlepage'} = {
             }
           ],
           'cmdname' => 'shorttitlepage',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -118,7 +121,7 @@ $result_trees{'shorttitlepage'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -138,7 +141,9 @@ $result_trees{'shorttitlepage'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -200,7 +205,7 @@ $result_trees{'shorttitlepage'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -238,7 +243,8 @@ $result_trees{'shorttitlepage'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -284,9 +290,11 @@ $result_sectioning{'shorttitlepage'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -304,17 +312,20 @@ $result_nodes{'shorttitlepage'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'shorttitlepage'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'shorttitlepage'} = [];
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index 177d9c45ef..1b5c78a1ee 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -25,7 +25,7 @@ $result_trees{'simple_menu'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'simple_menu'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -57,7 +59,7 @@ $result_trees{'simple_menu'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -74,7 +76,7 @@ $result_trees{'simple_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -131,7 +133,7 @@ $result_trees{'simple_menu'} = {
                                   'type' => 'command_as_argument_inserted'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -174,7 +176,7 @@ $result_trees{'simple_menu'} = {
                                       'text' => 'itemize'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -183,9 +185,11 @@ $result_trees{'simple_menu'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'itemize'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 9,
@@ -207,7 +211,7 @@ $result_trees{'simple_menu'} = {
                             {
                               'args' => [
                                 {
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -233,7 +237,7 @@ $result_trees{'simple_menu'} = {
                                           'text' => 'html'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -242,9 +246,11 @@ $result_trees{'simple_menu'} = {
                                   ],
                                   'cmdname' => 'end',
                                   'extra' => {
-                                    'spaces_before_argument' => ' ',
                                     'text_arg' => 'html'
                                   },
+                                  'info' => {
+                                    'spaces_before_argument' => ' '
+                                  },
                                   'source_info' => {
                                     'file_name' => '',
                                     'line_nr' => 12,
@@ -310,7 +316,7 @@ $result_trees{'simple_menu'} = {
                       'type' => 'command_as_argument_inserted'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -353,7 +359,7 @@ $result_trees{'simple_menu'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -362,9 +368,11 @@ $result_trees{'simple_menu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 19,
@@ -391,7 +399,7 @@ $result_trees{'simple_menu'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -417,7 +425,7 @@ $result_trees{'simple_menu'} = {
                               'text' => 'html'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -426,9 +434,11 @@ $result_trees{'simple_menu'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'html'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 23,
@@ -468,7 +478,7 @@ $result_trees{'simple_menu'} = {
                       'type' => 'command_as_argument_inserted'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -511,7 +521,7 @@ $result_trees{'simple_menu'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -520,9 +530,11 @@ $result_trees{'simple_menu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 29,
@@ -733,7 +745,7 @@ $result_trees{'simple_menu'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -790,7 +802,7 @@ $result_trees{'simple_menu'} = {
                                       'type' => 'command_as_argument_inserted'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -833,7 +845,7 @@ $result_trees{'simple_menu'} = {
                                           'text' => 'itemize'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -842,9 +854,11 @@ $result_trees{'simple_menu'} = {
                                   ],
                                   'cmdname' => 'end',
                                   'extra' => {
-                                    'spaces_before_argument' => ' ',
                                     'text_arg' => 'itemize'
                                   },
+                                  'info' => {
+                                    'spaces_before_argument' => ' '
+                                  },
                                   'source_info' => {
                                     'file_name' => '',
                                     'line_nr' => 42,
@@ -866,7 +880,7 @@ $result_trees{'simple_menu'} = {
                                 {
                                   'args' => [
                                     {
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -892,7 +906,7 @@ $result_trees{'simple_menu'} = {
                                               'text' => 'html'
                                             }
                                           ],
-                                          'extra' => {
+                                          'info' => {
                                             'spaces_after_argument' => '
 '
                                           },
@@ -901,9 +915,11 @@ $result_trees{'simple_menu'} = {
                                       ],
                                       'cmdname' => 'end',
                                       'extra' => {
-                                        'spaces_before_argument' => ' ',
                                         'text_arg' => 'html'
                                       },
+                                      'info' => {
+                                        'spaces_before_argument' => ' '
+                                      },
                                       'source_info' => {
                                         'file_name' => '',
                                         'line_nr' => 45,
@@ -969,7 +985,7 @@ $result_trees{'simple_menu'} = {
                           'type' => 'command_as_argument_inserted'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1012,7 +1028,7 @@ $result_trees{'simple_menu'} = {
                               'text' => 'itemize'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1021,9 +1037,11 @@ $result_trees{'simple_menu'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'itemize'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 52,
@@ -1050,7 +1068,7 @@ $result_trees{'simple_menu'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1076,7 +1094,7 @@ $result_trees{'simple_menu'} = {
                                   'text' => 'html'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1085,9 +1103,11 @@ $result_trees{'simple_menu'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'html'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 56,
@@ -1127,7 +1147,7 @@ $result_trees{'simple_menu'} = {
                           'type' => 'command_as_argument_inserted'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1170,7 +1190,7 @@ $result_trees{'simple_menu'} = {
                               'text' => 'itemize'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1179,9 +1199,11 @@ $result_trees{'simple_menu'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'itemize'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 62,
@@ -1397,7 +1419,7 @@ $result_trees{'simple_menu'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1406,9 +1428,11 @@ $result_trees{'simple_menu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 71,
@@ -1430,7 +1454,7 @@ $result_trees{'simple_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1439,9 +1463,11 @@ $result_trees{'simple_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 72,
@@ -1627,6 +1653,7 @@ $result_sectioning{'simple_menu'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -1656,6 +1683,7 @@ $result_nodes{'simple_menu'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -1676,6 +1704,7 @@ $result_menus{'simple_menu'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/html_tests/simple_menu_in_example.pl 
b/tp/t/results/html_tests/simple_menu_in_example.pl
index 04bfa38662..58baf2fdef 100644
--- a/tp/t/results/html_tests/simple_menu_in_example.pl
+++ b/tp/t/results/html_tests/simple_menu_in_example.pl
@@ -18,7 +18,7 @@ $result_trees{'simple_menu_in_example'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'simple_menu_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -47,7 +47,7 @@ $result_trees{'simple_menu_in_example'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -94,7 +94,7 @@ $result_trees{'simple_menu_in_example'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -120,7 +120,7 @@ $result_trees{'simple_menu_in_example'} = {
                                       'text' => 'cartouche'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -129,9 +129,11 @@ $result_trees{'simple_menu_in_example'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'cartouche'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 8,
@@ -179,7 +181,7 @@ $result_trees{'simple_menu_in_example'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -205,7 +207,7 @@ $result_trees{'simple_menu_in_example'} = {
                                   'text' => 'cartouche'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -214,9 +216,11 @@ $result_trees{'simple_menu_in_example'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'cartouche'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 12,
@@ -392,7 +396,7 @@ $result_trees{'simple_menu_in_example'} = {
                           'text' => 'menu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -401,9 +405,11 @@ $result_trees{'simple_menu_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 16,
@@ -425,7 +431,7 @@ $result_trees{'simple_menu_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -434,9 +440,11 @@ $result_trees{'simple_menu_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -463,7 +471,9 @@ $result_trees{'simple_menu_in_example'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -521,14 +531,16 @@ $result_nodes{'simple_menu_in_example'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'simple_menu_in_example'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'simple_menu_in_example'} = [
diff --git a/tp/t/results/html_tests/split_html_text.pl 
b/tp/t/results/html_tests/split_html_text.pl
index 213778036d..129ab03216 100644
--- a/tp/t/results/html_tests/split_html_text.pl
+++ b/tp/t/results/html_tests/split_html_text.pl
@@ -19,7 +19,7 @@ $result_trees{'split_html_text'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'split_html_text'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'split_html_text'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -80,7 +82,8 @@ $result_trees{'split_html_text'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -105,7 +108,7 @@ $result_trees{'split_html_text'} = [
                 'text' => 'chap'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -125,7 +128,9 @@ $result_trees{'split_html_text'} = [
               'normalized' => 'chap'
             }
           ],
-          'normalized' => 'chap',
+          'normalized' => 'chap'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'split_html_text'} = [
                 'text' => 'Chap'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -150,7 +155,8 @@ $result_trees{'split_html_text'} = [
           }
         ],
         'cmdname' => 'chapter',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -201,6 +207,7 @@ $result_sectioning{'split_html_text'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -215,6 +222,7 @@ $result_sectioning{'split_html_text'} = {
                           'extra' => {
                             'normalized' => 'chap'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -246,6 +254,7 @@ $result_sectioning{'split_html_text'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_childs' => [
@@ -254,6 +263,7 @@ $result_sectioning{'split_html_text'} = {
               'extra' => {
                 'associated_node' => {}
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_level' => 1,
@@ -301,6 +311,7 @@ $result_nodes{'split_html_text'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -316,6 +327,7 @@ $result_nodes{'split_html_text'} = {
                       'associated_section' => {
                         'cmdname' => 'chapter',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'section_number' => 1
@@ -323,6 +335,7 @@ $result_nodes{'split_html_text'} = {
                       },
                       'normalized' => 'chap'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_prev' => {},
@@ -357,6 +370,7 @@ $result_nodes{'split_html_text'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'node_next' => {}
@@ -388,6 +402,7 @@ $result_menus{'split_html_text'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -402,6 +417,7 @@ $result_menus{'split_html_text'} = {
                 'extra' => {
                   'normalized' => 'chap'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {}
                 }
@@ -462,6 +478,7 @@ $result_elements{'split_html_text'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -476,6 +493,7 @@ $result_elements{'split_html_text'} = [
               'extra' => {
                 'normalized' => 'chap'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {}
               }
diff --git a/tp/t/results/html_tests/test_accents_sc_default.pl 
b/tp/t/results/html_tests/test_accents_sc_default.pl
index 096b62921b..02522f4d1c 100644
--- a/tp/t/results/html_tests/test_accents_sc_default.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default.pl
@@ -39,7 +39,7 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,9 @@ $result_trees{'test_accents_sc_default'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,8 @@ $result_trees{'test_accents_sc_default'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +111,7 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -128,7 +131,9 @@ $result_trees{'test_accents_sc_default'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -145,7 +150,7 @@ $result_trees{'test_accents_sc_default'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1119,7 +1124,8 @@ $result_trees{'test_accents_sc_default'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1196,9 +1202,11 @@ $result_sectioning{'test_accents_sc_default'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1209,9 +1217,11 @@ $result_sectioning{'test_accents_sc_default'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1240,10 +1250,12 @@ $result_nodes{'test_accents_sc_default'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1251,12 +1263,14 @@ $result_nodes{'test_accents_sc_default'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1272,6 +1286,7 @@ $result_menus{'test_accents_sc_default'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
index bf996b89f5..cf0c763755 100644
--- a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
@@ -34,7 +34,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'test_accents_sc_default_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'test_accents_sc_default_latin1'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1153,7 +1160,8 @@ $result_trees{'test_accents_sc_default_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1233,9 +1241,11 @@ $result_sectioning{'test_accents_sc_default_latin1'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1246,9 +1256,11 @@ $result_sectioning{'test_accents_sc_default_latin1'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1277,10 +1289,12 @@ $result_nodes{'test_accents_sc_default_latin1'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1288,12 +1302,14 @@ $result_nodes{'test_accents_sc_default_latin1'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1309,6 +1325,7 @@ $result_menus{'test_accents_sc_default_latin1'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
index 7876f9d43c..5973523a9e 100644
--- a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
@@ -34,7 +34,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
                       'text' => 'US-ASCII'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'extra' => {
                 'input_encoding_name' => 'us-ascii',
                 'input_perl_encoding' => 'ascii',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'US-ASCII'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'test_accents_sc_default_usascii'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'test_accents_sc_default_usascii'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1174,7 +1181,8 @@ $result_trees{'test_accents_sc_default_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1254,9 +1262,11 @@ $result_sectioning{'test_accents_sc_default_usascii'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1267,9 +1277,11 @@ $result_sectioning{'test_accents_sc_default_usascii'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1298,10 +1310,12 @@ $result_nodes{'test_accents_sc_default_usascii'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1309,12 +1323,14 @@ $result_nodes{'test_accents_sc_default_usascii'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1330,6 +1346,7 @@ $result_menus{'test_accents_sc_default_usascii'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
index 73abdbba34..5ee756c8f8 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
@@ -39,7 +39,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,9 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +111,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -128,7 +131,9 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -145,7 +150,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1119,7 +1124,8 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1196,9 +1202,11 @@ $result_sectioning{'test_accents_sc_enable_encoding'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1209,9 +1217,11 @@ $result_sectioning{'test_accents_sc_enable_encoding'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1240,10 +1250,12 @@ $result_nodes{'test_accents_sc_enable_encoding'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1251,12 +1263,14 @@ $result_nodes{'test_accents_sc_enable_encoding'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1272,6 +1286,7 @@ $result_menus{'test_accents_sc_enable_encoding'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
index c5de210311..a0f021b8cc 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
@@ -34,7 +34,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1153,7 +1160,8 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1233,9 +1241,11 @@ 
$result_sectioning{'test_accents_sc_enable_encoding_latin1'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1246,9 +1256,11 @@ 
$result_sectioning{'test_accents_sc_enable_encoding_latin1'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1277,10 +1289,12 @@ $result_nodes{'test_accents_sc_enable_encoding_latin1'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1288,12 +1302,14 @@ $result_nodes{'test_accents_sc_enable_encoding_latin1'} 
= {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1309,6 +1325,7 @@ $result_menus{'test_accents_sc_enable_encoding_latin1'} = 
{
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
index fbee60cb28..b6d0567a8f 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
@@ -34,7 +34,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1153,7 +1160,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1233,9 +1241,11 @@ 
$result_sectioning{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1246,9 +1256,11 @@ 
$result_sectioning{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1277,10 +1289,12 @@ 
$result_nodes{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1288,12 +1302,14 @@ 
$result_nodes{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1309,6 +1325,7 @@ 
$result_menus{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
index acc835b47b..5e09ce9e98 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
@@ -34,7 +34,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                       'text' => 'US-ASCII'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'extra' => {
                 'input_encoding_name' => 'us-ascii',
                 'input_perl_encoding' => 'ascii',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'US-ASCII'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1174,7 +1181,8 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1254,9 +1262,11 @@ 
$result_sectioning{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1267,9 +1277,11 @@ 
$result_sectioning{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1298,10 +1310,12 @@ 
$result_nodes{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1309,12 +1323,14 @@ 
$result_nodes{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1330,6 +1346,7 @@ 
$result_menus{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
index 47aa218473..11d506fa66 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
@@ -34,7 +34,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
                       'text' => 'US-ASCII'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'extra' => {
                 'input_encoding_name' => 'us-ascii',
                 'input_perl_encoding' => 'ascii',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'US-ASCII'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1174,7 +1181,8 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1254,9 +1262,11 @@ 
$result_sectioning{'test_accents_sc_enable_encoding_usascii'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1267,9 +1277,11 @@ 
$result_sectioning{'test_accents_sc_enable_encoding_usascii'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1298,10 +1310,12 @@ 
$result_nodes{'test_accents_sc_enable_encoding_usascii'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1309,12 +1323,14 @@ 
$result_nodes{'test_accents_sc_enable_encoding_usascii'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1330,6 +1346,7 @@ $result_menus{'test_accents_sc_enable_encoding_usascii'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
index 3503e06d29..3273377c26 100644
--- a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
@@ -34,7 +34,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1153,7 +1160,8 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1233,9 +1241,11 @@ $result_sectioning{'test_accents_sc_to_utf8_latin1'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1246,9 +1256,11 @@ $result_sectioning{'test_accents_sc_to_utf8_latin1'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1277,10 +1289,12 @@ $result_nodes{'test_accents_sc_to_utf8_latin1'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1288,12 +1302,14 @@ $result_nodes{'test_accents_sc_to_utf8_latin1'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1309,6 +1325,7 @@ $result_menus{'test_accents_sc_to_utf8_latin1'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl 
b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
index f42cc3466b..bcff38dbfb 100644
--- a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
@@ -39,7 +39,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,9 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +111,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -128,7 +131,9 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -145,7 +150,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1119,7 +1124,8 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1196,9 +1202,11 @@ $result_sectioning{'test_accents_sc_use_numeric_entity'} 
= {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1209,9 +1217,11 @@ $result_sectioning{'test_accents_sc_use_numeric_entity'} 
= {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1240,10 +1250,12 @@ $result_nodes{'test_accents_sc_use_numeric_entity'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1251,12 +1263,14 @@ $result_nodes{'test_accents_sc_use_numeric_entity'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1272,6 +1286,7 @@ $result_menus{'test_accents_sc_use_numeric_entity'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 375e773dcb..2d4f33f66b 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -18,7 +18,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -138,7 +140,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -147,9 +149,11 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -169,7 +173,8 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -186,7 +191,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -206,7 +211,9 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -223,7 +230,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -245,7 +252,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -256,7 +263,9 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -319,7 +328,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -330,7 +339,9 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -381,7 +392,8 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -450,9 +462,11 @@ $result_sectioning{'test_xrefautomaticsectiontitle'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -463,9 +477,11 @@ $result_sectioning{'test_xrefautomaticsectiontitle'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -494,6 +510,7 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -503,6 +520,7 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -510,12 +528,14 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -533,12 +553,14 @@ $result_menus{'test_xrefautomaticsectiontitle'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git 
a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
index b7f75352aa..71f3493644 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -22,7 +22,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,9 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -58,7 +60,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -78,7 +80,9 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -95,7 +99,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -112,7 +116,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -178,7 +182,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -187,9 +191,11 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -209,7 +215,8 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -226,7 +233,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -246,7 +253,9 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -263,7 +272,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -326,7 +335,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -337,7 +346,9 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -388,7 +399,8 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -459,9 +471,11 @@ 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -472,9 +486,11 @@ 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -503,6 +519,7 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} = 
{
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -512,6 +529,7 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} = 
{
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -519,12 +537,14 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} 
= {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -542,12 +562,14 @@ $result_menus{'test_xrefautomaticsectiontitle_off_first'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/html_tests/tex_expanded_in_copying.pl 
b/tp/t/results/html_tests/tex_expanded_in_copying.pl
index 6a92c321ae..7e319a3d44 100644
--- a/tp/t/results/html_tests/tex_expanded_in_copying.pl
+++ b/tp/t/results/html_tests/tex_expanded_in_copying.pl
@@ -12,7 +12,7 @@ $result_trees{'tex_expanded_in_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -24,7 +24,7 @@ $result_trees{'tex_expanded_in_copying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -50,7 +50,7 @@ $result_trees{'tex_expanded_in_copying'} = {
                           'text' => 'tex'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -59,9 +59,11 @@ $result_trees{'tex_expanded_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -83,7 +85,7 @@ $result_trees{'tex_expanded_in_copying'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -92,9 +94,11 @@ $result_trees{'tex_expanded_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
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 479818ab29..96bc4705d2 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
@@ -39,7 +39,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,9 @@ $result_trees{'text_before_top_and_contents_after_title'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -105,7 +107,8 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -122,7 +125,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
               'text' => 'the chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -157,7 +160,7 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -211,14 +214,16 @@ 
$result_sectioning{'text_before_top_and_contents_after_title'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -247,17 +252,20 @@ $result_nodes{'text_before_top_and_contents_after_title'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'text_before_top_and_contents_after_title'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'text_before_top_and_contents_after_title'} = [];
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 e4da736250..888e28b2df 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
@@ -39,7 +39,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,9 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -76,7 +78,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -105,7 +107,8 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -122,7 +125,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
               'text' => 'the chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -157,7 +160,7 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -211,14 +214,16 @@ 
$result_sectioning{'text_before_top_and_summarycontents_after_title'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -247,17 +252,20 @@ 
$result_nodes{'text_before_top_and_summarycontents_after_title'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'text_before_top_and_summarycontents_after_title'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'text_before_top_and_summarycontents_after_title'} = [];
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index 57b8bbb937..dfe1308ecd 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -17,7 +17,7 @@ $result_trees{'titles'} = {
                   'text' => 'html-title.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -26,9 +26,11 @@ $result_trees{'titles'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'html-title.info'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -85,7 +87,7 @@ $result_trees{'titles'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -93,7 +95,8 @@ $result_trees{'titles'} = {
             }
           ],
           'cmdname' => 'settitle',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -118,7 +121,7 @@ $result_trees{'titles'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -138,7 +141,9 @@ $result_trees{'titles'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -200,7 +205,7 @@ $result_trees{'titles'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -238,7 +243,8 @@ $result_trees{'titles'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -284,9 +290,11 @@ $result_sectioning{'titles'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -304,17 +312,20 @@ $result_nodes{'titles'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'titles'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'titles'} = [];
diff --git a/tp/t/results/html_tests/uref_accented_letter_ascii.pl 
b/tp/t/results/html_tests/uref_accented_letter_ascii.pl
index a7be45c5bd..bbb3a3a038 100644
--- a/tp/t/results/html_tests/uref_accented_letter_ascii.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_ascii.pl
@@ -17,7 +17,7 @@ $result_trees{'uref_accented_letter_ascii'} = {
                   'text' => 'US-ASCII'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'uref_accented_letter_ascii'} = {
           'extra' => {
             'input_encoding_name' => 'us-ascii',
             'input_perl_encoding' => 'ascii',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'US-ASCII'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/html_tests/uref_accented_letter_latin1.pl 
b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
index ca8e999705..2fa65ae2ae 100644
--- a/tp/t/results/html_tests/uref_accented_letter_latin1.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
@@ -17,7 +17,7 @@ $result_trees{'uref_accented_letter_latin1'} = {
                   'text' => 'ISO-8859-1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'uref_accented_letter_latin1'} = {
           'extra' => {
             'input_encoding_name' => 'iso-8859-1',
             'input_perl_encoding' => 'iso-8859-1',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ISO-8859-1'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/html_tests/utf8_default.pl 
b/tp/t/results/html_tests/utf8_default.pl
index 0c315d562f..35b1dcac64 100644
--- a/tp/t/results/html_tests/utf8_default.pl
+++ b/tp/t/results/html_tests/utf8_default.pl
@@ -17,7 +17,7 @@ $result_trees{'utf8_default'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'utf8_default'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/html_tests/utf8_enable_encoding.pl 
b/tp/t/results/html_tests/utf8_enable_encoding.pl
index 62c7a31e1b..75c6175f82 100644
--- a/tp/t/results/html_tests/utf8_enable_encoding.pl
+++ b/tp/t/results/html_tests/utf8_enable_encoding.pl
@@ -17,7 +17,7 @@ $result_trees{'utf8_enable_encoding'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'utf8_enable_encoding'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl 
b/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
index 5058220bab..3defdc632d 100644
--- a/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
+++ b/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
@@ -17,7 +17,7 @@ $result_trees{'utf8_enable_encoding_no_use_iso'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'utf8_enable_encoding_no_use_iso'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl 
b/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl
index 8a437f7c39..4493a21afe 100644
--- a/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/utf8_enable_encoding_use_numeric_entity.pl
@@ -17,7 +17,7 @@ $result_trees{'utf8_enable_encoding_use_numeric_entity'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'utf8_enable_encoding_use_numeric_entity'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/html_tests/utf8_use_numeric_entity.pl 
b/tp/t/results/html_tests/utf8_use_numeric_entity.pl
index 30bbc19669..8115d9b826 100644
--- a/tp/t/results/html_tests/utf8_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/utf8_use_numeric_entity.pl
@@ -17,7 +17,7 @@ $result_trees{'utf8_use_numeric_entity'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'utf8_use_numeric_entity'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl 
b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
index 98014aa30a..c865799b59 100644
--- a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
+++ b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                               'text' => '0.5 0.5'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -45,7 +45,9 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                         'misc_args' => [
                           '0.5',
                           '0.5'
-                        ],
+                        ]
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -140,7 +142,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                             {
                               'args' => [
                                 {
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -162,7 +164,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                                           'text' => 'verbatim'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -171,9 +173,11 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                                   ],
                                   'cmdname' => 'end',
                                   'extra' => {
-                                    'spaces_before_argument' => ' ',
                                     'text_arg' => 'verbatim'
                                   },
+                                  'info' => {
+                                    'spaces_before_argument' => ' '
+                                  },
                                   'source_info' => {
                                     'file_name' => '',
                                     'line_nr' => 8,
@@ -218,7 +222,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                                       'text' => 'inc_file.texi'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -228,9 +232,11 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                               'cmdname' => 'verbatiminclude',
                               'extra' => {
                                 'input_perl_encoding' => 'utf-8',
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'inc_file.texi'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 10,
@@ -264,7 +270,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                           'text' => 'multitable'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -273,9 +279,11 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'multitable'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 11,
@@ -285,7 +293,9 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
               ],
               'extra' => {
                 'columnfractions' => {},
-                'max_columns' => 2,
+                'max_columns' => 2
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -302,7 +312,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -311,9 +321,11 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
diff --git a/tp/t/results/html_tests/xml_protected_in_verb.pl 
b/tp/t/results/html_tests/xml_protected_in_verb.pl
index 2719a33d12..f7659f6e90 100644
--- a/tp/t/results/html_tests/xml_protected_in_verb.pl
+++ b/tp/t/results/html_tests/xml_protected_in_verb.pl
@@ -12,7 +12,7 @@ $result_trees{'xml_protected_in_verb'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -34,7 +34,7 @@ $result_trees{'xml_protected_in_verb'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'xml_protected_in_verb'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -108,7 +110,7 @@ $result_trees{'xml_protected_in_verb'} = {
                   'text' => 'file_with_xml_chars.texi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -118,9 +120,11 @@ $result_trees{'xml_protected_in_verb'} = {
           'cmdname' => 'verbatiminclude',
           'extra' => {
             'input_perl_encoding' => 'utf-8',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'file_with_xml_chars.texi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 7,
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 11de7b488e..f13277d877 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -39,7 +39,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'test_refs.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'test_refs.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'htmlxref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,9 @@ $result_trees{'htmlxref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +112,7 @@ $result_trees{'htmlxref'} = {
               'text' => 'Test refs'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -191,7 +195,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -200,9 +204,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 9,
@@ -229,7 +235,7 @@ $result_trees{'htmlxref'} = {
                   'text' => 'Testing distant nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -237,7 +243,7 @@ $result_trees{'htmlxref'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -286,7 +292,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'a  node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -304,7 +310,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -337,7 +343,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -367,7 +373,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -376,9 +382,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 17,
@@ -473,7 +481,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -503,7 +511,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -512,9 +520,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 23,
@@ -568,7 +578,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -586,7 +596,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -619,7 +629,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -649,7 +659,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -658,9 +668,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 29,
@@ -753,7 +765,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,7 +795,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -792,9 +804,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 35,
@@ -821,7 +835,7 @@ $result_trees{'htmlxref'} = {
                   'text' => 'Testing manual name'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -829,7 +843,7 @@ $result_trees{'htmlxref'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -892,7 +906,7 @@ $result_trees{'htmlxref'} = {
                       'text' => '../manual/doc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -925,7 +939,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -955,7 +969,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -964,9 +978,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 43,
@@ -993,7 +1009,7 @@ $result_trees{'htmlxref'} = {
                   'text' => 'Testing local nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1001,7 +1017,7 @@ $result_trees{'htmlxref'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1071,7 +1087,7 @@ $result_trees{'htmlxref'} = {
                           'text' => '/;<=>?[\\]^_`|~'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1082,7 +1098,7 @@ $result_trees{'htmlxref'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1093,7 +1109,7 @@ $result_trees{'htmlxref'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1106,7 +1122,7 @@ $result_trees{'htmlxref'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1132,7 +1148,7 @@ $result_trees{'htmlxref'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1141,9 +1157,11 @@ $result_trees{'htmlxref'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 88,
@@ -1193,7 +1211,9 @@ $result_trees{'htmlxref'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1225,7 +1245,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1251,7 +1271,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1260,9 +1280,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 50,
@@ -1353,7 +1375,7 @@ $result_trees{'htmlxref'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1366,7 +1388,7 @@ $result_trees{'htmlxref'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1392,7 +1414,7 @@ $result_trees{'htmlxref'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1401,9 +1423,11 @@ $result_trees{'htmlxref'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 93,
@@ -1453,7 +1477,9 @@ $result_trees{'htmlxref'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1488,7 +1514,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1514,7 +1540,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1523,9 +1549,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 55,
@@ -1579,7 +1607,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1611,7 +1639,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1637,7 +1665,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1646,9 +1674,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 60,
@@ -1702,7 +1732,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'local   node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'type' => 'brace_command_arg'
@@ -1737,7 +1767,7 @@ $result_trees{'htmlxref'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1749,7 +1779,7 @@ $result_trees{'htmlxref'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1775,7 +1805,7 @@ $result_trees{'htmlxref'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1784,9 +1814,11 @@ $result_trees{'htmlxref'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 98,
@@ -1831,7 +1863,9 @@ $result_trees{'htmlxref'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 'local-node',
+                    'normalized' => 'local-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'source_info' => {
@@ -1863,7 +1897,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1889,7 +1923,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1898,9 +1932,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 65,
@@ -1920,7 +1956,8 @@ $result_trees{'htmlxref'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1945,7 +1982,7 @@ $result_trees{'htmlxref'} = {
               'text' => '!_"#$%&\'()*+-.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1956,7 +1993,7 @@ $result_trees{'htmlxref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1967,7 +2004,7 @@ $result_trees{'htmlxref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -2006,7 +2043,9 @@ $result_trees{'htmlxref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'other-nodes',
+        'normalized' => 'other-nodes'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2023,7 +2062,7 @@ $result_trees{'htmlxref'} = {
               'text' => 'Chapter with nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2040,7 +2079,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2066,7 +2105,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2075,9 +2114,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 72,
@@ -2131,7 +2172,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2163,7 +2204,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2189,7 +2230,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2198,9 +2239,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 77,
@@ -2222,7 +2265,7 @@ $result_trees{'htmlxref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2386,7 +2429,7 @@ $result_trees{'htmlxref'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2395,9 +2438,11 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 83,
@@ -2417,7 +2462,8 @@ $result_trees{'htmlxref'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2672,9 +2718,11 @@ $result_sectioning{'htmlxref'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -2685,9 +2733,11 @@ $result_sectioning{'htmlxref'} = {
                   'extra' => {
                     'normalized' => 'other-nodes'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2716,6 +2766,7 @@ $result_nodes{'htmlxref'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -2725,6 +2776,7 @@ $result_nodes{'htmlxref'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2732,6 +2784,7 @@ $result_nodes{'htmlxref'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -2743,24 +2796,28 @@ $result_nodes{'htmlxref'} = {
         ],
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2798,30 +2855,35 @@ $result_menus{'htmlxref'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index d48d1ed43b..d238bfc3db 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'test_refs.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'test_refs.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,9 @@ $result_trees{'htmlxref_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +112,7 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => 'Test refs'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -191,7 +195,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -200,9 +204,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 9,
@@ -229,7 +235,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'text' => 'Testing distant nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -237,7 +243,7 @@ $result_trees{'htmlxref_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -286,7 +292,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'a  node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -304,7 +310,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -337,7 +343,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -367,7 +373,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -376,9 +382,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 17,
@@ -473,7 +481,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -503,7 +511,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -512,9 +520,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 23,
@@ -568,7 +578,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -586,7 +596,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -619,7 +629,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -649,7 +659,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -658,9 +668,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 29,
@@ -753,7 +765,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,7 +795,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -792,9 +804,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 35,
@@ -821,7 +835,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'text' => 'Testing manual name'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -829,7 +843,7 @@ $result_trees{'htmlxref_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -892,7 +906,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => '../manual/doc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -925,7 +939,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -955,7 +969,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -964,9 +978,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 43,
@@ -993,7 +1009,7 @@ $result_trees{'htmlxref_nodes'} = {
                   'text' => 'Testing local nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1001,7 +1017,7 @@ $result_trees{'htmlxref_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1071,7 +1087,7 @@ $result_trees{'htmlxref_nodes'} = {
                           'text' => '/;<=>?[\\]^_`|~'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1082,7 +1098,7 @@ $result_trees{'htmlxref_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1093,7 +1109,7 @@ $result_trees{'htmlxref_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1106,7 +1122,7 @@ $result_trees{'htmlxref_nodes'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1132,7 +1148,7 @@ $result_trees{'htmlxref_nodes'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1141,9 +1157,11 @@ $result_trees{'htmlxref_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 88,
@@ -1193,7 +1211,9 @@ $result_trees{'htmlxref_nodes'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1225,7 +1245,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1251,7 +1271,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1260,9 +1280,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 50,
@@ -1353,7 +1375,7 @@ $result_trees{'htmlxref_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1366,7 +1388,7 @@ $result_trees{'htmlxref_nodes'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1392,7 +1414,7 @@ $result_trees{'htmlxref_nodes'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1401,9 +1423,11 @@ $result_trees{'htmlxref_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 93,
@@ -1453,7 +1477,9 @@ $result_trees{'htmlxref_nodes'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1488,7 +1514,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1514,7 +1540,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1523,9 +1549,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 55,
@@ -1579,7 +1607,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1611,7 +1639,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1637,7 +1665,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1646,9 +1674,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 60,
@@ -1702,7 +1732,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'local   node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'type' => 'brace_command_arg'
@@ -1737,7 +1767,7 @@ $result_trees{'htmlxref_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1749,7 +1779,7 @@ $result_trees{'htmlxref_nodes'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1775,7 +1805,7 @@ $result_trees{'htmlxref_nodes'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1784,9 +1814,11 @@ $result_trees{'htmlxref_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 98,
@@ -1831,7 +1863,9 @@ $result_trees{'htmlxref_nodes'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 'local-node',
+                    'normalized' => 'local-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'source_info' => {
@@ -1863,7 +1897,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1889,7 +1923,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1898,9 +1932,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 65,
@@ -1920,7 +1956,8 @@ $result_trees{'htmlxref_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1945,7 +1982,7 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => '!_"#$%&\'()*+-.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1956,7 +1993,7 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1967,7 +2004,7 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -2006,7 +2043,9 @@ $result_trees{'htmlxref_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'other-nodes',
+        'normalized' => 'other-nodes'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2023,7 +2062,7 @@ $result_trees{'htmlxref_nodes'} = {
               'text' => 'Chapter with nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2040,7 +2079,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2066,7 +2105,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2075,9 +2114,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 72,
@@ -2131,7 +2172,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2163,7 +2204,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2189,7 +2230,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2198,9 +2239,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 77,
@@ -2222,7 +2265,7 @@ $result_trees{'htmlxref_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2386,7 +2429,7 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2395,9 +2438,11 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 83,
@@ -2417,7 +2462,8 @@ $result_trees{'htmlxref_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2672,9 +2718,11 @@ $result_sectioning{'htmlxref_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -2685,9 +2733,11 @@ $result_sectioning{'htmlxref_nodes'} = {
                   'extra' => {
                     'normalized' => 'other-nodes'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2716,6 +2766,7 @@ $result_nodes{'htmlxref_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -2725,6 +2776,7 @@ $result_nodes{'htmlxref_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2732,6 +2784,7 @@ $result_nodes{'htmlxref_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -2743,24 +2796,28 @@ $result_nodes{'htmlxref_nodes'} = {
         ],
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2798,30 +2855,35 @@ $result_menus{'htmlxref_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 0d52a45690..ca19ecac49 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -39,7 +39,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'test_refs.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'test_refs.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,9 @@ $result_trees{'htmlxref_only_mono'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +112,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => 'Test refs'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -191,7 +195,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -200,9 +204,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 9,
@@ -229,7 +235,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'text' => 'Testing distant nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -237,7 +243,7 @@ $result_trees{'htmlxref_only_mono'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -286,7 +292,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'a  node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -304,7 +310,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -337,7 +343,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -367,7 +373,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -376,9 +382,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 17,
@@ -473,7 +481,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -503,7 +511,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -512,9 +520,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 23,
@@ -568,7 +578,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -586,7 +596,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -619,7 +629,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -649,7 +659,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -658,9 +668,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 29,
@@ -753,7 +765,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,7 +795,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -792,9 +804,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 35,
@@ -821,7 +835,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'text' => 'Testing manual name'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -829,7 +843,7 @@ $result_trees{'htmlxref_only_mono'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -892,7 +906,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => '../manual/doc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -925,7 +939,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -955,7 +969,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -964,9 +978,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 43,
@@ -993,7 +1009,7 @@ $result_trees{'htmlxref_only_mono'} = {
                   'text' => 'Testing local nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1001,7 +1017,7 @@ $result_trees{'htmlxref_only_mono'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1071,7 +1087,7 @@ $result_trees{'htmlxref_only_mono'} = {
                           'text' => '/;<=>?[\\]^_`|~'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1082,7 +1098,7 @@ $result_trees{'htmlxref_only_mono'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1093,7 +1109,7 @@ $result_trees{'htmlxref_only_mono'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1106,7 +1122,7 @@ $result_trees{'htmlxref_only_mono'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1132,7 +1148,7 @@ $result_trees{'htmlxref_only_mono'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1141,9 +1157,11 @@ $result_trees{'htmlxref_only_mono'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 88,
@@ -1193,7 +1211,9 @@ $result_trees{'htmlxref_only_mono'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1225,7 +1245,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1251,7 +1271,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1260,9 +1280,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 50,
@@ -1353,7 +1375,7 @@ $result_trees{'htmlxref_only_mono'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1366,7 +1388,7 @@ $result_trees{'htmlxref_only_mono'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1392,7 +1414,7 @@ $result_trees{'htmlxref_only_mono'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1401,9 +1423,11 @@ $result_trees{'htmlxref_only_mono'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 93,
@@ -1453,7 +1477,9 @@ $result_trees{'htmlxref_only_mono'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1488,7 +1514,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1514,7 +1540,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1523,9 +1549,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 55,
@@ -1579,7 +1607,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1611,7 +1639,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1637,7 +1665,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1646,9 +1674,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 60,
@@ -1702,7 +1732,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'local   node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'type' => 'brace_command_arg'
@@ -1737,7 +1767,7 @@ $result_trees{'htmlxref_only_mono'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1749,7 +1779,7 @@ $result_trees{'htmlxref_only_mono'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1775,7 +1805,7 @@ $result_trees{'htmlxref_only_mono'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1784,9 +1814,11 @@ $result_trees{'htmlxref_only_mono'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 98,
@@ -1831,7 +1863,9 @@ $result_trees{'htmlxref_only_mono'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 'local-node',
+                    'normalized' => 'local-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'source_info' => {
@@ -1863,7 +1897,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1889,7 +1923,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1898,9 +1932,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 65,
@@ -1920,7 +1956,8 @@ $result_trees{'htmlxref_only_mono'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1945,7 +1982,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => '!_"#$%&\'()*+-.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1956,7 +1993,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1967,7 +2004,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -2006,7 +2043,9 @@ $result_trees{'htmlxref_only_mono'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'other-nodes',
+        'normalized' => 'other-nodes'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2023,7 +2062,7 @@ $result_trees{'htmlxref_only_mono'} = {
               'text' => 'Chapter with nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2040,7 +2079,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2066,7 +2105,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2075,9 +2114,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 72,
@@ -2131,7 +2172,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2163,7 +2204,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2189,7 +2230,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2198,9 +2239,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 77,
@@ -2222,7 +2265,7 @@ $result_trees{'htmlxref_only_mono'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2386,7 +2429,7 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2395,9 +2438,11 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 83,
@@ -2417,7 +2462,8 @@ $result_trees{'htmlxref_only_mono'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2672,9 +2718,11 @@ $result_sectioning{'htmlxref_only_mono'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -2685,9 +2733,11 @@ $result_sectioning{'htmlxref_only_mono'} = {
                   'extra' => {
                     'normalized' => 'other-nodes'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2716,6 +2766,7 @@ $result_nodes{'htmlxref_only_mono'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -2725,6 +2776,7 @@ $result_nodes{'htmlxref_only_mono'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2732,6 +2784,7 @@ $result_nodes{'htmlxref_only_mono'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -2743,24 +2796,28 @@ $result_nodes{'htmlxref_only_mono'} = {
         ],
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2798,30 +2855,35 @@ $result_menus{'htmlxref_only_mono'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index bd66b8033a..963642b8f3 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'test_refs.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'test_refs.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,9 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +112,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => 'Test refs'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -191,7 +195,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -200,9 +204,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 9,
@@ -229,7 +235,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'text' => 'Testing distant nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -237,7 +243,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -286,7 +292,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'a  node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -304,7 +310,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -337,7 +343,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -367,7 +373,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -376,9 +382,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 17,
@@ -473,7 +481,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -503,7 +511,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -512,9 +520,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 23,
@@ -568,7 +578,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -586,7 +596,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -619,7 +629,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -649,7 +659,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -658,9 +668,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 29,
@@ -753,7 +765,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,7 +795,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -792,9 +804,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 35,
@@ -821,7 +835,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'text' => 'Testing manual name'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -829,7 +843,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -892,7 +906,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => '../manual/doc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -925,7 +939,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -955,7 +969,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -964,9 +978,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 43,
@@ -993,7 +1009,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'text' => 'Testing local nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1001,7 +1017,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1071,7 +1087,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           'text' => '/;<=>?[\\]^_`|~'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1082,7 +1098,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1093,7 +1109,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1106,7 +1122,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1132,7 +1148,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1141,9 +1157,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 88,
@@ -1193,7 +1211,9 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1225,7 +1245,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1251,7 +1271,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1260,9 +1280,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 50,
@@ -1353,7 +1375,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1366,7 +1388,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1392,7 +1414,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1401,9 +1423,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 93,
@@ -1453,7 +1477,9 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1488,7 +1514,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1514,7 +1540,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1523,9 +1549,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 55,
@@ -1579,7 +1607,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1611,7 +1639,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1637,7 +1665,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1646,9 +1674,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 60,
@@ -1702,7 +1732,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'local   node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'type' => 'brace_command_arg'
@@ -1737,7 +1767,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1749,7 +1779,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1775,7 +1805,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1784,9 +1814,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 98,
@@ -1831,7 +1863,9 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 'local-node',
+                    'normalized' => 'local-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'source_info' => {
@@ -1863,7 +1897,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1889,7 +1923,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1898,9 +1932,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 65,
@@ -1920,7 +1956,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1945,7 +1982,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => '!_"#$%&\'()*+-.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1956,7 +1993,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1967,7 +2004,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -2006,7 +2043,9 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'other-nodes',
+        'normalized' => 'other-nodes'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2023,7 +2062,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               'text' => 'Chapter with nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2040,7 +2079,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2066,7 +2105,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2075,9 +2114,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 72,
@@ -2131,7 +2172,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2163,7 +2204,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2189,7 +2230,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2198,9 +2239,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 77,
@@ -2222,7 +2265,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2386,7 +2429,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2395,9 +2438,11 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 83,
@@ -2417,7 +2462,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2672,9 +2718,11 @@ $result_sectioning{'htmlxref_only_mono_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -2685,9 +2733,11 @@ $result_sectioning{'htmlxref_only_mono_nodes'} = {
                   'extra' => {
                     'normalized' => 'other-nodes'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2716,6 +2766,7 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -2725,6 +2776,7 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2732,6 +2784,7 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -2743,24 +2796,28 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
         ],
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2798,30 +2855,35 @@ $result_menus{'htmlxref_only_mono_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 40d850613f..751d53f860 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -39,7 +39,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'test_refs.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'test_refs.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,9 @@ $result_trees{'htmlxref_only_split'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +112,7 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => 'Test refs'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -191,7 +195,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -200,9 +204,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 9,
@@ -229,7 +235,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'text' => 'Testing distant nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -237,7 +243,7 @@ $result_trees{'htmlxref_only_split'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -286,7 +292,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'a  node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -304,7 +310,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -337,7 +343,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -367,7 +373,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -376,9 +382,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 17,
@@ -473,7 +481,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -503,7 +511,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -512,9 +520,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 23,
@@ -568,7 +578,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -586,7 +596,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -619,7 +629,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -649,7 +659,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -658,9 +668,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 29,
@@ -753,7 +765,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,7 +795,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -792,9 +804,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 35,
@@ -821,7 +835,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'text' => 'Testing manual name'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -829,7 +843,7 @@ $result_trees{'htmlxref_only_split'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -892,7 +906,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => '../manual/doc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -925,7 +939,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -955,7 +969,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -964,9 +978,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 43,
@@ -993,7 +1009,7 @@ $result_trees{'htmlxref_only_split'} = {
                   'text' => 'Testing local nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1001,7 +1017,7 @@ $result_trees{'htmlxref_only_split'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1071,7 +1087,7 @@ $result_trees{'htmlxref_only_split'} = {
                           'text' => '/;<=>?[\\]^_`|~'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1082,7 +1098,7 @@ $result_trees{'htmlxref_only_split'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1093,7 +1109,7 @@ $result_trees{'htmlxref_only_split'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1106,7 +1122,7 @@ $result_trees{'htmlxref_only_split'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1132,7 +1148,7 @@ $result_trees{'htmlxref_only_split'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1141,9 +1157,11 @@ $result_trees{'htmlxref_only_split'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 88,
@@ -1193,7 +1211,9 @@ $result_trees{'htmlxref_only_split'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1225,7 +1245,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1251,7 +1271,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1260,9 +1280,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 50,
@@ -1353,7 +1375,7 @@ $result_trees{'htmlxref_only_split'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1366,7 +1388,7 @@ $result_trees{'htmlxref_only_split'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1392,7 +1414,7 @@ $result_trees{'htmlxref_only_split'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1401,9 +1423,11 @@ $result_trees{'htmlxref_only_split'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 93,
@@ -1453,7 +1477,9 @@ $result_trees{'htmlxref_only_split'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1488,7 +1514,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1514,7 +1540,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1523,9 +1549,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 55,
@@ -1579,7 +1607,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1611,7 +1639,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1637,7 +1665,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1646,9 +1674,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 60,
@@ -1702,7 +1732,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'local   node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'type' => 'brace_command_arg'
@@ -1737,7 +1767,7 @@ $result_trees{'htmlxref_only_split'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1749,7 +1779,7 @@ $result_trees{'htmlxref_only_split'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1775,7 +1805,7 @@ $result_trees{'htmlxref_only_split'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1784,9 +1814,11 @@ $result_trees{'htmlxref_only_split'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 98,
@@ -1831,7 +1863,9 @@ $result_trees{'htmlxref_only_split'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 'local-node',
+                    'normalized' => 'local-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'source_info' => {
@@ -1863,7 +1897,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1889,7 +1923,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1898,9 +1932,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 65,
@@ -1920,7 +1956,8 @@ $result_trees{'htmlxref_only_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1945,7 +1982,7 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => '!_"#$%&\'()*+-.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1956,7 +1993,7 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1967,7 +2004,7 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -2006,7 +2043,9 @@ $result_trees{'htmlxref_only_split'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'other-nodes',
+        'normalized' => 'other-nodes'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2023,7 +2062,7 @@ $result_trees{'htmlxref_only_split'} = {
               'text' => 'Chapter with nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2040,7 +2079,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2066,7 +2105,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2075,9 +2114,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 72,
@@ -2131,7 +2172,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2163,7 +2204,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2189,7 +2230,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2198,9 +2239,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 77,
@@ -2222,7 +2265,7 @@ $result_trees{'htmlxref_only_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2386,7 +2429,7 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2395,9 +2438,11 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 83,
@@ -2417,7 +2462,8 @@ $result_trees{'htmlxref_only_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2672,9 +2718,11 @@ $result_sectioning{'htmlxref_only_split'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -2685,9 +2733,11 @@ $result_sectioning{'htmlxref_only_split'} = {
                   'extra' => {
                     'normalized' => 'other-nodes'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2716,6 +2766,7 @@ $result_nodes{'htmlxref_only_split'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -2725,6 +2776,7 @@ $result_nodes{'htmlxref_only_split'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2732,6 +2784,7 @@ $result_nodes{'htmlxref_only_split'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -2743,24 +2796,28 @@ $result_nodes{'htmlxref_only_split'} = {
         ],
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2798,30 +2855,35 @@ $result_menus{'htmlxref_only_split'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index bdfd0a2b30..ae6be856f8 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'test_refs.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'test_refs.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,9 @@ $result_trees{'htmlxref_only_split_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +112,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => 'Test refs'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -191,7 +195,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -200,9 +204,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 9,
@@ -229,7 +235,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'text' => 'Testing distant nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -237,7 +243,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -286,7 +292,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'a  node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -304,7 +310,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -337,7 +343,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -367,7 +373,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -376,9 +382,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 17,
@@ -473,7 +481,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -503,7 +511,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -512,9 +520,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 23,
@@ -568,7 +578,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -586,7 +596,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -619,7 +629,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -649,7 +659,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -658,9 +668,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 29,
@@ -753,7 +765,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,7 +795,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -792,9 +804,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 35,
@@ -821,7 +835,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'text' => 'Testing manual name'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -829,7 +843,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -892,7 +906,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => '../manual/doc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -925,7 +939,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -955,7 +969,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -964,9 +978,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 43,
@@ -993,7 +1009,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'text' => 'Testing local nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1001,7 +1017,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1071,7 +1087,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           'text' => '/;<=>?[\\]^_`|~'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1082,7 +1098,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1093,7 +1109,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1106,7 +1122,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1132,7 +1148,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1141,9 +1157,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 88,
@@ -1193,7 +1211,9 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1225,7 +1245,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1251,7 +1271,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1260,9 +1280,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 50,
@@ -1353,7 +1375,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -1366,7 +1388,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1392,7 +1414,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1401,9 +1423,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 93,
@@ -1453,7 +1477,9 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1488,7 +1514,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1514,7 +1540,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1523,9 +1549,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 55,
@@ -1579,7 +1607,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1611,7 +1639,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1637,7 +1665,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1646,9 +1674,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 60,
@@ -1702,7 +1732,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'local   node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'type' => 'brace_command_arg'
@@ -1737,7 +1767,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1749,7 +1779,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1775,7 +1805,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1784,9 +1814,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => 'test_refs.texi',
                             'line_nr' => 98,
@@ -1831,7 +1863,9 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 'local-node',
+                    'normalized' => 'local-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'source_info' => {
@@ -1863,7 +1897,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1889,7 +1923,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1898,9 +1932,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 65,
@@ -1920,7 +1956,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1945,7 +1982,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => '!_"#$%&\'()*+-.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1956,7 +1993,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1967,7 +2004,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -2006,7 +2043,9 @@ $result_trees{'htmlxref_only_split_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'other-nodes',
+        'normalized' => 'other-nodes'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2023,7 +2062,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               'text' => 'Chapter with nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2040,7 +2079,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2066,7 +2105,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2075,9 +2114,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 72,
@@ -2131,7 +2172,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -2163,7 +2204,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2189,7 +2230,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2198,9 +2239,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 77,
@@ -2222,7 +2265,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2386,7 +2429,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2395,9 +2438,11 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 83,
@@ -2417,7 +2462,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2672,9 +2718,11 @@ $result_sectioning{'htmlxref_only_split_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -2685,9 +2733,11 @@ $result_sectioning{'htmlxref_only_split_nodes'} = {
                   'extra' => {
                     'normalized' => 'other-nodes'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2716,6 +2766,7 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -2725,6 +2776,7 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2732,6 +2784,7 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -2743,24 +2796,28 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
         ],
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2798,30 +2855,35 @@ $result_menus{'htmlxref_only_split_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/include/cpp_line_latin1.pl 
b/tp/t/results/include/cpp_line_latin1.pl
index 160d96a991..0d04df45e9 100644
--- a/tp/t/results/include/cpp_line_latin1.pl
+++ b/tp/t/results/include/cpp_line_latin1.pl
@@ -34,7 +34,7 @@ $result_trees{'cpp_line_latin1'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'cpp_line_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cpp_line_latin1.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'cpp_line_latin1'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'cpp_line_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -105,7 +109,7 @@ $result_trees{'cpp_line_latin1'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -211,7 +215,8 @@ $result_sectioning{'cpp_line_latin1'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
         'structure' => {
@@ -234,14 +239,16 @@ $result_nodes{'cpp_line_latin1'} = {
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'cpp_line_latin1'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'cpp_line_latin1'} = [
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index b81007b5d3..3470e0c97b 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -34,7 +34,7 @@ $result_trees{'cpp_lines'} = {
                       'text' => 'cpp_lines.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'cpp_lines'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cpp_lines.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'cpp_lines.texi',
                 'line_nr' => 2,
@@ -108,7 +110,7 @@ $result_trees{'cpp_lines'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -143,7 +145,7 @@ $result_trees{'cpp_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -170,7 +172,7 @@ $result_trees{'cpp_lines'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -179,9 +181,11 @@ $result_trees{'cpp_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'g_f',
                 'line_nr' => 51,
@@ -222,7 +226,7 @@ $result_trees{'cpp_lines'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -231,9 +235,11 @@ $result_trees{'cpp_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'g_f',
                 'line_nr' => 55,
@@ -361,7 +367,7 @@ $result_trees{'cpp_lines'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -370,9 +376,11 @@ $result_trees{'cpp_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'g_f',
                 'line_nr' => 66,
@@ -647,7 +655,7 @@ $result_trees{'cpp_lines'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
@@ -696,7 +704,7 @@ $result_trees{'cpp_lines'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
@@ -733,7 +741,7 @@ $result_trees{'cpp_lines'} = {
                       'text' => 'etext1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' 
 '
                   },
@@ -745,7 +753,7 @@ $result_trees{'cpp_lines'} = {
                       'text' => 'etext2'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 ',
                     'spaces_before_argument' => '
@@ -783,7 +791,7 @@ $result_trees{'cpp_lines'} = {
                       'text' => ' no line directive mail space'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '
 '
                   },
@@ -795,7 +803,7 @@ $result_trees{'cpp_lines'} = {
                       'text' => ' no line directive text space'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 ',
                     'spaces_before_argument' => '
@@ -833,7 +841,7 @@ $result_trees{'cpp_lines'} = {
                       'text' => ' mail space'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' 
 '
                   },
@@ -845,7 +853,7 @@ $result_trees{'cpp_lines'} = {
                       'text' => ' text space'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 ',
                     'spaces_before_argument' => '
@@ -885,7 +893,7 @@ $result_trees{'cpp_lines'} = {
                       'type' => 'empty_line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' 
 '
                   },
@@ -962,7 +970,7 @@ $result_trees{'cpp_lines'} = {
                   'text' => "l\x{e0}ng"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -971,9 +979,11 @@ $result_trees{'cpp_lines'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => "l\x{e0}ng"
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => 'accentêd',
             'line_nr' => 7,
@@ -998,7 +1008,9 @@ $result_trees{'cpp_lines'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1179,14 +1191,16 @@ $result_nodes{'cpp_lines'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'cpp_lines'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'cpp_lines'} = [
diff --git a/tp/t/results/include/include_at_end_line.pl 
b/tp/t/results/include/include_at_end_line.pl
index 18e64454ae..94d13b7f3b 100644
--- a/tp/t/results/include/include_at_end_line.pl
+++ b/tp/t/results/include/include_at_end_line.pl
@@ -26,9 +26,11 @@ $result_trees{'include_at_end_line'} = {
           ],
           'cmdname' => 'include',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'inc_file.texi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/include/include_setfilename_on_setfilename_line.pl 
b/tp/t/results/include/include_setfilename_on_setfilename_line.pl
index 796dce45ef..33ec2521aa 100644
--- a/tp/t/results/include/include_setfilename_on_setfilename_line.pl
+++ b/tp/t/results/include/include_setfilename_on_setfilename_line.pl
@@ -31,7 +31,7 @@ $result_trees{'include_setfilename_on_setfilename_line'} = {
                                   'text' => 'are you joking!'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -40,9 +40,11 @@ $result_trees{'include_setfilename_on_setfilename_line'} = {
                           ],
                           'cmdname' => 'include',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'are you joking!'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 1,
@@ -55,9 +57,11 @@ $result_trees{'include_setfilename_on_setfilename_line'} = {
                   ],
                   'cmdname' => 'setfilename',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'other file '
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 1,
@@ -70,9 +74,11 @@ $result_trees{'include_setfilename_on_setfilename_line'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'file '
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/include/include_with_setfilename.pl 
b/tp/t/results/include/include_with_setfilename.pl
index debaf831ba..866853d5a1 100644
--- a/tp/t/results/include/include_with_setfilename.pl
+++ b/tp/t/results/include/include_with_setfilename.pl
@@ -31,7 +31,7 @@ $result_trees{'include_with_setfilename'} = {
                   'text' => 'main_file.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -40,9 +40,11 @@ $result_trees{'include_with_setfilename'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'main_file.info'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl 
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 2db7be38d2..5476fbc2c1 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -79,7 +81,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                   'text' => 'texi_commands.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -88,9 +90,11 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'macro_i--n_pass@texi_commands.info'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 5,
@@ -124,7 +128,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -133,9 +137,11 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -169,7 +175,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                   'cmdname' => '@'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -178,9 +184,11 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ISO-8859-1@'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 11,
@@ -219,7 +227,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -228,9 +236,11 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -264,7 +274,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -284,7 +294,9 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -301,7 +313,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -337,7 +349,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -346,9 +358,11 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'macro_included.texi',
                 'line_nr' => 3,
@@ -408,7 +422,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
                   'text' => 'f--ile.texi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -418,9 +432,11 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           'cmdname' => 'verbatiminclude',
           'extra' => {
             'input_perl_encoding' => 'utf-8',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'inc_@f--ile.texi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 25,
@@ -428,7 +444,8 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -498,9 +515,11 @@ $result_sectioning{'macro_and_commands_in_early_commands'} 
= {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -518,17 +537,20 @@ $result_nodes{'macro_and_commands_in_early_commands'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'macro_and_commands_in_early_commands'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'macro_and_commands_in_early_commands'} = [
diff --git a/tp/t/results/include/macro_definition_in_include.pl 
b/tp/t/results/include/macro_definition_in_include.pl
index 7276d4a1f3..dd7e7bc095 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_definition_in_include'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_definition_in_include'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'macro_included.texi',
                 'line_nr' => 3,
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index 00bb6edfcc..72c5ab065b 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_in_early_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_in_early_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -86,7 +88,7 @@ $result_trees{'macro_in_early_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -95,9 +97,11 @@ $result_trees{'macro_in_early_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -128,7 +132,7 @@ $result_trees{'macro_in_early_commands'} = {
                   'text' => 'macro_in_passtexi_commands.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -137,9 +141,11 @@ $result_trees{'macro_in_early_commands'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'macro_in_passtexi_commands.info'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 8,
@@ -173,7 +179,7 @@ $result_trees{'macro_in_early_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -182,9 +188,11 @@ $result_trees{'macro_in_early_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -229,7 +237,7 @@ $result_trees{'macro_in_early_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -238,9 +246,11 @@ $result_trees{'macro_in_early_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -271,7 +281,7 @@ $result_trees{'macro_in_early_commands'} = {
                   'text' => 'ISO-8859-1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -282,9 +292,11 @@ $result_trees{'macro_in_early_commands'} = {
           'extra' => {
             'input_encoding_name' => 'iso-8859-1',
             'input_perl_encoding' => 'iso-8859-1',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ISO-8859-1'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 18,
@@ -323,7 +335,7 @@ $result_trees{'macro_in_early_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -332,9 +344,11 @@ $result_trees{'macro_in_early_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -368,7 +382,7 @@ $result_trees{'macro_in_early_commands'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -388,7 +402,9 @@ $result_trees{'macro_in_early_commands'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -405,7 +421,7 @@ $result_trees{'macro_in_early_commands'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -441,7 +457,7 @@ $result_trees{'macro_in_early_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -450,9 +466,11 @@ $result_trees{'macro_in_early_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'macro_included.texi',
                 'line_nr' => 3,
@@ -524,7 +542,8 @@ $result_trees{'macro_in_early_commands'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -605,9 +624,11 @@ $result_sectioning{'macro_in_early_commands'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -625,17 +646,20 @@ $result_nodes{'macro_in_early_commands'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'macro_in_early_commands'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'macro_in_early_commands'} = [];
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index 855efd88b9..7367a3bba8 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -135,7 +135,7 @@ $result_trees{'value_expansion_in_include'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -200,7 +200,7 @@ $result_trees{'value_expansion_in_include'} = {
                   'text' => 'incl-incl.txi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -210,9 +210,11 @@ $result_trees{'value_expansion_in_include'} = {
           'cmdname' => 'verbatiminclude',
           'extra' => {
             'input_perl_encoding' => 'utf-8',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'incl-incl.txi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 14,
@@ -280,7 +282,7 @@ $result_trees{'value_expansion_in_include'} = {
                   'text' => 'incl-incl.txi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -290,9 +292,11 @@ $result_trees{'value_expansion_in_include'} = {
           'cmdname' => 'verbatiminclude',
           'extra' => {
             'input_perl_encoding' => 'utf-8',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'incl-incl.txi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 19,
@@ -360,7 +364,7 @@ $result_trees{'value_expansion_in_include'} = {
                   'text' => 'incl-incl.txi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -370,9 +374,11 @@ $result_trees{'value_expansion_in_include'} = {
           'cmdname' => 'verbatiminclude',
           'extra' => {
             'input_perl_encoding' => 'utf-8',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'incl-incl.txi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 24,
@@ -392,7 +398,9 @@ $result_trees{'value_expansion_in_include'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -455,14 +463,16 @@ $result_nodes{'value_expansion_in_include'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'value_expansion_in_include'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'value_expansion_in_include'} = [
diff --git a/tp/t/results/include/verbatiminclude_and_encoding.pl 
b/tp/t/results/include/verbatiminclude_and_encoding.pl
index 20216f1094..0c0a8d77fd 100644
--- a/tp/t/results/include/verbatiminclude_and_encoding.pl
+++ b/tp/t/results/include/verbatiminclude_and_encoding.pl
@@ -17,7 +17,7 @@ $result_trees{'verbatiminclude_and_encoding'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'verbatiminclude_and_encoding'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -50,7 +52,7 @@ $result_trees{'verbatiminclude_and_encoding'} = {
                   'text' => 'verbatim_encoded.texi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -60,9 +62,11 @@ $result_trees{'verbatiminclude_and_encoding'} = {
           'cmdname' => 'verbatiminclude',
           'extra' => {
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'verbatim_encoded.texi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
diff --git a/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl 
b/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl
index 707d6e1fba..8b6f988be8 100644
--- a/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl
+++ b/tp/t/results/include/verbatiminclude_and_encoding_latin1.pl
@@ -17,7 +17,7 @@ $result_trees{'verbatiminclude_and_encoding_latin1'} = {
                   'text' => 'iso-8859-1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'verbatiminclude_and_encoding_latin1'} = {
           'extra' => {
             'input_encoding_name' => 'iso-8859-1',
             'input_perl_encoding' => 'iso-8859-1',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'iso-8859-1'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -50,7 +52,7 @@ $result_trees{'verbatiminclude_and_encoding_latin1'} = {
                   'text' => 'verbatim_encoded_latin1.texi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -60,9 +62,11 @@ $result_trees{'verbatiminclude_and_encoding_latin1'} = {
           'cmdname' => 'verbatiminclude',
           'extra' => {
             'input_perl_encoding' => 'iso-8859-1',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'verbatim_encoded_latin1.texi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index fd210afe93..efb037264f 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -18,7 +18,7 @@ $result_trees{'complex_recursive_synindex'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -40,7 +40,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -51,7 +51,9 @@ $result_trees{'complex_recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'aaa'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -68,7 +70,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'bbb'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -79,7 +81,9 @@ $result_trees{'complex_recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'bbb'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -96,7 +100,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'ccc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -107,7 +111,9 @@ $result_trees{'complex_recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'ccc'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -124,7 +130,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'ddd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -135,7 +141,9 @@ $result_trees{'complex_recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'ddd'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -152,7 +160,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'eee'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -163,7 +171,9 @@ $result_trees{'complex_recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'eee'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -185,7 +195,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'aaa bbb'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -197,7 +207,9 @@ $result_trees{'complex_recursive_synindex'} = {
             'misc_args' => [
               'aaa',
               'bbb'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -214,7 +226,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'bbb aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -222,7 +234,7 @@ $result_trees{'complex_recursive_synindex'} = {
             }
           ],
           'cmdname' => 'synindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -244,7 +256,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'ccc aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -256,7 +268,9 @@ $result_trees{'complex_recursive_synindex'} = {
             'misc_args' => [
               'ccc',
               'aaa'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -273,7 +287,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'ddd bbb'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -285,7 +299,9 @@ $result_trees{'complex_recursive_synindex'} = {
             'misc_args' => [
               'ddd',
               'bbb'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -302,7 +318,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'e before synindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -322,7 +338,9 @@ $result_trees{'complex_recursive_synindex'} = {
               'index_ignore_chars' => {},
               'index_name' => 'eee',
               'index_type_command' => 'eeeindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -345,7 +363,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'eee ddd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -357,7 +375,9 @@ $result_trees{'complex_recursive_synindex'} = {
             'misc_args' => [
               'eee',
               'ddd'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -374,7 +394,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'bbb eee'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -382,7 +402,7 @@ $result_trees{'complex_recursive_synindex'} = {
             }
           ],
           'cmdname' => 'synindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -404,7 +424,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'c index'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -424,7 +444,9 @@ $result_trees{'complex_recursive_synindex'} = {
               'index_ignore_chars' => {},
               'index_name' => 'ccc',
               'index_type_command' => 'cccindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -442,7 +464,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'b entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -462,7 +484,9 @@ $result_trees{'complex_recursive_synindex'} = {
               'index_ignore_chars' => {},
               'index_name' => 'bbb',
               'index_type_command' => 'bbbindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -480,7 +504,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'a entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -500,7 +524,9 @@ $result_trees{'complex_recursive_synindex'} = {
               'index_ignore_chars' => {},
               'index_name' => 'aaa',
               'index_type_command' => 'aaaindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -518,7 +544,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'd index'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -538,7 +564,9 @@ $result_trees{'complex_recursive_synindex'} = {
               'index_ignore_chars' => {},
               'index_name' => 'ddd',
               'index_type_command' => 'dddindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -556,7 +584,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'e index'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -576,7 +604,9 @@ $result_trees{'complex_recursive_synindex'} = {
               'index_ignore_chars' => {},
               'index_name' => 'eee',
               'index_type_command' => 'eeeindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -608,7 +638,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'bbb'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -619,7 +649,9 @@ $result_trees{'complex_recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'bbb'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -650,7 +682,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -661,7 +693,9 @@ $result_trees{'complex_recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'aaa'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -692,7 +726,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'ccc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -703,7 +737,9 @@ $result_trees{'complex_recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'ccc'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -734,7 +770,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'ddd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -745,7 +781,9 @@ $result_trees{'complex_recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'ddd'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -776,7 +814,7 @@ $result_trees{'complex_recursive_synindex'} = {
                   'text' => 'eee'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -787,7 +825,9 @@ $result_trees{'complex_recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'eee'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -810,7 +850,9 @@ $result_trees{'complex_recursive_synindex'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -912,7 +954,8 @@ $result_nodes{'complex_recursive_synindex'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'complex_recursive_synindex'} = {
@@ -920,7 +963,8 @@ $result_menus{'complex_recursive_synindex'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'complex_recursive_synindex'} = [
diff --git a/tp/t/results/indices/def_existing_index.pl 
b/tp/t/results/indices/def_existing_index.pl
index bc96bba789..46ebb3cbc7 100644
--- a/tp/t/results/indices/def_existing_index.pl
+++ b/tp/t/results/indices/def_existing_index.pl
@@ -17,7 +17,7 @@ $result_trees{'def_existing_index'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -25,7 +25,7 @@ $result_trees{'def_existing_index'} = {
             }
           ],
           'cmdname' => 'defcodeindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index c8ab61dcf5..0309cf2a2d 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -19,7 +19,7 @@ $result_trees{'def_syn_indices'} = {
                       'text' => 'cp fn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -31,7 +31,9 @@ $result_trees{'def_syn_indices'} = {
                 'misc_args' => [
                   'cp',
                   'fn'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -59,7 +61,7 @@ $result_trees{'def_syn_indices'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -79,7 +81,9 @@ $result_trees{'def_syn_indices'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -96,7 +100,7 @@ $result_trees{'def_syn_indices'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -111,7 +115,8 @@ $result_trees{'def_syn_indices'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -128,7 +133,7 @@ $result_trees{'def_syn_indices'} = {
               'text' => 'Chapter index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -149,7 +154,9 @@ $result_trees{'def_syn_indices'} = {
             'normalized' => 'Chapter-index'
           }
         ],
-        'normalized' => 'Chapter-index',
+        'normalized' => 'Chapter-index'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -166,7 +173,7 @@ $result_trees{'def_syn_indices'} = {
               'text' => 'Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -194,7 +201,7 @@ $result_trees{'def_syn_indices'} = {
                       'text' => 'truc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,7 +212,9 @@ $result_trees{'def_syn_indices'} = {
               'extra' => {
                 'misc_args' => [
                   'truc'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -234,7 +243,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'index truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -254,7 +263,9 @@ $result_trees{'def_syn_indices'} = {
               'index_ignore_chars' => {},
               'index_name' => 'truc',
               'index_type_command' => 'trucindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -277,7 +288,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'codeidx'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -288,7 +299,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'codeidx'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -385,7 +398,7 @@ $result_trees{'def_syn_indices'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -405,7 +418,9 @@ $result_trees{'def_syn_indices'} = {
               'index_ignore_chars' => {},
               'index_name' => 'codeidx',
               'index_type_command' => 'codeidxindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -428,7 +443,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'cindex entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -448,7 +463,9 @@ $result_trees{'def_syn_indices'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -471,7 +488,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'ky pg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -483,7 +500,9 @@ $result_trees{'def_syn_indices'} = {
             'misc_args' => [
               'ky',
               'pg'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -505,7 +524,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'truc kindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -525,7 +544,9 @@ $result_trees{'def_syn_indices'} = {
               'index_ignore_chars' => {},
               'index_name' => 'ky',
               'index_type_command' => 'kindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -543,7 +564,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'pindex codeidx'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -563,7 +584,9 @@ $result_trees{'def_syn_indices'} = {
               'index_ignore_chars' => {},
               'index_name' => 'pg',
               'index_type_command' => 'pindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -586,7 +609,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'truc cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -598,7 +621,9 @@ $result_trees{'def_syn_indices'} = {
             'misc_args' => [
               'truc',
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -620,7 +645,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'abc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -631,7 +656,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'abc'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -648,7 +675,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'defg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -659,7 +686,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'defg'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -681,7 +710,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'abc defg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -693,7 +722,9 @@ $result_trees{'def_syn_indices'} = {
             'misc_args' => [
               'abc',
               'defg'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -710,7 +741,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'defg ky'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -722,7 +753,9 @@ $result_trees{'def_syn_indices'} = {
             'misc_args' => [
               'defg',
               'ky'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -744,7 +777,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'defg index entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -764,7 +797,9 @@ $result_trees{'def_syn_indices'} = {
               'index_ignore_chars' => {},
               'index_name' => 'defg',
               'index_type_command' => 'defgindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -787,7 +822,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'abc index entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -807,7 +842,9 @@ $result_trees{'def_syn_indices'} = {
               'index_ignore_chars' => {},
               'index_name' => 'abc',
               'index_type_command' => 'abcindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -839,7 +876,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'pg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -850,7 +887,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'pg'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -881,7 +920,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'ky'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -892,7 +931,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'ky'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -923,7 +964,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -934,7 +975,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'truc'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -965,7 +1008,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -976,7 +1019,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'truc'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1007,7 +1052,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1018,7 +1063,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1049,7 +1096,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1060,7 +1107,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1091,7 +1140,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'defg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1102,7 +1151,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'defg'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1133,7 +1184,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'abc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1144,7 +1195,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'abc'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1175,7 +1228,7 @@ $result_trees{'def_syn_indices'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1186,7 +1239,9 @@ $result_trees{'def_syn_indices'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1196,7 +1251,8 @@ $result_trees{'def_syn_indices'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1358,9 +1414,11 @@ $result_sectioning{'def_syn_indices'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1372,9 +1430,11 @@ $result_sectioning{'def_syn_indices'} = {
                     'isindex' => 1,
                     'normalized' => 'Chapter-index'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1403,10 +1463,12 @@ $result_nodes{'def_syn_indices'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1414,6 +1476,7 @@ $result_nodes{'def_syn_indices'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1421,6 +1484,7 @@ $result_nodes{'def_syn_indices'} = {
         'isindex' => 1,
         'normalized' => 'Chapter-index'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1436,6 +1500,7 @@ $result_menus{'def_syn_indices'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index e9cd751b47..25811e82c1 100644
--- a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
+++ b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
@@ -24,7 +24,7 @@ $result_trees{'default_cp_index_and_one_letter_syncodeindex'} 
= {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -46,7 +46,7 @@ $result_trees{'default_cp_index_and_one_letter_syncodeindex'} 
= {
                   'text' => 'cp fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -58,7 +58,9 @@ $result_trees{'default_cp_index_and_one_letter_syncodeindex'} 
= {
             'misc_args' => [
               'cp',
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -80,7 +82,7 @@ $result_trees{'default_cp_index_and_one_letter_syncodeindex'} 
= {
                   'text' => '--cindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -100,7 +102,9 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -118,7 +122,7 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
                   'text' => '--cpindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -138,7 +142,9 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cpindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -161,7 +167,7 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -172,7 +178,9 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -195,7 +203,9 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -239,7 +249,8 @@ 
$result_nodes{'default_cp_index_and_one_letter_syncodeindex'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'default_cp_index_and_one_letter_syncodeindex'} = {
@@ -247,7 +258,8 @@ 
$result_menus{'default_cp_index_and_one_letter_syncodeindex'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'default_cp_index_and_one_letter_syncodeindex'} = [];
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index b8fa3d2d2c..0bc512dea8 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -24,7 +24,7 @@ $result_trees{'double_index_entry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -46,7 +46,7 @@ $result_trees{'double_index_entry'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -66,7 +66,9 @@ $result_trees{'double_index_entry'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -103,7 +105,7 @@ $result_trees{'double_index_entry'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -123,7 +125,9 @@ $result_trees{'double_index_entry'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -141,7 +145,7 @@ $result_trees{'double_index_entry'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -207,7 +211,7 @@ $result_trees{'double_index_entry'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -216,9 +220,11 @@ $result_trees{'double_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -250,7 +256,9 @@ $result_trees{'double_index_entry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +289,7 @@ $result_trees{'double_index_entry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -303,7 +311,7 @@ $result_trees{'double_index_entry'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -323,7 +331,9 @@ $result_trees{'double_index_entry'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -346,7 +356,7 @@ $result_trees{'double_index_entry'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -357,7 +367,9 @@ $result_trees{'double_index_entry'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -388,7 +400,9 @@ $result_trees{'double_index_entry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'other-node',
+        'normalized' => 'other-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -461,6 +475,7 @@ $result_nodes{'double_index_entry'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -468,6 +483,7 @@ $result_nodes{'double_index_entry'} = {
         'isindex' => 1,
         'normalized' => 'other-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -485,6 +501,7 @@ $result_menus{'double_index_entry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -492,6 +509,7 @@ $result_menus{'double_index_entry'} = {
         'isindex' => 1,
         'normalized' => 'other-node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index d5de750523..9cfa65f8d2 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -24,7 +24,7 @@ $result_trees{'double_seeentry_seealso'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'double_seeentry_seealso'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'double_seeentry_seealso'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'double_seeentry_seealso'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'double_seeentry_seealso'} = {
               'text' => 'node index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -114,7 +117,9 @@ $result_trees{'double_seeentry_seealso'} = {
             'normalized' => 'node-index'
           }
         ],
-        'normalized' => 'node-index',
+        'normalized' => 'node-index'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -131,7 +136,7 @@ $result_trees{'double_seeentry_seealso'} = {
               'text' => 'Chapter Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -197,7 +202,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -218,7 +223,9 @@ $result_trees{'double_seeentry_seealso'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -280,7 +287,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -301,7 +308,9 @@ $result_trees{'double_seeentry_seealso'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seealso' => {},
+            'seealso' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -363,7 +372,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -385,7 +394,9 @@ $result_trees{'double_seeentry_seealso'} = {
               'index_type_command' => 'cindex'
             },
             'seealso' => {},
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -418,7 +429,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -439,7 +450,6 @@ $result_trees{'double_seeentry_seealso'} = {
               'index_type_command' => 'cindex'
             },
             'seealso' => {},
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -470,7 +480,7 @@ $result_trees{'double_seeentry_seealso'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -480,7 +490,9 @@ $result_trees{'double_seeentry_seealso'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'seeentry' => {},
+                'seeentry' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -490,6 +502,9 @@ $result_trees{'double_seeentry_seealso'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 10,
@@ -511,7 +526,7 @@ $result_trees{'double_seeentry_seealso'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -522,7 +537,9 @@ $result_trees{'double_seeentry_seealso'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -532,7 +549,8 @@ $result_trees{'double_seeentry_seealso'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -607,9 +625,11 @@ $result_sectioning{'double_seeentry_seealso'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -621,9 +641,11 @@ $result_sectioning{'double_seeentry_seealso'} = {
                     'isindex' => 1,
                     'normalized' => 'node-index'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -652,10 +674,12 @@ $result_nodes{'double_seeentry_seealso'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -663,6 +687,7 @@ $result_nodes{'double_seeentry_seealso'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -670,6 +695,7 @@ $result_nodes{'double_seeentry_seealso'} = {
         'isindex' => 1,
         'normalized' => 'node-index'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -685,6 +711,7 @@ $result_menus{'double_seeentry_seealso'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index 178c9b9a9d..3161321e52 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -19,7 +19,7 @@ $result_trees{'double_syncodeindex'} = {
                       'text' => 'cp fn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -31,7 +31,9 @@ $result_trees{'double_syncodeindex'} = {
                 'misc_args' => [
                   'cp',
                   'fn'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -48,7 +50,7 @@ $result_trees{'double_syncodeindex'} = {
                       'text' => 'cp fn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -60,7 +62,9 @@ $result_trees{'double_syncodeindex'} = {
                 'misc_args' => [
                   'cp',
                   'fn'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -88,7 +92,7 @@ $result_trees{'double_syncodeindex'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -110,7 +114,7 @@ $result_trees{'double_syncodeindex'} = {
                   'text' => 'cindex entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -130,7 +134,9 @@ $result_trees{'double_syncodeindex'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -148,7 +154,7 @@ $result_trees{'double_syncodeindex'} = {
                   'text' => 'findex entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -168,7 +174,9 @@ $result_trees{'double_syncodeindex'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -191,7 +199,7 @@ $result_trees{'double_syncodeindex'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -202,7 +210,9 @@ $result_trees{'double_syncodeindex'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -219,7 +229,7 @@ $result_trees{'double_syncodeindex'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -230,7 +240,9 @@ $result_trees{'double_syncodeindex'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -253,7 +265,9 @@ $result_trees{'double_syncodeindex'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -299,7 +313,8 @@ $result_nodes{'double_syncodeindex'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'double_syncodeindex'} = {
@@ -307,7 +322,8 @@ $result_menus{'double_syncodeindex'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'double_syncodeindex'} = [
diff --git a/tp/t/results/indices/empty_cindex_entry.pl 
b/tp/t/results/indices/empty_cindex_entry.pl
index 309a506fb3..17ab1f4718 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_cindex_entry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'empty_cindex_entry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'empty_cindex_entry'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -73,7 +75,7 @@ $result_trees{'empty_cindex_entry'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -103,7 +105,9 @@ $result_trees{'empty_cindex_entry'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -133,12 +137,14 @@ $result_nodes{'empty_cindex_entry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -152,6 +158,7 @@ $result_menus{'empty_cindex_entry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 05780e40d2..1ededb70e5 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_index_entry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -51,7 +51,9 @@ $result_trees{'empty_index_entry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -68,7 +70,7 @@ $result_trees{'empty_index_entry'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -109,7 +111,9 @@ $result_trees{'empty_index_entry'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name',
+                        'def_role' => 'name'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -154,7 +158,7 @@ $result_trees{'empty_index_entry'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -163,9 +167,11 @@ $result_trees{'empty_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -173,7 +179,7 @@ $result_trees{'empty_index_entry'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -195,7 +201,7 @@ $result_trees{'empty_index_entry'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -206,7 +212,9 @@ $result_trees{'empty_index_entry'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -229,7 +237,9 @@ $result_trees{'empty_index_entry'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -270,6 +280,7 @@ $result_nodes{'empty_index_entry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -277,6 +288,7 @@ $result_nodes{'empty_index_entry'} = {
         'isindex' => 1,
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -290,6 +302,7 @@ $result_menus{'empty_index_entry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index f5d1f234fc..e51e2ae38f 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -24,7 +24,7 @@ $result_trees{'empty_string_index_entry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'empty_string_index_entry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'empty_string_index_entry'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,7 @@ $result_trees{'empty_string_index_entry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -113,7 +115,9 @@ $result_trees{'empty_string_index_entry'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -142,7 +146,7 @@ $result_trees{'empty_string_index_entry'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -173,7 +177,7 @@ $result_trees{'empty_string_index_entry'} = {
                               }
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -193,7 +197,9 @@ $result_trees{'empty_string_index_entry'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -216,7 +222,7 @@ $result_trees{'empty_string_index_entry'} = {
                       'text' => 'ftable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -225,9 +231,11 @@ $result_trees{'empty_string_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ftable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -236,7 +244,9 @@ $result_trees{'empty_string_index_entry'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -499,7 +509,9 @@ $result_trees{'empty_string_index_entry'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defun'
                 },
-                'original_def_cmdname' => 'defunx',
+                'original_def_cmdname' => 'defunx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -517,7 +529,7 @@ $result_trees{'empty_string_index_entry'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -526,9 +538,11 @@ $result_trees{'empty_string_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -536,7 +550,7 @@ $result_trees{'empty_string_index_entry'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -558,7 +572,7 @@ $result_trees{'empty_string_index_entry'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -569,7 +583,9 @@ $result_trees{'empty_string_index_entry'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -592,7 +608,9 @@ $result_trees{'empty_string_index_entry'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -661,6 +679,7 @@ $result_nodes{'empty_string_index_entry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -668,6 +687,7 @@ $result_nodes{'empty_string_index_entry'} = {
         'isindex' => 1,
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -681,6 +701,7 @@ $result_menus{'empty_string_index_entry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index fd950daf74..194739bd5a 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -34,7 +34,7 @@ $result_trees{'encoding_index_ascii'} = {
                       'text' => 'encoding_index_ascii.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'encoding_index_ascii'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'encoding_index_ascii.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -60,7 +62,7 @@ $result_trees{'encoding_index_ascii'} = {
                       'text' => 'us-ascii'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +73,11 @@ $result_trees{'encoding_index_ascii'} = {
               'extra' => {
                 'input_encoding_name' => 'us-ascii',
                 'input_perl_encoding' => 'ascii',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'us-ascii'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -99,7 +103,7 @@ $result_trees{'encoding_index_ascii'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +124,9 @@ $result_trees{'encoding_index_ascii'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +143,7 @@ $result_trees{'encoding_index_ascii'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -195,7 +201,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -215,7 +221,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -305,7 +313,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -325,7 +333,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -433,7 +443,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -453,7 +463,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -471,7 +483,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -491,7 +503,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -509,7 +523,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -529,7 +543,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -547,7 +563,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -567,7 +583,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -585,7 +603,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -605,7 +623,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -623,7 +643,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -643,7 +663,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -661,7 +683,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'f'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -681,7 +703,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -699,7 +723,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'g'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -719,7 +743,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -737,7 +763,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'h'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -757,7 +783,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -775,7 +803,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'i'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -795,7 +823,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -813,7 +843,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'j'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -833,7 +863,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -851,7 +883,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'k'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -871,7 +903,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -889,7 +923,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'l'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -909,7 +943,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -927,7 +963,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'm'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -947,7 +983,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -965,7 +1003,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'n'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -985,7 +1023,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1003,7 +1043,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'o'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1023,7 +1063,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1041,7 +1083,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'p'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1061,7 +1103,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1079,7 +1123,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'q'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1099,7 +1143,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1117,7 +1163,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'r'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1137,7 +1183,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1155,7 +1203,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 's'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1175,7 +1223,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1193,7 +1243,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 't'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1213,7 +1263,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1231,7 +1283,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'u'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1251,7 +1303,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1269,7 +1323,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'v'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1289,7 +1343,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1307,7 +1363,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'w'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1327,7 +1383,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1345,7 +1403,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'x'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1365,7 +1423,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1383,7 +1443,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'y'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1403,7 +1463,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1421,7 +1483,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'z'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1441,7 +1503,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1459,7 +1523,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'A'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1479,7 +1543,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1497,7 +1563,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'B'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1517,7 +1583,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1545,7 +1613,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1565,7 +1633,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1593,7 +1663,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1613,7 +1683,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1670,7 +1742,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1690,7 +1762,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1777,7 +1851,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1797,7 +1871,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1825,7 +1901,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1845,7 +1921,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1873,7 +1951,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1893,7 +1971,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1921,7 +2001,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1941,7 +2021,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1969,7 +2051,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1989,7 +2071,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2017,7 +2101,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2037,7 +2121,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2065,7 +2151,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2085,7 +2171,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2113,7 +2201,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2133,7 +2221,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2151,7 +2241,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => '0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2171,7 +2261,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2189,7 +2281,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => '9'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2209,7 +2301,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2237,7 +2331,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2257,7 +2351,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2285,7 +2381,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2305,7 +2401,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2333,7 +2431,7 @@ $result_trees{'encoding_index_ascii'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2353,7 +2451,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2371,7 +2471,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => '``'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2391,7 +2491,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2409,7 +2511,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => '`'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2429,7 +2531,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2447,7 +2551,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => '\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2467,7 +2571,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2485,7 +2591,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => '\'\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2505,7 +2611,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2523,7 +2631,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => '"'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2543,7 +2651,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2561,7 +2671,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'cmdname' => '@'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2581,7 +2691,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2599,7 +2711,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => '--'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2619,7 +2731,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2637,7 +2751,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => '---'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2657,7 +2771,9 @@ $result_trees{'encoding_index_ascii'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2680,7 +2796,7 @@ $result_trees{'encoding_index_ascii'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2691,7 +2807,9 @@ $result_trees{'encoding_index_ascii'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2701,7 +2819,8 @@ $result_trees{'encoding_index_ascii'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3021,9 +3140,11 @@ $result_sectioning{'encoding_index_ascii'} = {
             'extra' => {
               'isindex' => 1,
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -3041,11 +3162,13 @@ $result_nodes{'encoding_index_ascii'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'encoding_index_ascii'} = {
@@ -3053,7 +3176,8 @@ $result_menus{'encoding_index_ascii'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'encoding_index_ascii'} = [];
diff --git a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
index 0d4b9b6b74..60c2bf42a9 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -34,7 +34,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'text' => 'encoding_index_ascii_enable_encoding.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'encoding_index_ascii_enable_encoding.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -60,7 +62,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                       'text' => 'us-ascii'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +73,11 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'extra' => {
                 'input_encoding_name' => 'us-ascii',
                 'input_perl_encoding' => 'ascii',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'us-ascii'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -99,7 +103,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +124,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +143,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -195,7 +201,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -215,7 +221,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -305,7 +313,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -325,7 +333,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -433,7 +443,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -453,7 +463,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -471,7 +483,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -491,7 +503,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -509,7 +523,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -529,7 +543,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -547,7 +563,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -567,7 +583,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -585,7 +603,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -605,7 +623,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -623,7 +643,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -643,7 +663,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -661,7 +683,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'f'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -681,7 +703,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -699,7 +723,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'g'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -719,7 +743,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -737,7 +763,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'h'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -757,7 +783,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -775,7 +803,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'i'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -795,7 +823,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -813,7 +843,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'j'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -833,7 +863,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -851,7 +883,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'k'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -871,7 +903,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -889,7 +923,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'l'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -909,7 +943,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -927,7 +963,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'm'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -947,7 +983,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -965,7 +1003,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'n'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -985,7 +1023,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1003,7 +1043,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'o'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1023,7 +1063,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1041,7 +1083,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'p'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1061,7 +1103,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1079,7 +1123,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'q'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1099,7 +1143,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1117,7 +1163,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'r'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1137,7 +1183,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1155,7 +1203,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 's'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1175,7 +1223,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1193,7 +1243,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 't'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1213,7 +1263,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1231,7 +1283,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'u'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1251,7 +1303,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1269,7 +1323,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'v'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1289,7 +1343,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1307,7 +1363,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'w'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1327,7 +1383,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1345,7 +1403,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'x'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1365,7 +1423,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1383,7 +1443,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'y'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1403,7 +1463,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1421,7 +1483,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'z'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1441,7 +1503,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1459,7 +1523,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'A'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1479,7 +1543,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1497,7 +1563,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'B'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1517,7 +1583,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1545,7 +1613,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1565,7 +1633,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1593,7 +1663,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1613,7 +1683,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1670,7 +1742,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1690,7 +1762,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1777,7 +1851,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1797,7 +1871,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1825,7 +1901,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1845,7 +1921,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1873,7 +1951,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1893,7 +1971,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1921,7 +2001,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1941,7 +2021,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1969,7 +2051,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1989,7 +2071,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2017,7 +2101,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2037,7 +2121,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2065,7 +2151,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2085,7 +2171,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2113,7 +2201,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2133,7 +2221,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2151,7 +2241,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => '0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2171,7 +2261,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2189,7 +2281,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => '9'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2209,7 +2301,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2237,7 +2331,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2257,7 +2351,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2285,7 +2381,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2305,7 +2401,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2333,7 +2431,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2353,7 +2451,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2371,7 +2471,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => '``'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2391,7 +2491,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2409,7 +2511,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => '`'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2429,7 +2531,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2447,7 +2551,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => '\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2467,7 +2571,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2485,7 +2591,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => '\'\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2505,7 +2611,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2523,7 +2631,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => '"'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2543,7 +2651,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2561,7 +2671,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'cmdname' => '@'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2581,7 +2691,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2599,7 +2711,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => '--'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2619,7 +2731,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2637,7 +2751,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => '---'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2657,7 +2771,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2680,7 +2796,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2691,7 +2807,9 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2701,7 +2819,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3021,9 +3140,11 @@ 
$result_sectioning{'encoding_index_ascii_enable_encoding'} = {
             'extra' => {
               'isindex' => 1,
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -3041,11 +3162,13 @@ $result_nodes{'encoding_index_ascii_enable_encoding'} = 
{
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'encoding_index_ascii_enable_encoding'} = {
@@ -3053,7 +3176,8 @@ $result_menus{'encoding_index_ascii_enable_encoding'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'encoding_index_ascii_enable_encoding'} = [];
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index 7c4a514049..5e0619f71a 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -34,7 +34,7 @@ $result_trees{'encoding_index_latin1'} = {
                       'text' => 'encoding_index_latin1.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'encoding_index_latin1'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'encoding_index_latin1.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'encoding_index_latin1.texi',
                 'line_nr' => 2,
@@ -60,7 +62,7 @@ $result_trees{'encoding_index_latin1'} = {
                       'text' => 'iso-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +73,11 @@ $result_trees{'encoding_index_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'iso-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'encoding_index_latin1.texi',
                 'line_nr' => 3,
@@ -99,7 +103,7 @@ $result_trees{'encoding_index_latin1'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +124,9 @@ $result_trees{'encoding_index_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +143,7 @@ $result_trees{'encoding_index_latin1'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -159,7 +165,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => "\x{e9} \x{e9}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -179,7 +185,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -269,7 +277,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -289,7 +297,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -397,7 +407,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -417,7 +427,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -435,7 +447,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -455,7 +467,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -473,7 +487,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -493,7 +507,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -511,7 +527,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -531,7 +547,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -549,7 +567,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -569,7 +587,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -587,7 +607,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -607,7 +627,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -625,7 +647,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'f'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -645,7 +667,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -663,7 +687,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'g'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -683,7 +707,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -701,7 +727,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'h'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -721,7 +747,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -739,7 +767,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'i'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -759,7 +787,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -777,7 +807,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'j'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -797,7 +827,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -815,7 +847,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'k'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -835,7 +867,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -853,7 +887,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'l'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -873,7 +907,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -891,7 +927,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'm'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -911,7 +947,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -929,7 +967,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'n'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -949,7 +987,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -967,7 +1007,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'o'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -987,7 +1027,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1005,7 +1047,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'p'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1025,7 +1067,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1043,7 +1087,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'q'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1063,7 +1107,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1081,7 +1127,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'r'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1101,7 +1147,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1119,7 +1167,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 's'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1139,7 +1187,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1157,7 +1207,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 't'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1177,7 +1227,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1195,7 +1247,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'u'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1215,7 +1267,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1233,7 +1287,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'v'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1253,7 +1307,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1271,7 +1327,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'w'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1291,7 +1347,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1309,7 +1367,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'x'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1329,7 +1387,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1347,7 +1407,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'y'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1367,7 +1427,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1385,7 +1447,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'z'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1405,7 +1467,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1423,7 +1487,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'A'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1443,7 +1507,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1461,7 +1527,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'B'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1481,7 +1547,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1509,7 +1577,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1529,7 +1597,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1557,7 +1627,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1577,7 +1647,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1634,7 +1706,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1654,7 +1726,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1741,7 +1815,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1761,7 +1835,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1789,7 +1865,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1809,7 +1885,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1837,7 +1915,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1857,7 +1935,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1885,7 +1965,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1905,7 +1985,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1933,7 +2015,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1953,7 +2035,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1981,7 +2065,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2001,7 +2085,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2029,7 +2115,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2049,7 +2135,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2077,7 +2165,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2097,7 +2185,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2115,7 +2205,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => '0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2135,7 +2225,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2153,7 +2245,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => '9'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2173,7 +2265,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2201,7 +2295,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2221,7 +2315,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2249,7 +2345,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2269,7 +2365,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2297,7 +2395,7 @@ $result_trees{'encoding_index_latin1'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2317,7 +2415,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2335,7 +2435,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => '``'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2355,7 +2455,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2373,7 +2475,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => '`'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2393,7 +2495,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2411,7 +2515,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => '\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2431,7 +2535,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2449,7 +2555,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => '\'\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2469,7 +2575,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2487,7 +2595,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => '"'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2507,7 +2615,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2525,7 +2635,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'cmdname' => '@'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2545,7 +2655,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2563,7 +2675,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => '--'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2583,7 +2695,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2601,7 +2715,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => '---'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2621,7 +2735,9 @@ $result_trees{'encoding_index_latin1'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2644,7 +2760,7 @@ $result_trees{'encoding_index_latin1'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2655,7 +2771,9 @@ $result_trees{'encoding_index_latin1'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2665,7 +2783,8 @@ $result_trees{'encoding_index_latin1'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2996,9 +3115,11 @@ $result_sectioning{'encoding_index_latin1'} = {
             'extra' => {
               'isindex' => 1,
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -3016,11 +3137,13 @@ $result_nodes{'encoding_index_latin1'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'encoding_index_latin1'} = {
@@ -3028,7 +3151,8 @@ $result_menus{'encoding_index_latin1'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'encoding_index_latin1'} = [];
diff --git a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
index 37a3b6efb7..03c8a76ad6 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -34,7 +34,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'text' => 'encoding_index_latin1.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'encoding_index_latin1.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'encoding_index_latin1.texi',
                 'line_nr' => 2,
@@ -60,7 +62,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                       'text' => 'iso-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +73,11 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'iso-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'encoding_index_latin1.texi',
                 'line_nr' => 3,
@@ -99,7 +103,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +124,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +143,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -159,7 +165,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => "\x{e9} \x{e9}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -179,7 +185,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -269,7 +277,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -289,7 +297,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -397,7 +407,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -417,7 +427,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -435,7 +447,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -455,7 +467,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -473,7 +487,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -493,7 +507,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -511,7 +527,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -531,7 +547,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -549,7 +567,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -569,7 +587,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -587,7 +607,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -607,7 +627,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -625,7 +647,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'f'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -645,7 +667,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -663,7 +687,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'g'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -683,7 +707,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -701,7 +727,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'h'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -721,7 +747,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -739,7 +767,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'i'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -759,7 +787,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -777,7 +807,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'j'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -797,7 +827,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -815,7 +847,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'k'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -835,7 +867,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -853,7 +887,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'l'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -873,7 +907,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -891,7 +927,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'm'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -911,7 +947,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -929,7 +967,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'n'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -949,7 +987,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -967,7 +1007,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'o'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -987,7 +1027,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1005,7 +1047,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'p'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1025,7 +1067,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1043,7 +1087,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'q'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1063,7 +1107,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1081,7 +1127,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'r'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1101,7 +1147,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1119,7 +1167,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 's'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1139,7 +1187,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1157,7 +1207,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 't'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1177,7 +1227,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1195,7 +1247,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'u'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1215,7 +1267,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1233,7 +1287,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'v'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1253,7 +1307,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1271,7 +1327,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'w'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1291,7 +1347,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1309,7 +1367,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'x'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1329,7 +1387,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1347,7 +1407,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'y'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1367,7 +1427,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1385,7 +1447,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'z'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1405,7 +1467,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1423,7 +1487,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'A'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1443,7 +1507,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1461,7 +1527,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'B'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1481,7 +1547,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1509,7 +1577,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1529,7 +1597,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1557,7 +1627,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1577,7 +1647,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1634,7 +1706,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1654,7 +1726,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1741,7 +1815,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1761,7 +1835,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1789,7 +1865,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1809,7 +1885,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1837,7 +1915,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1857,7 +1935,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1885,7 +1965,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1905,7 +1985,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1933,7 +2015,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1953,7 +2035,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1981,7 +2065,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2001,7 +2085,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2029,7 +2115,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2049,7 +2135,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2077,7 +2165,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2097,7 +2185,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2115,7 +2205,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => '0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2135,7 +2225,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2153,7 +2245,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => '9'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2173,7 +2265,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2201,7 +2295,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2221,7 +2315,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2249,7 +2345,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2269,7 +2365,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2297,7 +2395,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2317,7 +2415,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2335,7 +2435,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => '``'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2355,7 +2455,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2373,7 +2475,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => '`'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2393,7 +2495,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2411,7 +2515,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => '\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2431,7 +2535,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2449,7 +2555,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => '\'\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2469,7 +2575,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2487,7 +2595,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => '"'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2507,7 +2615,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2525,7 +2635,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'cmdname' => '@'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2545,7 +2655,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2563,7 +2675,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => '--'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2583,7 +2695,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2601,7 +2715,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => '---'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2621,7 +2735,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2644,7 +2760,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2655,7 +2771,9 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2665,7 +2783,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2996,9 +3115,11 @@ 
$result_sectioning{'encoding_index_latin1_enable_encoding'} = {
             'extra' => {
               'isindex' => 1,
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -3016,11 +3137,13 @@ $result_nodes{'encoding_index_latin1_enable_encoding'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'encoding_index_latin1_enable_encoding'} = {
@@ -3028,7 +3151,8 @@ $result_menus{'encoding_index_latin1_enable_encoding'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'encoding_index_latin1_enable_encoding'} = [];
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index c70caddf18..f97c0a48b2 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -34,7 +34,7 @@ $result_trees{'encoding_index_utf8'} = {
                       'text' => 'encoding_index_utf8.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'encoding_index_utf8'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'encoding_index_utf8.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'encoding_index_utf8.texi',
                 'line_nr' => 2,
@@ -60,7 +62,7 @@ $result_trees{'encoding_index_utf8'} = {
                       'text' => 'utf-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +73,11 @@ $result_trees{'encoding_index_utf8'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'utf-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'encoding_index_utf8.texi',
                 'line_nr' => 3,
@@ -99,7 +103,7 @@ $result_trees{'encoding_index_utf8'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +124,9 @@ $result_trees{'encoding_index_utf8'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +143,7 @@ $result_trees{'encoding_index_utf8'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -159,7 +165,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => "\x{e9} \x{e9}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -179,7 +185,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -269,7 +277,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -289,7 +297,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -397,7 +407,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -417,7 +427,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -435,7 +447,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -455,7 +467,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -473,7 +487,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -493,7 +507,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -511,7 +527,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -531,7 +547,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -549,7 +567,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -569,7 +587,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -587,7 +607,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -607,7 +627,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -625,7 +647,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'f'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -645,7 +667,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -663,7 +687,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'g'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -683,7 +707,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -701,7 +727,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'h'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -721,7 +747,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -739,7 +767,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'i'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -759,7 +787,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -777,7 +807,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'j'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -797,7 +827,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -815,7 +847,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'k'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -835,7 +867,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -853,7 +887,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'l'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -873,7 +907,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -891,7 +927,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'm'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -911,7 +947,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -929,7 +967,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'n'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -949,7 +987,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -967,7 +1007,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'o'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -987,7 +1027,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1005,7 +1047,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'p'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1025,7 +1067,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1043,7 +1087,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'q'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1063,7 +1107,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1081,7 +1127,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'r'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1101,7 +1147,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1119,7 +1167,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 's'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1139,7 +1187,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1157,7 +1207,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 't'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1177,7 +1227,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1195,7 +1247,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'u'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1215,7 +1267,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1233,7 +1287,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'v'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1253,7 +1307,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1271,7 +1327,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'w'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1291,7 +1347,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1309,7 +1367,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'x'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1329,7 +1387,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1347,7 +1407,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'y'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1367,7 +1427,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1385,7 +1447,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'z'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1405,7 +1467,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1423,7 +1487,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'A'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1443,7 +1507,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1461,7 +1527,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'B'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1481,7 +1547,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1509,7 +1577,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1529,7 +1597,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1557,7 +1627,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1577,7 +1647,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1634,7 +1706,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1654,7 +1726,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1741,7 +1815,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1761,7 +1835,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1789,7 +1865,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1809,7 +1885,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1837,7 +1915,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1857,7 +1935,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1885,7 +1965,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1905,7 +1985,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1933,7 +2015,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1953,7 +2035,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1981,7 +2065,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2001,7 +2085,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2029,7 +2115,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2049,7 +2135,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2077,7 +2165,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2097,7 +2185,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2115,7 +2205,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => '0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2135,7 +2225,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2153,7 +2245,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => '9'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2173,7 +2265,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2201,7 +2295,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2221,7 +2315,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2249,7 +2345,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2269,7 +2365,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2297,7 +2395,7 @@ $result_trees{'encoding_index_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2317,7 +2415,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2335,7 +2435,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => '``'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2355,7 +2455,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2373,7 +2475,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => '`'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2393,7 +2495,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2411,7 +2515,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => '\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2431,7 +2535,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2449,7 +2555,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => '\'\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2469,7 +2575,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2487,7 +2595,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => '"'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2507,7 +2615,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2525,7 +2635,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'cmdname' => '@'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2545,7 +2655,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2563,7 +2675,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => '--'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2583,7 +2695,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2601,7 +2715,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => '---'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2621,7 +2735,9 @@ $result_trees{'encoding_index_utf8'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2644,7 +2760,7 @@ $result_trees{'encoding_index_utf8'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2655,7 +2771,9 @@ $result_trees{'encoding_index_utf8'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2665,7 +2783,8 @@ $result_trees{'encoding_index_utf8'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2996,9 +3115,11 @@ $result_sectioning{'encoding_index_utf8'} = {
             'extra' => {
               'isindex' => 1,
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -3016,11 +3137,13 @@ $result_nodes{'encoding_index_utf8'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'encoding_index_utf8'} = {
@@ -3028,7 +3151,8 @@ $result_menus{'encoding_index_utf8'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'encoding_index_utf8'} = [];
diff --git a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
index 5babe1524a..e19e819066 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -34,7 +34,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'text' => 'encoding_index_utf8.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'encoding_index_utf8.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'encoding_index_utf8.texi',
                 'line_nr' => 2,
@@ -60,7 +62,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                       'text' => 'utf-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +73,11 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'utf-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'encoding_index_utf8.texi',
                 'line_nr' => 3,
@@ -99,7 +103,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +124,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +143,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -159,7 +165,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => "\x{e9} \x{e9}"
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -179,7 +185,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -269,7 +277,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -289,7 +297,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -397,7 +407,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -417,7 +427,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -435,7 +447,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -455,7 +467,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -473,7 +487,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -493,7 +507,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -511,7 +527,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -531,7 +547,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -549,7 +567,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -569,7 +587,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -587,7 +607,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -607,7 +627,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -625,7 +647,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'f'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -645,7 +667,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -663,7 +687,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'g'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -683,7 +707,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -701,7 +727,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'h'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -721,7 +747,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -739,7 +767,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'i'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -759,7 +787,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -777,7 +807,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'j'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -797,7 +827,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -815,7 +847,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'k'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -835,7 +867,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -853,7 +887,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'l'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -873,7 +907,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -891,7 +927,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'm'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -911,7 +947,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -929,7 +967,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'n'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -949,7 +987,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -967,7 +1007,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'o'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -987,7 +1027,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1005,7 +1047,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'p'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1025,7 +1067,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1043,7 +1087,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'q'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1063,7 +1107,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1081,7 +1127,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'r'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1101,7 +1147,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1119,7 +1167,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 's'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1139,7 +1187,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1157,7 +1207,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 't'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1177,7 +1227,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1195,7 +1247,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'u'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1215,7 +1267,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1233,7 +1287,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'v'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1253,7 +1307,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1271,7 +1327,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'w'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1291,7 +1347,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1309,7 +1367,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'x'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1329,7 +1387,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1347,7 +1407,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'y'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1367,7 +1427,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1385,7 +1447,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'z'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1405,7 +1467,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1423,7 +1487,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'A'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1443,7 +1507,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1461,7 +1527,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'B'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1481,7 +1547,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1509,7 +1577,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1529,7 +1597,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1557,7 +1627,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1577,7 +1647,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1634,7 +1706,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1654,7 +1726,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1741,7 +1815,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => ' (dotless)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1761,7 +1835,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1789,7 +1865,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1809,7 +1885,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1837,7 +1915,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1857,7 +1935,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1885,7 +1965,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1905,7 +1985,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1933,7 +2015,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1953,7 +2035,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1981,7 +2065,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2001,7 +2085,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2029,7 +2115,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2049,7 +2135,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2077,7 +2165,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2097,7 +2185,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2115,7 +2205,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => '0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2135,7 +2225,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2153,7 +2245,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => '9'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2173,7 +2265,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2201,7 +2295,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2221,7 +2315,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2249,7 +2345,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2269,7 +2365,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2297,7 +2395,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2317,7 +2415,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2335,7 +2435,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => '``'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2355,7 +2455,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2373,7 +2475,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => '`'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2393,7 +2495,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2411,7 +2515,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => '\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2431,7 +2535,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2449,7 +2555,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => '\'\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2469,7 +2575,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2487,7 +2595,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => '"'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2507,7 +2615,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2525,7 +2635,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'cmdname' => '@'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2545,7 +2655,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2563,7 +2675,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => '--'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2583,7 +2695,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2601,7 +2715,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => '---'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2621,7 +2735,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2644,7 +2760,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2655,7 +2771,9 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2665,7 +2783,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2996,9 +3115,11 @@ 
$result_sectioning{'encoding_index_utf8_enable_encoding'} = {
             'extra' => {
               'isindex' => 1,
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -3016,11 +3137,13 @@ $result_nodes{'encoding_index_utf8_enable_encoding'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'encoding_index_utf8_enable_encoding'} = {
@@ -3028,7 +3151,8 @@ $result_menus{'encoding_index_utf8_enable_encoding'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'encoding_index_utf8_enable_encoding'} = [];
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 41af117e58..90b12ac17e 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -24,7 +24,7 @@ $result_trees{'explicit_sort_key'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'explicit_sort_key'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'explicit_sort_key'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +88,7 @@ $result_trees{'explicit_sort_key'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -108,7 +110,7 @@ $result_trees{'explicit_sort_key'} = {
                   'text' => 'SK'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -119,7 +121,9 @@ $result_trees{'explicit_sort_key'} = {
           'extra' => {
             'misc_args' => [
               'SK'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -163,7 +167,7 @@ $result_trees{'explicit_sort_key'} = {
                   'text' => 'bbbbbbb (first)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -185,7 +189,9 @@ $result_trees{'explicit_sort_key'} = {
               'index_type_command' => 'SKindex',
               'sortas' => 'A'
             },
-            'sortas' => 'A',
+            'sortas' => 'A'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -225,7 +231,7 @@ $result_trees{'explicit_sort_key'} = {
                   'text' => 'aaaaaaa (second)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -247,7 +253,9 @@ $result_trees{'explicit_sort_key'} = {
               'index_type_command' => 'SKindex',
               'sortas' => 'B'
             },
-            'sortas' => 'B',
+            'sortas' => 'B'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -287,7 +295,7 @@ $result_trees{'explicit_sort_key'} = {
                   'text' => 'zero sort key'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -309,7 +317,9 @@ $result_trees{'explicit_sort_key'} = {
               'index_type_command' => 'SKindex',
               'sortas' => '0'
             },
-            'sortas' => '0',
+            'sortas' => '0'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -360,7 +370,7 @@ $result_trees{'explicit_sort_key'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -380,7 +390,9 @@ $result_trees{'explicit_sort_key'} = {
               'index_ignore_chars' => {},
               'index_name' => 'SK',
               'index_type_command' => 'SKindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -567,7 +579,7 @@ $result_trees{'explicit_sort_key'} = {
                   'text' => 'SK'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -578,7 +590,9 @@ $result_trees{'explicit_sort_key'} = {
           'extra' => {
             'misc_args' => [
               'SK'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -601,7 +615,9 @@ $result_trees{'explicit_sort_key'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -677,6 +693,7 @@ $result_sectioning{'explicit_sort_key'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -701,6 +718,7 @@ $result_nodes{'explicit_sort_key'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -708,6 +726,7 @@ $result_nodes{'explicit_sort_key'} = {
         'isindex' => 1,
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -721,6 +740,7 @@ $result_menus{'explicit_sort_key'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index 484a60a15b..da0f84a720 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -34,7 +34,7 @@ $result_trees{'ftable_vtable'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -62,7 +62,7 @@ $result_trees{'ftable_vtable'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -83,7 +83,7 @@ $result_trees{'ftable_vtable'} = {
                               'text' => 'function1'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -103,7 +103,9 @@ $result_trees{'ftable_vtable'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -120,7 +122,7 @@ $result_trees{'ftable_vtable'} = {
                               'text' => 'function2x'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -140,7 +142,9 @@ $result_trees{'ftable_vtable'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -181,7 +185,7 @@ $result_trees{'ftable_vtable'} = {
                               'text' => 'fun3'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -201,7 +205,9 @@ $result_trees{'ftable_vtable'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -224,7 +230,7 @@ $result_trees{'ftable_vtable'} = {
                       'text' => 'ftable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -233,9 +239,11 @@ $result_trees{'ftable_vtable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ftable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -244,7 +252,9 @@ $result_trees{'ftable_vtable'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -272,7 +282,7 @@ $result_trees{'ftable_vtable'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -306,7 +316,7 @@ $result_trees{'ftable_vtable'} = {
                               }
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -326,7 +336,9 @@ $result_trees{'ftable_vtable'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -343,7 +355,7 @@ $result_trees{'ftable_vtable'} = {
                               'text' => 'varx2'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -363,7 +375,9 @@ $result_trees{'ftable_vtable'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -404,7 +418,7 @@ $result_trees{'ftable_vtable'} = {
                               'text' => 'var3'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -424,7 +438,9 @@ $result_trees{'ftable_vtable'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -447,7 +463,7 @@ $result_trees{'ftable_vtable'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -456,9 +472,11 @@ $result_trees{'ftable_vtable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -467,7 +485,9 @@ $result_trees{'ftable_vtable'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -489,7 +509,7 @@ $result_trees{'ftable_vtable'} = {
                   'text' => 'function1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -509,7 +529,9 @@ $result_trees{'ftable_vtable'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -532,7 +554,7 @@ $result_trees{'ftable_vtable'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -543,7 +565,9 @@ $result_trees{'ftable_vtable'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -565,7 +589,7 @@ $result_trees{'ftable_vtable'} = {
                   'text' => 'vr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -576,7 +600,9 @@ $result_trees{'ftable_vtable'} = {
           'extra' => {
             'misc_args' => [
               'vr'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -604,7 +630,9 @@ $result_trees{'ftable_vtable'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -696,7 +724,8 @@ $result_nodes{'ftable_vtable'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'ftable_vtable'} = {
@@ -704,7 +733,8 @@ $result_menus{'ftable_vtable'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'ftable_vtable'} = [];
diff --git a/tp/t/results/indices/ignored_sort_char_empty_entries.pl 
b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
index 8c464e0540..4851b56495 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -51,7 +51,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -71,7 +71,9 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -83,7 +85,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +115,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -135,7 +137,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
                   'text' => '-'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -157,7 +159,9 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               },
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -175,7 +179,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
                   'text' => '--'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -197,7 +201,9 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               },
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -215,7 +221,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
                   'text' => 'A'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -237,7 +243,9 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               },
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -277,7 +285,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
                   'text' => '--'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -301,7 +309,9 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
               'index_type_command' => 'findex',
               'sortas' => '--'
             },
-            'sortas' => '--',
+            'sortas' => '--'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -324,7 +334,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -335,7 +345,9 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -358,7 +370,9 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -424,6 +438,7 @@ $result_sectioning{'ignored_sort_char_empty_entries'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -448,6 +463,7 @@ $result_nodes{'ignored_sort_char_empty_entries'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -455,6 +471,7 @@ $result_nodes{'ignored_sort_char_empty_entries'} = {
         'isindex' => 1,
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -468,6 +485,7 @@ $result_menus{'ignored_sort_char_empty_entries'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index 19a30b4b57..e90526663d 100644
Binary files a/tp/t/results/indices/image_lines_count.pl and 
b/tp/t/results/indices/image_lines_count.pl differ
diff --git a/tp/t/results/indices/image_text_lines_count.pl 
b/tp/t/results/indices/image_text_lines_count.pl
index 047b6d7843..ba08b8da49 100644
Binary files a/tp/t/results/indices/image_text_lines_count.pl and 
b/tp/t/results/indices/image_text_lines_count.pl differ
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index 821c870013..844c4dbd1a 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -34,7 +34,7 @@ $result_trees{'index_entries_locations'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +76,7 @@ $result_trees{'index_entries_locations'} = {
                       'text' => 'entry in paragraph'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,7 +96,9 @@ $result_trees{'index_entries_locations'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -118,7 +120,7 @@ $result_trees{'index_entries_locations'} = {
                       'text' => 'entry at end of paragraph.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -138,7 +140,9 @@ $result_trees{'index_entries_locations'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -178,7 +182,7 @@ $result_trees{'index_entries_locations'} = {
                   'text' => 'Entry before paragraph'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -198,7 +202,9 @@ $result_trees{'index_entries_locations'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -230,7 +236,7 @@ $result_trees{'index_entries_locations'} = {
                   'text' => 'lone entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -250,7 +256,9 @@ $result_trees{'index_entries_locations'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -287,7 +295,7 @@ $result_trees{'index_entries_locations'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -298,7 +306,9 @@ $result_trees{'index_entries_locations'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -321,7 +331,9 @@ $result_trees{'index_entries_locations'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -395,7 +407,8 @@ $result_nodes{'index_entries_locations'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'index_entries_locations'} = {
@@ -403,7 +416,8 @@ $result_menus{'index_entries_locations'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'index_entries_locations'} = [];
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl 
b/tp/t/results/indices/index_entry_before_first_node.pl
index 7fd50fc3b8..7f92d50b57 100644
Binary files a/tp/t/results/indices/index_entry_before_first_node.pl and 
b/tp/t/results/indices/index_entry_before_first_node.pl differ
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index 0309d9e154..7aa3829a88 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -24,7 +24,7 @@ $result_trees{'index_entry_before_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -41,7 +41,7 @@ $result_trees{'index_entry_before_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -156,7 +156,7 @@ $result_trees{'index_entry_before_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -165,9 +165,11 @@ $result_trees{'index_entry_before_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -199,7 +201,9 @@ $result_trees{'index_entry_before_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -235,7 +239,7 @@ $result_trees{'index_entry_before_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -271,7 +275,7 @@ $result_trees{'index_entry_before_node'} = {
                   'text' => 'lone entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -291,7 +295,9 @@ $result_trees{'index_entry_before_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -332,7 +338,9 @@ $result_trees{'index_entry_before_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -368,7 +376,7 @@ $result_trees{'index_entry_before_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -390,7 +398,7 @@ $result_trees{'index_entry_before_node'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -401,7 +409,9 @@ $result_trees{'index_entry_before_node'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -437,7 +447,9 @@ $result_trees{'index_entry_before_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'second',
+        'normalized' => 'second'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -508,12 +520,14 @@ $result_nodes{'index_entry_before_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -521,6 +535,7 @@ $result_nodes{'index_entry_before_node'} = {
             'isindex' => 1,
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -544,12 +559,14 @@ $result_menus{'index_entry_before_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
@@ -557,6 +574,7 @@ $result_menus{'index_entry_before_node'} = {
             'isindex' => 1,
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index fb2d30e148..2598130a42 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 224a6e15f9..6a4f19e479 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
@@ -24,7 +24,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} = 
{
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -41,7 +41,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} = 
{
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -107,7 +107,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -116,9 +116,11 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -160,7 +162,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                                   'text' => 'index entry in footnote'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -180,7 +182,9 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
                               'index_type_command' => 'cindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -234,7 +238,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                               'text' => 'counting entry'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -254,7 +258,9 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
                           'index_type_command' => 'cindex'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -300,7 +306,9 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -317,7 +325,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
               'text' => 'First'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -339,7 +347,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -350,7 +358,9 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -373,7 +383,9 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
             'normalized' => 'First'
           }
         ],
-        'normalized' => 'First',
+        'normalized' => 'First'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -440,6 +452,7 @@ $result_nodes{'index_entry_in_footnote_different_node_end'} 
= {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -447,6 +460,7 @@ $result_nodes{'index_entry_in_footnote_different_node_end'} 
= {
         'isindex' => 1,
         'normalized' => 'First'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -464,6 +478,7 @@ $result_menus{'index_entry_in_footnote_different_node_end'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -471,6 +486,7 @@ $result_menus{'index_entry_in_footnote_different_node_end'} 
= {
         'isindex' => 1,
         'normalized' => 'First'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
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 962ff5baf1..e4d2d9ed64 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -19,7 +19,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                       'text' => 'separate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               'extra' => {
                 'misc_args' => [
                   'separate'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -53,7 +55,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -70,7 +72,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -136,7 +138,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -145,9 +147,11 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -189,7 +193,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                                   'text' => 'index entry in footnote'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -209,7 +213,9 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
                               'index_type_command' => 'cindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -263,7 +269,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                               'text' => 'counting entry'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -283,7 +289,9 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
                           'index_type_command' => 'cindex'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -329,7 +337,9 @@ $result_trees{'index_entry_in_footnote_separate'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -346,7 +356,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               'text' => 'First'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -368,7 +378,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -379,7 +389,9 @@ $result_trees{'index_entry_in_footnote_separate'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -402,7 +414,9 @@ $result_trees{'index_entry_in_footnote_separate'} = {
             'normalized' => 'First'
           }
         ],
-        'normalized' => 'First',
+        'normalized' => 'First'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -470,6 +484,7 @@ $result_nodes{'index_entry_in_footnote_separate'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -477,6 +492,7 @@ $result_nodes{'index_entry_in_footnote_separate'} = {
         'isindex' => 1,
         'normalized' => 'First'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -494,6 +510,7 @@ $result_menus{'index_entry_in_footnote_separate'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -501,6 +518,7 @@ $result_menus{'index_entry_in_footnote_separate'} = {
         'isindex' => 1,
         'normalized' => 'First'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git 
a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl 
b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
index fb48a9674e..38853e4083 100644
--- a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
+++ b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
@@ -24,7 +24,7 @@ $result_trees{'multiple_index_text_sortas_seeentry_seealso'} 
= {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'multiple_index_text_sortas_seeentry_seealso'} 
= {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'multiple_index_text_sortas_seeentry_seealso'} 
= {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +88,7 @@ $result_trees{'multiple_index_text_sortas_seeentry_seealso'} 
= {
               'text' => 'chapter index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +109,9 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
             'normalized' => 'chapter-index'
           }
         ],
-        'normalized' => 'chapter-index',
+        'normalized' => 'chapter-index'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +128,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
               'text' => 'Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -224,7 +228,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -248,7 +252,9 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
             },
             'seealso' => {},
             'seeentry' => {},
-            'sortas' => 'A---S',
+            'sortas' => 'A---S'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -294,7 +300,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'text' => 'second'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -316,7 +322,9 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
               'index_type_command' => 'cindex',
               'sortas' => 'BB'
             },
-            'sortas' => 'BB',
+            'sortas' => 'BB'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -362,7 +370,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'text' => 'secret'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -383,7 +391,9 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -406,7 +416,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -417,7 +427,9 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -427,7 +439,8 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -491,6 +504,7 @@ 
$result_sectioning{'multiple_index_text_sortas_seeentry_seealso'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -505,9 +519,11 @@ 
$result_sectioning{'multiple_index_text_sortas_seeentry_seealso'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-index'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -540,6 +556,7 @@ 
$result_nodes{'multiple_index_text_sortas_seeentry_seealso'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -547,6 +564,7 @@ 
$result_nodes{'multiple_index_text_sortas_seeentry_seealso'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -554,6 +572,7 @@ 
$result_nodes{'multiple_index_text_sortas_seeentry_seealso'} = {
         'isindex' => 1,
         'normalized' => 'chapter-index'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -569,6 +588,7 @@ 
$result_menus{'multiple_index_text_sortas_seeentry_seealso'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/print_merged_index.pl 
b/tp/t/results/indices/print_merged_index.pl
index bc908b18b6..34e6cacad7 100644
--- a/tp/t/results/indices/print_merged_index.pl
+++ b/tp/t/results/indices/print_merged_index.pl
@@ -17,7 +17,7 @@ $result_trees{'print_merged_index'} = {
                   'text' => 'fn cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -29,7 +29,9 @@ $result_trees{'print_merged_index'} = {
             'misc_args' => [
               'fn',
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -49,7 +51,7 @@ $result_trees{'print_merged_index'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -73,7 +75,9 @@ $result_trees{'print_merged_index'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -96,7 +100,9 @@ $result_trees{'print_merged_index'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -123,7 +129,8 @@ $result_nodes{'print_merged_index'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'print_merged_index'} = {
@@ -131,7 +138,8 @@ $result_menus{'print_merged_index'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'print_merged_index'} = [
diff --git a/tp/t/results/indices/printindex_before_document.pl 
b/tp/t/results/indices/printindex_before_document.pl
index b420176e5d..3e33464867 100644
--- a/tp/t/results/indices/printindex_before_document.pl
+++ b/tp/t/results/indices/printindex_before_document.pl
@@ -22,7 +22,7 @@ $result_trees{'printindex_before_document'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,9 @@ $result_trees{'printindex_before_document'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
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 5e0e74f683..5c61040152 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -14,7 +14,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -36,7 +36,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'text' => 'Copying this document'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -56,7 +56,9 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
                       'index_type_command' => 'findex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -234,7 +236,9 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'index_name' => 'fn',
                           'index_type_command' => 'defun'
                         },
-                        'original_def_cmdname' => 'defunx',
+                        'original_def_cmdname' => 'defunx'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -266,7 +270,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               'text' => 'defun'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -275,9 +279,11 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'defun'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 8,
@@ -285,7 +291,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -313,7 +319,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'type' => 'command_as_argument'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -334,7 +340,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                                       'text' => 'ftable item'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -354,7 +360,9 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
                                   'index_type_command' => 'ftable'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -371,7 +379,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                                       'text' => 'xftable xitem'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -391,7 +399,9 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
                                   'index_type_command' => 'ftable'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -414,7 +424,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               'text' => 'ftable'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -423,9 +433,11 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'ftable'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 13,
@@ -434,7 +446,9 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
+                    'command_as_argument' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -456,7 +470,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'text' => 'fn'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -467,7 +481,9 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   'extra' => {
                     'misc_args' => [
                       'fn'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -489,7 +505,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -498,9 +514,11 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 17,
@@ -533,7 +551,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -553,7 +571,9 @@ $result_trees{'printindex_index_entry_in_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -570,7 +590,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -616,7 +636,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -682,7 +702,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -691,9 +711,11 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -713,7 +735,8 @@ $result_trees{'printindex_index_entry_in_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -730,7 +753,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -751,7 +774,9 @@ $result_trees{'printindex_index_entry_in_copying'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -768,7 +793,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -810,7 +835,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -821,7 +846,9 @@ $result_trees{'printindex_index_entry_in_copying'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -836,7 +863,8 @@ $result_trees{'printindex_index_entry_in_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -944,9 +972,11 @@ $result_sectioning{'printindex_index_entry_in_copying'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -958,9 +988,11 @@ $result_sectioning{'printindex_index_entry_in_copying'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -989,6 +1021,7 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -998,6 +1031,7 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1005,6 +1039,7 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1012,6 +1047,7 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
         'isindex' => 1,
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1029,6 +1065,7 @@ $result_menus{'printindex_index_entry_in_copying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1036,6 +1073,7 @@ $result_menus{'printindex_index_entry_in_copying'} = {
         'isindex' => 1,
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
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 0cc3dc13ac..2a72e603cb 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
@@ -14,7 +14,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -51,7 +51,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                                           'text' => 'Copying this document'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -71,7 +71,9 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                                       'index_ignore_chars' => {},
                                       'index_name' => 'cp',
                                       'index_type_command' => 'cindex'
-                                    },
+                                    }
+                                  },
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'source_info' => {
@@ -94,7 +96,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => '
 '
                       },
@@ -124,7 +126,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                           'text' => 'cp'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -135,7 +137,9 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                   'extra' => {
                     'misc_args' => [
                       'cp'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -157,7 +161,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -166,9 +170,11 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 11,
@@ -201,7 +207,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -221,7 +227,9 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -238,7 +246,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -284,7 +292,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -350,7 +358,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -359,9 +367,11 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -381,7 +391,8 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -398,7 +409,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -418,7 +429,9 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -435,7 +448,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -470,7 +483,8 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -548,9 +562,11 @@ 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -561,9 +577,11 @@ 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -592,6 +610,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -601,6 +620,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -608,12 +628,14 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -631,12 +653,14 @@ 
$result_menus{'printindex_index_entry_in_copying_in_footnote'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index c34637dbd6..17c1090e3c 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -14,7 +14,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -36,7 +36,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'text' => 'Copying this document'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -56,7 +56,9 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
                       'index_type_command' => 'findex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -234,7 +236,9 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'index_name' => 'fn',
                           'index_type_command' => 'defun'
                         },
-                        'original_def_cmdname' => 'defunx',
+                        'original_def_cmdname' => 'defunx'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -266,7 +270,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               'text' => 'defun'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -275,9 +279,11 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'defun'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 8,
@@ -285,7 +291,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -313,7 +319,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'type' => 'command_as_argument'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -334,7 +340,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                                       'text' => 'ftable item'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -354,7 +360,9 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
                                   'index_type_command' => 'ftable'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -371,7 +379,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                                       'text' => 'xftable xitem'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -391,7 +399,9 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
                                   'index_type_command' => 'ftable'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -414,7 +424,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               'text' => 'ftable'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -423,9 +433,11 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'ftable'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 13,
@@ -434,7 +446,9 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
+                    'command_as_argument' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -456,7 +470,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'text' => 'fn'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -467,7 +481,9 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   'extra' => {
                     'misc_args' => [
                       'fn'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -489,7 +505,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -498,9 +514,11 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 17,
@@ -533,7 +551,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -553,7 +571,9 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -570,7 +590,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -601,7 +621,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -667,7 +687,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -676,9 +696,11 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -698,7 +720,8 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -715,7 +738,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -736,7 +759,9 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -753,7 +778,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -780,7 +805,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -791,7 +816,9 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -806,7 +833,8 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -912,9 +940,11 @@ 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -926,9 +956,11 @@ 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -957,6 +989,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -966,6 +999,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -973,6 +1007,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -980,6 +1015,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
         'isindex' => 1,
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -997,6 +1033,7 @@ 
$result_menus{'printindex_index_entry_in_copying_no_insertcopying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1004,6 +1041,7 @@ 
$result_menus{'printindex_index_entry_in_copying_no_insertcopying'} = {
         'isindex' => 1,
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index e3db54991a..5a153a3077 100644
Binary files a/tp/t/results/indices/printindex_with_space_before.pl and 
b/tp/t/results/indices/printindex_with_space_before.pl differ
diff --git a/tp/t/results/indices/recursive_synindex.pl 
b/tp/t/results/indices/recursive_synindex.pl
index 63aec264f3..540e272497 100644
--- a/tp/t/results/indices/recursive_synindex.pl
+++ b/tp/t/results/indices/recursive_synindex.pl
@@ -17,7 +17,7 @@ $result_trees{'recursive_synindex'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'aaa'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -45,7 +47,7 @@ $result_trees{'recursive_synindex'} = {
                   'text' => 'bbb'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -56,7 +58,9 @@ $result_trees{'recursive_synindex'} = {
           'extra' => {
             'misc_args' => [
               'bbb'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -73,7 +77,7 @@ $result_trees{'recursive_synindex'} = {
                   'text' => 'aaa bbb'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -85,7 +89,9 @@ $result_trees{'recursive_synindex'} = {
             'misc_args' => [
               'aaa',
               'bbb'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -106,7 +112,7 @@ $result_trees{'recursive_synindex'} = {
             }
           ],
           'cmdname' => 'synindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index a61a5c5cc6..6e34b9ee2b 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -19,7 +19,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
                       'text' => 'vr fn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -31,7 +31,9 @@ $result_trees{'same_index_entry_merged_indices'} = {
                 'misc_args' => [
                   'vr',
                   'fn'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -59,7 +61,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -80,7 +82,9 @@ $result_trees{'same_index_entry_merged_indices'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -92,7 +96,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -239,7 +243,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -248,9 +252,11 @@ $result_trees{'same_index_entry_merged_indices'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -258,7 +264,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -368,7 +374,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
                       'text' => 'defvar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -377,9 +383,11 @@ $result_trees{'same_index_entry_merged_indices'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -387,7 +395,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -409,7 +417,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -420,7 +428,9 @@ $result_trees{'same_index_entry_merged_indices'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -497,7 +507,8 @@ $result_sectioning{'same_index_entry_merged_indices'} = {
             'extra' => {
               'isindex' => 1,
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
         'structure' => {
@@ -521,7 +532,8 @@ $result_nodes{'same_index_entry_merged_indices'} = {
     },
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'same_index_entry_merged_indices'} = {
@@ -529,7 +541,8 @@ $result_menus{'same_index_entry_merged_indices'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'same_index_entry_merged_indices'} = [];
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl 
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index d50520ef7f..970ce73735 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -24,7 +24,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'same_only_seealso_seeentry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -114,7 +117,9 @@ $result_trees{'same_only_seealso_seeentry'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -131,7 +136,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -175,7 +180,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +201,9 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seealso' => {},
+            'seealso' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -236,7 +243,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -257,7 +264,9 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seealso' => {},
+            'seealso' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -302,7 +311,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -323,7 +332,9 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -363,7 +374,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -384,7 +395,9 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -429,7 +442,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -450,7 +463,9 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seealso' => {},
+            'seealso' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -490,7 +505,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -511,7 +526,9 @@ $result_trees{'same_only_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -534,7 +551,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -545,7 +562,9 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -555,7 +574,8 @@ $result_trees{'same_only_seealso_seeentry'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -643,9 +663,11 @@ $result_sectioning{'same_only_seealso_seeentry'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -657,9 +679,11 @@ $result_sectioning{'same_only_seealso_seeentry'} = {
                     'isindex' => 1,
                     'normalized' => 'node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -688,10 +712,12 @@ $result_nodes{'same_only_seealso_seeentry'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -699,6 +725,7 @@ $result_nodes{'same_only_seealso_seeentry'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -706,6 +733,7 @@ $result_nodes{'same_only_seealso_seeentry'} = {
         'isindex' => 1,
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -721,6 +749,7 @@ $result_menus{'same_only_seealso_seeentry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index b31402e6d9..8156c14bd9 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -24,7 +24,7 @@ $result_trees{'same_seealso_seeentry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'same_seealso_seeentry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'same_seealso_seeentry'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'same_seealso_seeentry'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'same_seealso_seeentry'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -114,7 +117,9 @@ $result_trees{'same_seealso_seeentry'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -131,7 +136,7 @@ $result_trees{'same_seealso_seeentry'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -175,7 +180,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +201,9 @@ $result_trees{'same_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seealso' => {},
+            'seealso' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -236,7 +243,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -257,7 +264,9 @@ $result_trees{'same_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seealso' => {},
+            'seealso' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -302,7 +311,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -323,7 +332,9 @@ $result_trees{'same_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -363,7 +374,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -384,7 +395,9 @@ $result_trees{'same_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -429,7 +442,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -450,7 +463,9 @@ $result_trees{'same_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seealso' => {},
+            'seealso' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -490,7 +505,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -511,7 +526,9 @@ $result_trees{'same_seealso_seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -534,7 +551,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   'text' => 'entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -554,7 +571,9 @@ $result_trees{'same_seealso_seeentry'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -577,7 +596,7 @@ $result_trees{'same_seealso_seeentry'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -588,7 +607,9 @@ $result_trees{'same_seealso_seeentry'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -598,7 +619,8 @@ $result_trees{'same_seealso_seeentry'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -693,9 +715,11 @@ $result_sectioning{'same_seealso_seeentry'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -707,9 +731,11 @@ $result_sectioning{'same_seealso_seeentry'} = {
                     'isindex' => 1,
                     'normalized' => 'node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -738,10 +764,12 @@ $result_nodes{'same_seealso_seeentry'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -749,6 +777,7 @@ $result_nodes{'same_seealso_seeentry'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -756,6 +785,7 @@ $result_nodes{'same_seealso_seeentry'} = {
         'isindex' => 1,
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -771,6 +801,7 @@ $result_menus{'same_seealso_seeentry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index 6c56a2639c..b0aaf78e3f 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -24,7 +24,7 @@ $result_trees{'seealso_duplicate'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -61,7 +61,7 @@ $result_trees{'seealso_duplicate'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -81,7 +81,6 @@ $result_trees{'seealso_duplicate'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -90,7 +89,7 @@ $result_trees{'seealso_duplicate'} = {
                       'text' => 'POSIX and'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -99,7 +98,9 @@ $result_trees{'seealso_duplicate'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -109,6 +110,9 @@ $result_trees{'seealso_duplicate'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
@@ -140,7 +144,7 @@ $result_trees{'seealso_duplicate'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -160,7 +164,6 @@ $result_trees{'seealso_duplicate'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -209,7 +212,7 @@ $result_trees{'seealso_duplicate'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -219,7 +222,9 @@ $result_trees{'seealso_duplicate'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'seealso' => {},
+                'seealso' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -229,6 +234,9 @@ $result_trees{'seealso_duplicate'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 4,
@@ -250,7 +258,7 @@ $result_trees{'seealso_duplicate'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -261,7 +269,9 @@ $result_trees{'seealso_duplicate'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -284,7 +294,9 @@ $result_trees{'seealso_duplicate'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -328,7 +340,8 @@ $result_nodes{'seealso_duplicate'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'seealso_duplicate'} = {
@@ -336,7 +349,8 @@ $result_menus{'seealso_duplicate'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'seealso_duplicate'} = [];
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index bcfd0cbf49..7af6d37a35 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -24,7 +24,7 @@ $result_trees{'seeentry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'seeentry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'seeentry'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +88,7 @@ $result_trees{'seeentry'} = {
               'text' => 'chapter index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +109,9 @@ $result_trees{'seeentry'} = {
             'normalized' => 'chapter-index'
           }
         ],
-        'normalized' => 'chapter-index',
+        'normalized' => 'chapter-index'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +128,7 @@ $result_trees{'seeentry'} = {
               'text' => 'Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -168,7 +172,7 @@ $result_trees{'seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -189,7 +193,9 @@ $result_trees{'seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -229,7 +235,7 @@ $result_trees{'seeentry'} = {
                   'text' => 'ddd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -250,7 +256,9 @@ $result_trees{'seeentry'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'seealso' => {},
+            'seealso' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -295,7 +303,7 @@ $result_trees{'seeentry'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -316,7 +324,9 @@ $result_trees{'seeentry'} = {
               'index_name' => 'fn',
               'index_type_command' => 'findex'
             },
-            'seeentry' => {},
+            'seeentry' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -356,7 +366,7 @@ $result_trees{'seeentry'} = {
                   'text' => 'f---ddd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -377,7 +387,9 @@ $result_trees{'seeentry'} = {
               'index_name' => 'fn',
               'index_type_command' => 'findex'
             },
-            'seealso' => {},
+            'seealso' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -400,7 +412,7 @@ $result_trees{'seeentry'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -411,7 +423,9 @@ $result_trees{'seeentry'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -428,7 +442,7 @@ $result_trees{'seeentry'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -439,7 +453,9 @@ $result_trees{'seeentry'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -449,7 +465,8 @@ $result_trees{'seeentry'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -522,6 +539,7 @@ $result_sectioning{'seeentry'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -536,9 +554,11 @@ $result_sectioning{'seeentry'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-index'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -571,6 +591,7 @@ $result_nodes{'seeentry'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -578,6 +599,7 @@ $result_nodes{'seeentry'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -585,6 +607,7 @@ $result_nodes{'seeentry'} = {
         'isindex' => 1,
         'normalized' => 'chapter-index'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -600,6 +623,7 @@ $result_menus{'seeentry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/sorted_subentries.pl 
b/tp/t/results/indices/sorted_subentries.pl
index ef6928e1ec..1794b53720 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -24,7 +24,7 @@ $result_trees{'sorted_subentries'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'sorted_subentries'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'sorted_subentries'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +88,7 @@ $result_trees{'sorted_subentries'} = {
               'text' => 'chapter one'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -106,7 +108,9 @@ $result_trees{'sorted_subentries'} = {
             'normalized' => 'chapter-one'
           }
         ],
-        'normalized' => 'chapter-one',
+        'normalized' => 'chapter-one'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -123,7 +127,7 @@ $result_trees{'sorted_subentries'} = {
               'text' => 'one'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -145,7 +149,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'aa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -165,7 +169,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -174,7 +177,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'bb'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -183,7 +186,9 @@ $result_trees{'sorted_subentries'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -193,6 +198,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 7,
@@ -209,7 +217,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'ab'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -229,7 +237,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -238,7 +245,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'cc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -247,7 +254,9 @@ $result_trees{'sorted_subentries'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -257,6 +266,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 8,
@@ -273,7 +285,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'aa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -293,7 +305,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -302,7 +313,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'dd'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -311,7 +322,9 @@ $result_trees{'sorted_subentries'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -321,6 +334,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 9,
@@ -337,7 +353,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'bb'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -357,7 +373,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -366,7 +381,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'cc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -375,7 +390,9 @@ $result_trees{'sorted_subentries'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -385,6 +402,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 10,
@@ -406,7 +426,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -426,7 +446,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -435,7 +454,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'jjj'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -444,7 +463,6 @@ $result_trees{'sorted_subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -453,7 +471,7 @@ $result_trees{'sorted_subentries'} = {
                           'text' => 'lll'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -462,7 +480,9 @@ $result_trees{'sorted_subentries'} = {
                   ],
                   'cmdname' => 'subentry',
                   'extra' => {
-                    'level' => 2,
+                    'level' => 2
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -472,6 +492,9 @@ $result_trees{'sorted_subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -479,6 +502,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 12,
@@ -496,7 +522,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -516,7 +542,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -525,7 +550,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'jjj'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -534,7 +559,9 @@ $result_trees{'sorted_subentries'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -544,6 +571,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 13,
@@ -560,7 +590,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh jjj'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -580,7 +610,9 @@ $result_trees{'sorted_subentries'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -598,7 +630,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -618,7 +650,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -627,7 +658,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'k'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -636,7 +667,9 @@ $result_trees{'sorted_subentries'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -646,6 +679,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 15,
@@ -662,7 +698,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -682,11 +718,10 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -705,6 +740,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 16,
@@ -721,7 +759,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -741,7 +779,9 @@ $result_trees{'sorted_subentries'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -759,7 +799,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -779,7 +819,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -788,7 +827,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'jjj'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -797,7 +836,6 @@ $result_trees{'sorted_subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -806,7 +844,7 @@ $result_trees{'sorted_subentries'} = {
                           'text' => 'lll'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -815,7 +853,6 @@ $result_trees{'sorted_subentries'} = {
                   'cmdname' => 'subentry',
                   'extra' => {
                     'level' => 2,
-                    'spaces_before_argument' => ' ',
                     'subentry' => {
                       'args' => [
                         {
@@ -824,7 +861,7 @@ $result_trees{'sorted_subentries'} = {
                               'text' => 'ppp'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -833,7 +870,9 @@ $result_trees{'sorted_subentries'} = {
                       ],
                       'cmdname' => 'subentry',
                       'extra' => {
-                        'level' => 3,
+                        'level' => 3
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -843,6 +882,9 @@ $result_trees{'sorted_subentries'} = {
                       }
                     }
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 18,
@@ -850,6 +892,9 @@ $result_trees{'sorted_subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -857,6 +902,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 18,
@@ -873,7 +921,8 @@ $result_trees{'sorted_subentries'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -890,7 +939,7 @@ $result_trees{'sorted_subentries'} = {
               'text' => 'chapter second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -911,7 +960,9 @@ $result_trees{'sorted_subentries'} = {
             'normalized' => 'chapter-second'
           }
         ],
-        'normalized' => 'chapter-second',
+        'normalized' => 'chapter-second'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -928,7 +979,7 @@ $result_trees{'sorted_subentries'} = {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -945,7 +996,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -965,7 +1016,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -974,7 +1024,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'jjj'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -983,7 +1033,6 @@ $result_trees{'sorted_subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -992,7 +1041,7 @@ $result_trees{'sorted_subentries'} = {
                           'text' => 'lll'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1001,7 +1050,9 @@ $result_trees{'sorted_subentries'} = {
                   ],
                   'cmdname' => 'subentry',
                   'extra' => {
-                    'level' => 2,
+                    'level' => 2
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1011,6 +1062,9 @@ $result_trees{'sorted_subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -1018,6 +1072,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 22,
@@ -1035,7 +1092,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -1055,7 +1112,9 @@ $result_trees{'sorted_subentries'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1088,7 +1147,7 @@ $result_trees{'sorted_subentries'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -1108,7 +1167,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -1117,7 +1175,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'jjj'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1126,7 +1184,9 @@ $result_trees{'sorted_subentries'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1136,6 +1196,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 24,
@@ -1167,7 +1230,7 @@ $result_trees{'sorted_subentries'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -1187,7 +1250,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -1211,7 +1273,7 @@ $result_trees{'sorted_subentries'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -1220,7 +1282,6 @@ $result_trees{'sorted_subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -1252,7 +1313,7 @@ $result_trees{'sorted_subentries'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1261,7 +1322,9 @@ $result_trees{'sorted_subentries'} = {
                   ],
                   'cmdname' => 'subentry',
                   'extra' => {
-                    'level' => 2,
+                    'level' => 2
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1271,6 +1334,9 @@ $result_trees{'sorted_subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -1278,6 +1344,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 25,
@@ -1296,7 +1365,6 @@ $result_trees{'sorted_subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'missing_argument' => 1,
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -1305,7 +1373,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'aa'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1314,7 +1382,9 @@ $result_trees{'sorted_subentries'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1324,6 +1394,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 26,
@@ -1339,7 +1412,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -1359,7 +1432,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -1368,7 +1440,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'jjj'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -1377,7 +1449,6 @@ $result_trees{'sorted_subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -1408,7 +1479,7 @@ $result_trees{'sorted_subentries'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1418,7 +1489,9 @@ $result_trees{'sorted_subentries'} = {
                   'cmdname' => 'subentry',
                   'extra' => {
                     'level' => 2,
-                    'sortas' => 'A',
+                    'sortas' => 'A'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1428,6 +1501,9 @@ $result_trees{'sorted_subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -1435,6 +1511,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 27,
@@ -1452,7 +1531,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -1472,7 +1551,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -1481,7 +1559,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'k'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -1490,7 +1568,6 @@ $result_trees{'sorted_subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -1499,7 +1576,7 @@ $result_trees{'sorted_subentries'} = {
                           'text' => 'nnn'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1508,7 +1585,9 @@ $result_trees{'sorted_subentries'} = {
                   ],
                   'cmdname' => 'subentry',
                   'extra' => {
-                    'level' => 2,
+                    'level' => 2
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1518,6 +1597,9 @@ $result_trees{'sorted_subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -1525,6 +1607,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 28,
@@ -1542,7 +1627,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'hhh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -1562,7 +1647,6 @@ $result_trees{'sorted_subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -1571,7 +1655,7 @@ $result_trees{'sorted_subentries'} = {
                       'text' => 'l'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -1580,7 +1664,6 @@ $result_trees{'sorted_subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -1589,7 +1672,7 @@ $result_trees{'sorted_subentries'} = {
                           'text' => 'third'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1598,7 +1681,9 @@ $result_trees{'sorted_subentries'} = {
                   ],
                   'cmdname' => 'subentry',
                   'extra' => {
-                    'level' => 2,
+                    'level' => 2
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1608,6 +1693,9 @@ $result_trees{'sorted_subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -1615,6 +1703,9 @@ $result_trees{'sorted_subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 29,
@@ -1637,7 +1728,7 @@ $result_trees{'sorted_subentries'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1648,7 +1739,9 @@ $result_trees{'sorted_subentries'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1658,7 +1751,8 @@ $result_trees{'sorted_subentries'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1829,6 +1923,7 @@ $result_sectioning{'sorted_subentries'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -1842,9 +1937,11 @@ $result_sectioning{'sorted_subentries'} = {
                   'extra' => {
                     'normalized' => 'chapter-one'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1862,9 +1959,11 @@ $result_sectioning{'sorted_subentries'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-second'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1902,6 +2001,7 @@ $result_nodes{'sorted_subentries'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1909,12 +2009,14 @@ $result_nodes{'sorted_subentries'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter-one'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1922,6 +2024,7 @@ $result_nodes{'sorted_subentries'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
@@ -1929,6 +2032,7 @@ $result_nodes{'sorted_subentries'} = {
             'isindex' => 1,
             'normalized' => 'chapter-second'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -1950,6 +2054,7 @@ $result_menus{'sorted_subentries'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index 653bff6341..ada2a1d8ad 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -24,7 +24,7 @@ $result_trees{'subentries'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'subentries'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'subentries'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +88,7 @@ $result_trees{'subentries'} = {
               'text' => 'chapter index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +109,9 @@ $result_trees{'subentries'} = {
             'normalized' => 'chapter-index'
           }
         ],
-        'normalized' => 'chapter-index',
+        'normalized' => 'chapter-index'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +128,7 @@ $result_trees{'subentries'} = {
               'text' => 'Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -146,7 +150,7 @@ $result_trees{'subentries'} = {
                   'text' => 'a---a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -166,7 +170,9 @@ $result_trees{'subentries'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -184,7 +190,7 @@ $result_trees{'subentries'} = {
                   'text' => 'b---b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -204,7 +210,6 @@ $result_trees{'subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -213,7 +218,7 @@ $result_trees{'subentries'} = {
                       'text' => 'c---c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -222,7 +227,9 @@ $result_trees{'subentries'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -232,6 +239,9 @@ $result_trees{'subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 8,
@@ -248,7 +258,7 @@ $result_trees{'subentries'} = {
                   'text' => 'd---dd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -268,7 +278,6 @@ $result_trees{'subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -277,7 +286,7 @@ $result_trees{'subentries'} = {
                       'text' => 'e---ee'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -286,7 +295,6 @@ $result_trees{'subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -295,7 +303,7 @@ $result_trees{'subentries'} = {
                           'text' => 'f---ff'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -304,7 +312,9 @@ $result_trees{'subentries'} = {
                   ],
                   'cmdname' => 'subentry',
                   'extra' => {
-                    'level' => 2,
+                    'level' => 2
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -314,6 +324,9 @@ $result_trees{'subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -321,6 +334,9 @@ $result_trees{'subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 9,
@@ -338,7 +354,7 @@ $result_trees{'subentries'} = {
                   'text' => 'g---gg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -358,7 +374,6 @@ $result_trees{'subentries'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -367,7 +382,7 @@ $result_trees{'subentries'} = {
                       'text' => 'h---hh jjj'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -376,7 +391,6 @@ $result_trees{'subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -385,7 +399,7 @@ $result_trees{'subentries'} = {
                           'text' => 'k---kk'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -394,7 +408,6 @@ $result_trees{'subentries'} = {
                   'cmdname' => 'subentry',
                   'extra' => {
                     'level' => 2,
-                    'spaces_before_argument' => ' ',
                     'subentry' => {
                       'args' => [
                         {
@@ -403,7 +416,7 @@ $result_trees{'subentries'} = {
                               'text' => 'l---ll'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -412,7 +425,9 @@ $result_trees{'subentries'} = {
                       ],
                       'cmdname' => 'subentry',
                       'extra' => {
-                        'level' => 3,
+                        'level' => 3
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -422,6 +437,9 @@ $result_trees{'subentries'} = {
                       }
                     }
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 10,
@@ -429,6 +447,9 @@ $result_trees{'subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -436,6 +457,9 @@ $result_trees{'subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 10,
@@ -459,7 +483,7 @@ $result_trees{'subentries'} = {
                   'text' => 'f---aa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -479,7 +503,9 @@ $result_trees{'subentries'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -497,7 +523,7 @@ $result_trees{'subentries'} = {
                   'text' => 'f---bb'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -517,7 +543,6 @@ $result_trees{'subentries'} = {
               'index_name' => 'fn',
               'index_type_command' => 'findex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -526,7 +551,7 @@ $result_trees{'subentries'} = {
                       'text' => 'f---cc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -535,7 +560,9 @@ $result_trees{'subentries'} = {
               ],
               'cmdname' => 'subentry',
               'extra' => {
-                'level' => 1,
+                'level' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -545,6 +572,9 @@ $result_trees{'subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 13,
@@ -561,7 +591,7 @@ $result_trees{'subentries'} = {
                   'text' => 'f---ddd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -581,7 +611,6 @@ $result_trees{'subentries'} = {
               'index_name' => 'fn',
               'index_type_command' => 'findex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -590,7 +619,7 @@ $result_trees{'subentries'} = {
                       'text' => 'f---eee'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -599,7 +628,6 @@ $result_trees{'subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -608,7 +636,7 @@ $result_trees{'subentries'} = {
                           'text' => 'ffff'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -617,7 +645,9 @@ $result_trees{'subentries'} = {
                   ],
                   'cmdname' => 'subentry',
                   'extra' => {
-                    'level' => 2,
+                    'level' => 2
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -627,6 +657,9 @@ $result_trees{'subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -634,6 +667,9 @@ $result_trees{'subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 14,
@@ -651,7 +687,7 @@ $result_trees{'subentries'} = {
                   'text' => 'f---ggg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -671,7 +707,6 @@ $result_trees{'subentries'} = {
               'index_name' => 'fn',
               'index_type_command' => 'findex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -680,7 +715,7 @@ $result_trees{'subentries'} = {
                       'text' => 'f---hhh fjjj'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -689,7 +724,6 @@ $result_trees{'subentries'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -698,7 +732,7 @@ $result_trees{'subentries'} = {
                           'text' => 'f---kkk'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -707,7 +741,6 @@ $result_trees{'subentries'} = {
                   'cmdname' => 'subentry',
                   'extra' => {
                     'level' => 2,
-                    'spaces_before_argument' => ' ',
                     'subentry' => {
                       'args' => [
                         {
@@ -716,7 +749,7 @@ $result_trees{'subentries'} = {
                               'text' => 'f---lll'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -725,7 +758,9 @@ $result_trees{'subentries'} = {
                       ],
                       'cmdname' => 'subentry',
                       'extra' => {
-                        'level' => 3,
+                        'level' => 3
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -735,6 +770,9 @@ $result_trees{'subentries'} = {
                       }
                     }
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 15,
@@ -742,6 +780,9 @@ $result_trees{'subentries'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -749,6 +790,9 @@ $result_trees{'subentries'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 15,
@@ -772,7 +816,7 @@ $result_trees{'subentries'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,7 +827,9 @@ $result_trees{'subentries'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -800,7 +846,7 @@ $result_trees{'subentries'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -811,7 +857,9 @@ $result_trees{'subentries'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -821,7 +869,8 @@ $result_trees{'subentries'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -922,6 +971,7 @@ $result_sectioning{'subentries'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -936,9 +986,11 @@ $result_sectioning{'subentries'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-index'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -971,6 +1023,7 @@ $result_nodes{'subentries'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -978,6 +1031,7 @@ $result_nodes{'subentries'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -985,6 +1039,7 @@ $result_nodes{'subentries'} = {
         'isindex' => 1,
         'normalized' => 'chapter-index'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1000,6 +1055,7 @@ $result_menus{'subentries'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index 3e8b01c7f7..cc506f90e9 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -24,7 +24,7 @@ $result_trees{'subentry_and_sortas'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'subentry_and_sortas'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'subentry_and_sortas'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +88,7 @@ $result_trees{'subentry_and_sortas'} = {
               'text' => 'chapter index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +109,9 @@ $result_trees{'subentry_and_sortas'} = {
             'normalized' => 'chapter-index'
           }
         ],
-        'normalized' => 'chapter-index',
+        'normalized' => 'chapter-index'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +128,7 @@ $result_trees{'subentry_and_sortas'} = {
               'text' => 'Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -168,7 +172,7 @@ $result_trees{'subentry_and_sortas'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -190,7 +194,6 @@ $result_trees{'subentry_and_sortas'} = {
               'sortas' => 'A---S'
             },
             'sortas' => 'A---S',
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -221,7 +224,7 @@ $result_trees{'subentry_and_sortas'} = {
                       'text' => 'bbb'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -231,7 +234,9 @@ $result_trees{'subentry_and_sortas'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'sortas' => 'B---S1',
+                'sortas' => 'B---S1'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -241,6 +246,9 @@ $result_trees{'subentry_and_sortas'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 7,
@@ -284,7 +292,7 @@ $result_trees{'subentry_and_sortas'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -306,7 +314,6 @@ $result_trees{'subentry_and_sortas'} = {
               'sortas' => 'X---S'
             },
             'sortas' => 'X---S',
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -337,7 +344,7 @@ $result_trees{'subentry_and_sortas'} = {
                       'text' => 'zzz'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -347,7 +354,9 @@ $result_trees{'subentry_and_sortas'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'sortas' => 'X---S1',
+                'sortas' => 'X---S1'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -357,6 +366,9 @@ $result_trees{'subentry_and_sortas'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 9,
@@ -378,7 +390,7 @@ $result_trees{'subentry_and_sortas'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -389,7 +401,9 @@ $result_trees{'subentry_and_sortas'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -406,7 +420,7 @@ $result_trees{'subentry_and_sortas'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -417,7 +431,9 @@ $result_trees{'subentry_and_sortas'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -427,7 +443,8 @@ $result_trees{'subentry_and_sortas'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -488,6 +505,7 @@ $result_sectioning{'subentry_and_sortas'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -502,9 +520,11 @@ $result_sectioning{'subentry_and_sortas'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-index'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -537,6 +557,7 @@ $result_nodes{'subentry_and_sortas'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -544,6 +565,7 @@ $result_nodes{'subentry_and_sortas'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -551,6 +573,7 @@ $result_nodes{'subentry_and_sortas'} = {
         'isindex' => 1,
         'normalized' => 'chapter-index'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -566,6 +589,7 @@ $result_menus{'subentry_and_sortas'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl 
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index df23befa28..2e2a925f33 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -24,7 +24,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +88,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'text' => 'chapter index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +109,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
             'normalized' => 'chapter-index'
           }
         ],
-        'normalized' => 'chapter-index',
+        'normalized' => 'chapter-index'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +128,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'text' => 'Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -187,7 +191,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'sortas' => 'A---S'
             },
             'sortas' => 'A---S',
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -214,7 +217,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                       'text' => 'bbb sort as c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -224,7 +227,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'sortas' => 'C---S1',
+                'sortas' => 'C---S1'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -234,6 +239,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 7,
@@ -250,7 +258,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -270,7 +278,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -294,7 +301,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -313,6 +320,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 8,
@@ -346,7 +356,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -355,7 +364,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                       'text' => 'bbb'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -364,7 +373,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -391,7 +399,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -401,7 +409,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   'cmdname' => 'subentry',
                   'extra' => {
                     'level' => 2,
-                    'sortas' => 'D',
+                    'sortas' => 'D'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -411,6 +421,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -418,6 +431,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 9,
@@ -435,7 +451,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -455,7 +471,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -470,7 +485,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               'cmdname' => 'subentry',
               'extra' => {
                 'level' => 1,
-                'spaces_before_argument' => ' ',
                 'subentry' => {
                   'args' => [
                     {
@@ -479,7 +493,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                           'text' => 'ccc'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -488,7 +502,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   ],
                   'cmdname' => 'subentry',
                   'extra' => {
-                    'level' => 2,
+                    'level' => 2
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -498,6 +514,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   }
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -505,6 +524,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 10,
@@ -527,7 +549,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -538,7 +560,9 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -548,7 +572,8 @@ $result_trees{'subentry_and_sortas_spaces'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -620,6 +645,7 @@ $result_sectioning{'subentry_and_sortas_spaces'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -634,9 +660,11 @@ $result_sectioning{'subentry_and_sortas_spaces'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-index'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -669,6 +697,7 @@ $result_nodes{'subentry_and_sortas_spaces'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -676,6 +705,7 @@ $result_nodes{'subentry_and_sortas_spaces'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -683,6 +713,7 @@ $result_nodes{'subentry_and_sortas_spaces'} = {
         'isindex' => 1,
         'normalized' => 'chapter-index'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -698,6 +729,7 @@ $result_menus{'subentry_and_sortas_spaces'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index 1738771a1d..41ddb12009 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -19,7 +19,7 @@ $result_trees{'syncode_index_print_both'} = {
                       'text' => 'fn cp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -31,7 +31,9 @@ $result_trees{'syncode_index_print_both'} = {
                 'misc_args' => [
                   'fn',
                   'cp'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -59,7 +61,7 @@ $result_trees{'syncode_index_print_both'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -79,7 +81,9 @@ $result_trees{'syncode_index_print_both'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -96,7 +100,7 @@ $result_trees{'syncode_index_print_both'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -111,7 +115,8 @@ $result_trees{'syncode_index_print_both'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -128,7 +133,7 @@ $result_trees{'syncode_index_print_both'} = {
               'text' => 'chapter index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -149,7 +154,9 @@ $result_trees{'syncode_index_print_both'} = {
             'normalized' => 'chapter-index'
           }
         ],
-        'normalized' => 'chapter-index',
+        'normalized' => 'chapter-index'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -166,7 +173,7 @@ $result_trees{'syncode_index_print_both'} = {
               'text' => 'index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -188,7 +195,7 @@ $result_trees{'syncode_index_print_both'} = {
                   'text' => 'c---oncept'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -208,7 +215,9 @@ $result_trees{'syncode_index_print_both'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -226,7 +235,7 @@ $result_trees{'syncode_index_print_both'} = {
                   'text' => 'f---un'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -246,7 +255,9 @@ $result_trees{'syncode_index_print_both'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -288,7 +299,7 @@ $result_trees{'syncode_index_print_both'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -299,7 +310,9 @@ $result_trees{'syncode_index_print_both'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -335,7 +348,7 @@ $result_trees{'syncode_index_print_both'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -346,7 +359,9 @@ $result_trees{'syncode_index_print_both'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -361,7 +376,8 @@ $result_trees{'syncode_index_print_both'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -437,9 +453,11 @@ $result_sectioning{'syncode_index_print_both'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -451,9 +469,11 @@ $result_sectioning{'syncode_index_print_both'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-index'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -482,10 +502,12 @@ $result_nodes{'syncode_index_print_both'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -493,6 +515,7 @@ $result_nodes{'syncode_index_print_both'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -500,6 +523,7 @@ $result_nodes{'syncode_index_print_both'} = {
         'isindex' => 1,
         'normalized' => 'chapter-index'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -515,6 +539,7 @@ $result_menus{'syncode_index_print_both'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index 73acfd7467..e7edbb5bb9 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -19,7 +19,7 @@ $result_trees{'syncodeindex_to_plain'} = {
                       'text' => 'ky cp'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -31,7 +31,9 @@ $result_trees{'syncodeindex_to_plain'} = {
                 'misc_args' => [
                   'ky',
                   'cp'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -59,7 +61,7 @@ $result_trees{'syncodeindex_to_plain'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -81,7 +83,7 @@ $result_trees{'syncodeindex_to_plain'} = {
                   'text' => '--k1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +103,9 @@ $result_trees{'syncodeindex_to_plain'} = {
               'index_ignore_chars' => {},
               'index_name' => 'ky',
               'index_type_command' => 'kindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -119,7 +123,7 @@ $result_trees{'syncodeindex_to_plain'} = {
                   'text' => '--v'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -139,7 +143,9 @@ $result_trees{'syncodeindex_to_plain'} = {
               'index_ignore_chars' => {},
               'index_name' => 'vr',
               'index_type_command' => 'vindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -157,7 +163,7 @@ $result_trees{'syncodeindex_to_plain'} = {
                   'text' => '--c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -177,7 +183,9 @@ $result_trees{'syncodeindex_to_plain'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -209,7 +217,7 @@ $result_trees{'syncodeindex_to_plain'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -220,7 +228,9 @@ $result_trees{'syncodeindex_to_plain'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -251,7 +261,7 @@ $result_trees{'syncodeindex_to_plain'} = {
                   'text' => 'vr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -262,7 +272,9 @@ $result_trees{'syncodeindex_to_plain'} = {
           'extra' => {
             'misc_args' => [
               'vr'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -285,7 +297,9 @@ $result_trees{'syncodeindex_to_plain'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -341,7 +355,8 @@ $result_nodes{'syncodeindex_to_plain'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'syncodeindex_to_plain'} = {
@@ -349,7 +364,8 @@ $result_menus{'syncodeindex_to_plain'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'syncodeindex_to_plain'} = [];
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index 6d5ae9e143..3a4c384548 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -51,7 +51,7 @@ $result_trees{'transparent_sort_chars'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -71,7 +71,9 @@ $result_trees{'transparent_sort_chars'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -83,7 +85,7 @@ $result_trees{'transparent_sort_chars'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +115,7 @@ $result_trees{'transparent_sort_chars'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -171,7 +173,7 @@ $result_trees{'transparent_sort_chars'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -193,7 +195,9 @@ $result_trees{'transparent_sort_chars'} = {
               },
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -211,7 +215,7 @@ $result_trees{'transparent_sort_chars'} = {
                   'text' => 'Source file format'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -233,7 +237,9 @@ $result_trees{'transparent_sort_chars'} = {
               },
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -251,7 +257,7 @@ $result_trees{'transparent_sort_chars'} = {
                   'text' => 'Semantic markup'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -273,7 +279,9 @@ $result_trees{'transparent_sort_chars'} = {
               },
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -296,7 +304,7 @@ $result_trees{'transparent_sort_chars'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -307,7 +315,9 @@ $result_trees{'transparent_sort_chars'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -330,7 +340,9 @@ $result_trees{'transparent_sort_chars'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -391,6 +403,7 @@ $result_sectioning{'transparent_sort_chars'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -415,6 +428,7 @@ $result_nodes{'transparent_sort_chars'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -422,6 +436,7 @@ $result_nodes{'transparent_sort_chars'} = {
         'isindex' => 1,
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -435,6 +450,7 @@ $result_menus{'transparent_sort_chars'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/indices/unknown_printindex.pl 
b/tp/t/results/indices/unknown_printindex.pl
index d9e7398227..0b0273478a 100644
--- a/tp/t/results/indices/unknown_printindex.pl
+++ b/tp/t/results/indices/unknown_printindex.pl
@@ -21,7 +21,7 @@ $result_trees{'unknown_printindex'} = {
             }
           ],
           'cmdname' => 'printindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/indices/unknown_synindex.pl 
b/tp/t/results/indices/unknown_synindex.pl
index 5cafded001..8ec6042a85 100644
--- a/tp/t/results/indices/unknown_synindex.pl
+++ b/tp/t/results/indices/unknown_synindex.pl
@@ -21,7 +21,7 @@ $result_trees{'unknown_synindex'} = {
             }
           ],
           'cmdname' => 'synindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/indices/unknown_then_known_index_entry.pl 
b/tp/t/results/indices/unknown_then_known_index_entry.pl
index 60966d41bf..bfc359114b 100644
--- a/tp/t/results/indices/unknown_then_known_index_entry.pl
+++ b/tp/t/results/indices/unknown_then_known_index_entry.pl
@@ -23,7 +23,7 @@ $result_trees{'unknown_then_known_index_entry'} = {
                       'text' => 'some'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -34,7 +34,9 @@ $result_trees{'unknown_then_known_index_entry'} = {
               'extra' => {
                 'misc_args' => [
                   'some'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -51,7 +53,7 @@ $result_trees{'unknown_then_known_index_entry'} = {
                       'text' => 'someindex entry.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -70,7 +72,9 @@ $result_trees{'unknown_then_known_index_entry'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'some',
                   'index_type_command' => 'someindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 8046271af5..7add569fd6 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -24,7 +24,7 @@ $result_trees{'w_lines_count'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'w_lines_count'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -57,7 +59,7 @@ $result_trees{'w_lines_count'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +132,7 @@ $result_trees{'w_lines_count'} = {
                   'text' => 'compilation-next-error'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -150,7 +152,9 @@ $result_trees{'w_lines_count'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -231,7 +235,9 @@ $result_trees{'w_lines_count'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -289,7 +295,8 @@ $result_sectioning{'w_lines_count'} = {
             'extra' => {
               'isindex' => 1,
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
         'structure' => {
@@ -313,7 +320,8 @@ $result_nodes{'w_lines_count'} = {
     },
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'w_lines_count'} = {
@@ -321,7 +329,8 @@ $result_menus{'w_lines_count'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'w_lines_count'} = [];
diff --git a/tp/t/results/indices/wrong_synindex.pl 
b/tp/t/results/indices/wrong_synindex.pl
index 01aaf0a680..e7b2acdf6a 100644
--- a/tp/t/results/indices/wrong_synindex.pl
+++ b/tp/t/results/indices/wrong_synindex.pl
@@ -17,7 +17,7 @@ $result_trees{'wrong_synindex'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'wrong_synindex'} = {
           'extra' => {
             'misc_args' => [
               'aaa'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -49,7 +51,7 @@ $result_trees{'wrong_synindex'} = {
             }
           ],
           'cmdname' => 'synindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/info_tests/anchor_and_spaces.pl 
b/tp/t/results/info_tests/anchor_and_spaces.pl
index b4dbfef23d..522c16b982 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -18,7 +18,7 @@ $result_trees{'anchor_and_spaces'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'anchor_and_spaces'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'anchor_and_spaces'} = {
               'text' => 'Element'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -176,7 +178,8 @@ $result_trees{'anchor_and_spaces'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -222,9 +225,11 @@ $result_sectioning{'anchor_and_spaces'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -242,17 +247,20 @@ $result_nodes{'anchor_and_spaces'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'anchor_and_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'anchor_and_spaces'} = [];
diff --git a/tp/t/results/info_tests/anchor_in_command.pl 
b/tp/t/results/info_tests/anchor_in_command.pl
index 237b5f7119..f243308fc0 100644
--- a/tp/t/results/info_tests/anchor_in_command.pl
+++ b/tp/t/results/info_tests/anchor_in_command.pl
@@ -18,7 +18,7 @@ $result_trees{'anchor_in_command'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -171,7 +171,9 @@ $result_trees{'anchor_in_command'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -204,14 +206,16 @@ $result_nodes{'anchor_in_command'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'anchor_in_command'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'anchor_in_command'} = [];
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 63020efeaf..93cdba4e70 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -39,7 +39,7 @@ $result_trees{'before_node_and_section'} = {
                           'text' => 'Top'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -59,7 +59,9 @@ $result_trees{'before_node_and_section'} = {
                         'normalized' => 'Top'
                       }
                     ],
-                    'normalized' => 'Top',
+                    'normalized' => 'Top'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -93,7 +95,7 @@ $result_trees{'before_node_and_section'} = {
                       'text' => 'index entry before anything'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -112,7 +114,9 @@ $result_trees{'before_node_and_section'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -194,7 +198,7 @@ $result_trees{'before_node_and_section'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -260,7 +264,7 @@ $result_trees{'before_node_and_section'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -269,9 +273,11 @@ $result_trees{'before_node_and_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -308,7 +314,7 @@ $result_trees{'before_node_and_section'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -405,7 +411,7 @@ $result_trees{'before_node_and_section'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -471,7 +477,7 @@ $result_trees{'before_node_and_section'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -480,9 +486,11 @@ $result_trees{'before_node_and_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -502,7 +510,8 @@ $result_trees{'before_node_and_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -519,7 +528,7 @@ $result_trees{'before_node_and_section'} = {
               'text' => 'node1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -540,7 +549,9 @@ $result_trees{'before_node_and_section'} = {
             'normalized' => 'node1'
           }
         ],
-        'normalized' => 'node1',
+        'normalized' => 'node1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -557,7 +568,7 @@ $result_trees{'before_node_and_section'} = {
               'text' => 'node1 chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -579,7 +590,7 @@ $result_trees{'before_node_and_section'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -590,7 +601,9 @@ $result_trees{'before_node_and_section'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -605,7 +618,8 @@ $result_trees{'before_node_and_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -692,9 +706,11 @@ $result_sectioning{'before_node_and_section'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -706,9 +722,11 @@ $result_sectioning{'before_node_and_section'} = {
                     'isindex' => 1,
                     'normalized' => 'node1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -737,6 +755,7 @@ $result_nodes{'before_node_and_section'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -746,6 +765,7 @@ $result_nodes{'before_node_and_section'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -753,6 +773,7 @@ $result_nodes{'before_node_and_section'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -760,6 +781,7 @@ $result_nodes{'before_node_and_section'} = {
         'isindex' => 1,
         'normalized' => 'node1'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -777,6 +799,7 @@ $result_menus{'before_node_and_section'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -784,6 +807,7 @@ $result_menus{'before_node_and_section'} = {
         'isindex' => 1,
         'normalized' => 'node1'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/info_tests/center_flush.pl 
b/tp/t/results/info_tests/center_flush.pl
index da26a1093c..f3c86c42ce 100644
--- a/tp/t/results/info_tests/center_flush.pl
+++ b/tp/t/results/info_tests/center_flush.pl
@@ -17,7 +17,7 @@ $result_trees{'center_flush'} = {
                   'text' => 'centered'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -25,7 +25,7 @@ $result_trees{'center_flush'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -42,7 +42,7 @@ $result_trees{'center_flush'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -156,7 +156,7 @@ $result_trees{'center_flush'} = {
                       'text' => 'flushleft'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -165,9 +165,11 @@ $result_trees{'center_flush'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushleft'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -189,7 +191,7 @@ $result_trees{'center_flush'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -338,7 +340,7 @@ $result_trees{'center_flush'} = {
                       'text' => 'flushright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -347,9 +349,11 @@ $result_trees{'center_flush'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl 
b/tp/t/results/info_tests/colon_in_index_entry.pl
index ad0fc95364..f028d5a552 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -18,7 +18,7 @@ $result_trees{'colon_in_index_entry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -40,7 +40,7 @@ $result_trees{'colon_in_index_entry'} = {
                   'text' => 'vr cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -52,7 +52,9 @@ $result_trees{'colon_in_index_entry'} = {
             'misc_args' => [
               'vr',
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -74,7 +76,7 @@ $result_trees{'colon_in_index_entry'} = {
                   'text' => 'a:b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -94,7 +96,9 @@ $result_trees{'colon_in_index_entry'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -123,7 +127,7 @@ $result_trees{'colon_in_index_entry'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -144,7 +148,7 @@ $result_trees{'colon_in_index_entry'} = {
                               'text' => '%main::value'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -164,7 +168,9 @@ $result_trees{'colon_in_index_entry'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -187,7 +193,7 @@ $result_trees{'colon_in_index_entry'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -196,9 +202,11 @@ $result_trees{'colon_in_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -207,7 +215,9 @@ $result_trees{'colon_in_index_entry'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -453,7 +463,9 @@ $result_trees{'colon_in_index_entry'} = {
                   'index_name' => 'vr',
                   'index_type_command' => 'defvr'
                 },
-                'original_def_cmdname' => 'defvrx',
+                'original_def_cmdname' => 'defvrx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -471,7 +483,7 @@ $result_trees{'colon_in_index_entry'} = {
                       'text' => 'defvr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -480,9 +492,11 @@ $result_trees{'colon_in_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -490,7 +504,7 @@ $result_trees{'colon_in_index_entry'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -512,7 +526,7 @@ $result_trees{'colon_in_index_entry'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -523,7 +537,9 @@ $result_trees{'colon_in_index_entry'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -546,7 +562,9 @@ $result_trees{'colon_in_index_entry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -615,7 +633,8 @@ $result_nodes{'colon_in_index_entry'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'colon_in_index_entry'} = {
@@ -623,7 +642,8 @@ $result_menus{'colon_in_index_entry'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'colon_in_index_entry'} = [];
diff --git a/tp/t/results/info_tests/colons_in_index_entries_and_node.pl 
b/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
index 13e800f153..10fa751c7c 100644
--- a/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
+++ b/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
@@ -18,7 +18,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -191,7 +191,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -200,9 +200,11 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -234,7 +236,9 @@ $result_trees{'colons_in_index_entries_and_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -288,7 +292,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'text' => ' with entries.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -310,7 +314,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'text' => ':'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -330,7 +334,9 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -348,7 +354,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'text' => ':a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -368,7 +374,9 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -386,7 +394,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'text' => 'b:c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -406,7 +414,9 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -424,7 +434,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -450,7 +460,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -459,9 +469,11 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -488,7 +500,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'text' => 'd::e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -508,7 +520,9 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -526,7 +540,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'text' => 'f :d'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -546,7 +560,9 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -564,7 +580,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'text' => 'g: h'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -584,7 +600,9 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -634,7 +652,9 @@ $result_trees{'colons_in_index_entries_and_node'} = {
             'normalized' => 'One_003a_003anode_002c-with-entries_002e'
           }
         ],
-        'normalized' => 'One_003a_003anode_002c-with-entries_002e',
+        'normalized' => 'One_003a_003anode_002c-with-entries_002e'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -651,7 +671,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               'text' => 'Concept Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -673,7 +693,7 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -684,7 +704,9 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -712,7 +734,9 @@ $result_trees{'colons_in_index_entries_and_node'} = {
             'normalized' => 'Concept-Index'
           }
         ],
-        'normalized' => 'Concept-Index',
+        'normalized' => 'Concept-Index'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -826,12 +850,14 @@ $result_nodes{'colons_in_index_entries_and_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'One_003a_003anode_002c-with-entries_002e'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -839,6 +865,7 @@ $result_nodes{'colons_in_index_entries_and_node'} = {
             'isindex' => 1,
             'normalized' => 'Concept-Index'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -862,12 +889,14 @@ $result_menus{'colons_in_index_entries_and_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'One_003a_003anode_002c-with-entries_002e'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
@@ -875,6 +904,7 @@ $result_menus{'colons_in_index_entries_and_node'} = {
             'isindex' => 1,
             'normalized' => 'Concept-Index'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git 
a/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl 
b/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
index 37383d3b4b..f9301f21fb 100644
--- a/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
+++ b/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
@@ -18,7 +18,7 @@ $result_trees{'colons_in_index_entries_and_node_no_quoting'} 
= {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'colons_in_index_entries_and_node_no_quoting'} 
= {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -191,7 +191,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -200,9 +200,11 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -234,7 +236,9 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -288,7 +292,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'text' => ' with entries.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -310,7 +314,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'text' => ':'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -330,7 +334,9 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -348,7 +354,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'text' => ':a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -368,7 +374,9 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -386,7 +394,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'text' => 'b:c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -406,7 +414,9 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -424,7 +434,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -450,7 +460,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -459,9 +469,11 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -488,7 +500,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'text' => 'd::e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -508,7 +520,9 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -526,7 +540,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'text' => 'f :d'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -546,7 +560,9 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -564,7 +580,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'text' => 'g: h'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -584,7 +600,9 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -634,7 +652,9 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
             'normalized' => 'One_003a_003anode_002c-with-entries_002e'
           }
         ],
-        'normalized' => 'One_003a_003anode_002c-with-entries_002e',
+        'normalized' => 'One_003a_003anode_002c-with-entries_002e'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -651,7 +671,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               'text' => 'Concept Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -673,7 +693,7 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -684,7 +704,9 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -712,7 +734,9 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
             'normalized' => 'Concept-Index'
           }
         ],
-        'normalized' => 'Concept-Index',
+        'normalized' => 'Concept-Index'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -826,12 +850,14 @@ 
$result_nodes{'colons_in_index_entries_and_node_no_quoting'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'One_003a_003anode_002c-with-entries_002e'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -839,6 +865,7 @@ 
$result_nodes{'colons_in_index_entries_and_node_no_quoting'} = {
             'isindex' => 1,
             'normalized' => 'Concept-Index'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -862,12 +889,14 @@ 
$result_menus{'colons_in_index_entries_and_node_no_quoting'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'One_003a_003anode_002c-with-entries_002e'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
@@ -875,6 +904,7 @@ 
$result_menus{'colons_in_index_entries_and_node_no_quoting'} = {
             'isindex' => 1,
             'normalized' => 'Concept-Index'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index 3cd70eb58e..1f5cd871bc 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -46,7 +46,7 @@ $result_trees{'def_in_copying'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -55,9 +55,11 @@ $result_trees{'def_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -91,7 +93,7 @@ $result_trees{'def_in_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -112,7 +114,9 @@ $result_trees{'def_in_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -129,7 +133,7 @@ $result_trees{'def_in_copying'} = {
               'text' => 'Test for definition commands'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -146,7 +150,7 @@ $result_trees{'def_in_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -317,7 +321,9 @@ $result_trees{'def_in_copying'} = {
                       'index_name' => 'fn',
                       'index_type_command' => 'deffn'
                     },
-                    'original_def_cmdname' => 'deffnx',
+                    'original_def_cmdname' => 'deffnx'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -349,7 +355,7 @@ $result_trees{'def_in_copying'} = {
                           'text' => 'deffn'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -358,9 +364,11 @@ $result_trees{'def_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 13,
@@ -368,7 +376,7 @@ $result_trees{'def_in_copying'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -385,7 +393,7 @@ $result_trees{'def_in_copying'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -394,9 +402,11 @@ $result_trees{'def_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -577,7 +587,9 @@ $result_trees{'def_in_copying'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -609,7 +621,7 @@ $result_trees{'def_in_copying'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -618,9 +630,11 @@ $result_trees{'def_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -628,7 +642,7 @@ $result_trees{'def_in_copying'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -650,7 +664,7 @@ $result_trees{'def_in_copying'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -661,7 +675,9 @@ $result_trees{'def_in_copying'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -671,7 +687,8 @@ $result_trees{'def_in_copying'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -761,9 +778,11 @@ $result_sectioning{'def_in_copying'} = {
             'extra' => {
               'isindex' => 1,
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -781,11 +800,13 @@ $result_nodes{'def_in_copying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'def_in_copying'} = {
@@ -793,7 +814,8 @@ $result_menus{'def_in_copying'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'def_in_copying'} = [];
diff --git a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl 
b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
index 3e4888a4bf..b8f359ce0c 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -38,7 +38,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                   'text' => '?\'\''
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -46,7 +46,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
             }
           ],
           'cmdname' => 'dircategory',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -58,7 +58,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -163,7 +163,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                       'text' => 'direntry'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -172,9 +172,11 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -201,7 +203,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                   'text' => 'cat2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -209,7 +211,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
             }
           ],
           'cmdname' => 'dircategory',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -221,7 +223,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -315,7 +317,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                       'text' => 'direntry'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -324,9 +326,11 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -361,7 +365,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -381,7 +385,9 @@ $result_trees{'direntry_dircategory_and_commands'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -398,7 +404,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               'text' => 'Test dircategory and direntry'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -422,7 +428,8 @@ $result_trees{'direntry_dircategory_and_commands'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -488,9 +495,11 @@ $result_sectioning{'direntry_dircategory_and_commands'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -508,17 +517,20 @@ $result_nodes{'direntry_dircategory_and_commands'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'direntry_dircategory_and_commands'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'direntry_dircategory_and_commands'} = [];
diff --git a/tp/t/results/info_tests/empty_caption.pl 
b/tp/t/results/info_tests/empty_caption.pl
index dbc9d1809d..a0eff73c8e 100644
--- a/tp/t/results/info_tests/empty_caption.pl
+++ b/tp/t/results/info_tests/empty_caption.pl
@@ -25,7 +25,7 @@ $result_trees{'empty_caption'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -55,7 +55,7 @@ $result_trees{'empty_caption'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -102,7 +102,7 @@ $result_trees{'empty_caption'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -111,9 +111,11 @@ $result_trees{'empty_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -127,7 +129,6 @@ $result_trees{'empty_caption'} = {
               {}
             ],
             'normalized' => 'b',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -135,6 +136,9 @@ $result_trees{'empty_caption'} = {
               'normalized' => 'a'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 4,
@@ -154,7 +158,7 @@ $result_trees{'empty_caption'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -163,7 +167,6 @@ $result_trees{'empty_caption'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -171,6 +174,9 @@ $result_trees{'empty_caption'} = {
               'normalized' => 'a'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 9,
@@ -190,7 +196,9 @@ $result_trees{'empty_caption'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -233,14 +241,16 @@ $result_nodes{'empty_caption'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'empty_caption'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'empty_caption'} = [];
@@ -267,6 +277,7 @@ $result_floats{'empty_caption'} = {
           'normalized' => 'a'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/info_tests/empty_copying_not_ended.pl 
b/tp/t/results/info_tests/empty_copying_not_ended.pl
index 4d944ce7dc..89f430764a 100644
--- a/tp/t/results/info_tests/empty_copying_not_ended.pl
+++ b/tp/t/results/info_tests/empty_copying_not_ended.pl
@@ -17,7 +17,7 @@ $result_trees{'empty_copying_not_ended'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/info_tests/encoding_us_ascii.pl 
b/tp/t/results/info_tests/encoding_us_ascii.pl
index 5d21388aad..9a8e3b143e 100644
--- a/tp/t/results/info_tests/encoding_us_ascii.pl
+++ b/tp/t/results/info_tests/encoding_us_ascii.pl
@@ -22,7 +22,7 @@ $result_trees{'encoding_us_ascii'} = {
                   'text' => 'US-ASCII'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,9 +33,11 @@ $result_trees{'encoding_us_ascii'} = {
           'extra' => {
             'input_encoding_name' => 'us-ascii',
             'input_perl_encoding' => 'ascii',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'US-ASCII'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
@@ -58,7 +60,7 @@ $result_trees{'encoding_us_ascii'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -85,7 +87,9 @@ $result_trees{'encoding_us_ascii'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -117,14 +121,16 @@ $result_nodes{'encoding_us_ascii'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'encoding_us_ascii'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'encoding_us_ascii'} = [];
diff --git a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl 
b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
index 7727e38936..a515f4ced7 100644
--- a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
+++ b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
@@ -18,7 +18,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -70,7 +72,8 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -99,7 +102,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'text' => ' After punct'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -128,7 +131,9 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
             'normalized' => 'chap-f-nl-Something_003f-After-punct'
           }
         ],
-        'normalized' => 'chap-f-nl-Something_003f-After-punct',
+        'normalized' => 'chap-f-nl-Something_003f-After-punct'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -145,7 +150,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -241,7 +246,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'text' => ' b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -261,7 +266,9 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -284,7 +291,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -295,7 +302,9 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -310,7 +319,8 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -327,7 +337,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'text' => 'new n'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -347,7 +357,9 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
             'normalized' => 'new-n'
           }
         ],
-        'normalized' => 'new-n',
+        'normalized' => 'new-n'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -364,7 +376,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               'text' => 'Ochap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -514,7 +526,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                       'text' => 'gg'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -553,7 +565,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -836,7 +848,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -845,9 +857,11 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -862,7 +876,8 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1009,9 +1024,11 @@ $result_sectioning{'end_of_line_command_in_node_lines'} 
= {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1023,9 +1040,11 @@ $result_sectioning{'end_of_line_command_in_node_lines'} 
= {
                     'isindex' => 1,
                     'normalized' => 'chap-f-nl-Something_003f-After-punct'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1042,9 +1061,11 @@ $result_sectioning{'end_of_line_command_in_node_lines'} 
= {
                   'extra' => {
                     'normalized' => 'new-n'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1078,10 +1099,12 @@ $result_nodes{'end_of_line_command_in_node_lines'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1089,6 +1112,7 @@ $result_nodes{'end_of_line_command_in_node_lines'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1096,6 +1120,7 @@ $result_nodes{'end_of_line_command_in_node_lines'} = {
         'isindex' => 1,
         'normalized' => 'chap-f-nl-Something_003f-After-punct'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1103,6 +1128,7 @@ $result_nodes{'end_of_line_command_in_node_lines'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
@@ -1114,6 +1140,7 @@ $result_nodes{'end_of_line_command_in_node_lines'} = {
             ],
             'normalized' => 'new-n'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {},
             'node_prev' => {},
@@ -1137,6 +1164,7 @@ $result_menus{'end_of_line_command_in_node_lines'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index b0d1e4335c..5ce123b7ef 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -25,7 +25,7 @@ $result_trees{'error_in_footnote'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -55,7 +55,7 @@ $result_trees{'error_in_footnote'} = {
                   'text' => 'label'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -218,7 +218,7 @@ $result_trees{'error_in_footnote'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -227,9 +227,11 @@ $result_trees{'error_in_footnote'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -243,7 +245,6 @@ $result_trees{'error_in_footnote'} = {
               {}
             ],
             'normalized' => 'label',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -251,6 +252,9 @@ $result_trees{'error_in_footnote'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 4,
@@ -270,7 +274,7 @@ $result_trees{'error_in_footnote'} = {
                   'text' => 'Text'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -279,7 +283,6 @@ $result_trees{'error_in_footnote'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -287,6 +290,9 @@ $result_trees{'error_in_footnote'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 14,
@@ -306,7 +312,7 @@ $result_trees{'error_in_footnote'} = {
                   'text' => 'Text'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -315,7 +321,6 @@ $result_trees{'error_in_footnote'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -323,6 +328,9 @@ $result_trees{'error_in_footnote'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 16,
@@ -342,7 +350,9 @@ $result_trees{'error_in_footnote'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -397,14 +407,16 @@ $result_nodes{'error_in_footnote'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'error_in_footnote'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'error_in_footnote'} = [
@@ -450,6 +462,7 @@ $result_floats{'error_in_footnote'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/info_tests/file_only_png.pl 
b/tp/t/results/info_tests/file_only_png.pl
index fb264e62cd..15dc461b91 100644
Binary files a/tp/t/results/info_tests/file_only_png.pl and 
b/tp/t/results/info_tests/file_only_png.pl differ
diff --git a/tp/t/results/info_tests/float_long_captions.pl 
b/tp/t/results/info_tests/float_long_captions.pl
index b4671d513a..0b6d407fe1 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -18,7 +18,7 @@ $result_trees{'float_long_captions'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -48,7 +48,7 @@ $result_trees{'float_long_captions'} = {
                   'text' => 'text1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -96,7 +96,7 @@ $result_trees{'float_long_captions'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -105,9 +105,11 @@ $result_trees{'float_long_captions'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -121,7 +123,6 @@ $result_trees{'float_long_captions'} = {
               {}
             ],
             'normalized' => 'text1',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -129,6 +130,9 @@ $result_trees{'float_long_captions'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
@@ -156,7 +160,7 @@ $result_trees{'float_long_captions'} = {
                   'text' => 'text2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -204,7 +208,7 @@ $result_trees{'float_long_captions'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -213,9 +217,11 @@ $result_trees{'float_long_captions'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -229,7 +235,6 @@ $result_trees{'float_long_captions'} = {
               {}
             ],
             'normalized' => 'text2',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -237,6 +242,9 @@ $result_trees{'float_long_captions'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 7,
@@ -256,7 +264,7 @@ $result_trees{'float_long_captions'} = {
                   'text' => 'Text'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -265,7 +273,6 @@ $result_trees{'float_long_captions'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -273,6 +280,9 @@ $result_trees{'float_long_captions'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 11,
@@ -292,7 +302,9 @@ $result_trees{'float_long_captions'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -343,14 +355,16 @@ $result_nodes{'float_long_captions'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'float_long_captions'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'float_long_captions'} = [];
@@ -377,6 +391,7 @@ $result_floats{'float_long_captions'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
@@ -400,6 +415,7 @@ $result_floats{'float_long_captions'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 2
       }
diff --git a/tp/t/results/info_tests/float_without_type.pl 
b/tp/t/results/info_tests/float_without_type.pl
index e257276451..b07ff5ee70 100644
--- a/tp/t/results/info_tests/float_without_type.pl
+++ b/tp/t/results/info_tests/float_without_type.pl
@@ -25,7 +25,7 @@ $result_trees{'float_without_type'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -50,7 +50,7 @@ $result_trees{'float_without_type'} = {
               'type' => 'block_line_arg'
             },
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -76,7 +76,7 @@ $result_trees{'float_without_type'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -85,9 +85,11 @@ $result_trees{'float_without_type'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -96,7 +98,6 @@ $result_trees{'float_without_type'} = {
             }
           ],
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -104,6 +105,9 @@ $result_trees{'float_without_type'} = {
               'normalized' => 'a'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 4,
@@ -123,7 +127,7 @@ $result_trees{'float_without_type'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -132,7 +136,6 @@ $result_trees{'float_without_type'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -140,6 +143,9 @@ $result_trees{'float_without_type'} = {
               'normalized' => 'a'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 8,
@@ -159,7 +165,9 @@ $result_trees{'float_without_type'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -198,14 +206,16 @@ $result_nodes{'float_without_type'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'float_without_type'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'float_without_type'} = [];
@@ -224,7 +234,8 @@ $result_floats{'float_without_type'} = {
           ],
           'normalized' => 'a'
         }
-      }
+      },
+      'info' => {}
     }
   ]
 };
diff --git a/tp/t/results/info_tests/image_and_punctuation.pl 
b/tp/t/results/info_tests/image_and_punctuation.pl
index 7d57a42c65..2ceea1673f 100644
Binary files a/tp/t/results/info_tests/image_and_punctuation.pl and 
b/tp/t/results/info_tests/image_and_punctuation.pl differ
diff --git a/tp/t/results/info_tests/image_and_spaces_formatting.pl 
b/tp/t/results/info_tests/image_and_spaces_formatting.pl
index 6deca3e425..6e7566734d 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -18,7 +18,7 @@ $result_trees{'image_and_spaces_formatting'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -721,7 +721,9 @@ $result_trees{'image_and_spaces_formatting'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -772,14 +774,16 @@ $result_nodes{'image_and_spaces_formatting'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'image_and_spaces_formatting'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'image_and_spaces_formatting'} = [];
diff --git a/tp/t/results/info_tests/image_extension.pl 
b/tp/t/results/info_tests/image_extension.pl
index e00d88309b..0a858771b9 100644
Binary files a/tp/t/results/info_tests/image_extension.pl and 
b/tp/t/results/info_tests/image_extension.pl differ
diff --git a/tp/t/results/info_tests/image_in_paragraph.pl 
b/tp/t/results/info_tests/image_in_paragraph.pl
index fa73c670cf..0399ff4314 100644
Binary files a/tp/t/results/info_tests/image_in_paragraph.pl and 
b/tp/t/results/info_tests/image_in_paragraph.pl differ
diff --git a/tp/t/results/info_tests/image_not_found.pl 
b/tp/t/results/info_tests/image_not_found.pl
index 3e99b22d6e..c68a2e534b 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -18,7 +18,7 @@ $result_trees{'image_not_found'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -65,7 +65,9 @@ $result_trees{'image_not_found'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -92,14 +94,16 @@ $result_nodes{'image_not_found'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'image_not_found'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'image_not_found'} = [];
diff --git a/tp/t/results/info_tests/image_quotes.pl 
b/tp/t/results/info_tests/image_quotes.pl
index 34f6b0de1d..102bf78043 100644
Binary files a/tp/t/results/info_tests/image_quotes.pl and 
b/tp/t/results/info_tests/image_quotes.pl differ
diff --git a/tp/t/results/info_tests/image_text_encoded.pl 
b/tp/t/results/info_tests/image_text_encoded.pl
index 6b969077f0..da95e7ba34 100644
--- a/tp/t/results/info_tests/image_text_encoded.pl
+++ b/tp/t/results/info_tests/image_text_encoded.pl
@@ -17,7 +17,7 @@ $result_trees{'image_text_encoded'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'image_text_encoded'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/info_tests/index_entry_at_end_node.pl 
b/tp/t/results/info_tests/index_entry_at_end_node.pl
index cc4b840d3e..c6a2559c6d 100644
--- a/tp/t/results/info_tests/index_entry_at_end_node.pl
+++ b/tp/t/results/info_tests/index_entry_at_end_node.pl
@@ -18,7 +18,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'index_entry_at_end_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'text' => 'Element'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -77,7 +79,7 @@ $result_trees{'index_entry_at_end_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -192,7 +194,7 @@ $result_trees{'index_entry_at_end_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -201,9 +203,11 @@ $result_trees{'index_entry_at_end_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -223,7 +227,8 @@ $result_trees{'index_entry_at_end_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -240,7 +245,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -260,7 +265,9 @@ $result_trees{'index_entry_at_end_node'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -277,7 +284,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -309,7 +316,7 @@ $result_trees{'index_entry_at_end_node'} = {
                   'text' => 'index entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -329,7 +336,9 @@ $result_trees{'index_entry_at_end_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -345,7 +354,8 @@ $result_trees{'index_entry_at_end_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -362,7 +372,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'text' => 'indices'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -383,7 +393,9 @@ $result_trees{'index_entry_at_end_node'} = {
             'normalized' => 'indices'
           }
         ],
-        'normalized' => 'indices',
+        'normalized' => 'indices'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -400,7 +412,7 @@ $result_trees{'index_entry_at_end_node'} = {
               'text' => 'indices'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -422,7 +434,7 @@ $result_trees{'index_entry_at_end_node'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -433,7 +445,9 @@ $result_trees{'index_entry_at_end_node'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -443,7 +457,8 @@ $result_trees{'index_entry_at_end_node'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -522,9 +537,11 @@ $result_sectioning{'index_entry_at_end_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -535,9 +552,11 @@ $result_sectioning{'index_entry_at_end_node'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -555,9 +574,11 @@ $result_sectioning{'index_entry_at_end_node'} = {
                     'isindex' => 1,
                     'normalized' => 'indices'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 'A',
@@ -591,6 +612,7 @@ $result_nodes{'index_entry_at_end_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -600,6 +622,7 @@ $result_nodes{'index_entry_at_end_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -607,12 +630,14 @@ $result_nodes{'index_entry_at_end_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -620,6 +645,7 @@ $result_nodes{'index_entry_at_end_node'} = {
             'associated_section' => {
               'cmdname' => 'appendix',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 'A'
               }
@@ -627,6 +653,7 @@ $result_nodes{'index_entry_at_end_node'} = {
             'isindex' => 1,
             'normalized' => 'indices'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -650,12 +677,14 @@ $result_menus{'index_entry_at_end_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
@@ -663,6 +692,7 @@ $result_menus{'index_entry_at_end_node'} = {
             'isindex' => 1,
             'normalized' => 'indices'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/info_tests/invalid_node_name_no_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_no_warning.pl
index dab4c9654f..b0fe3b6db8 100644
--- a/tp/t/results/info_tests/invalid_node_name_no_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_no_warning.pl
@@ -25,7 +25,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -42,7 +42,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -291,7 +291,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -300,9 +300,11 @@ $result_trees{'invalid_node_name_no_warning'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -334,7 +336,9 @@ $result_trees{'invalid_node_name_no_warning'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -366,7 +370,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -393,7 +397,9 @@ $result_trees{'invalid_node_name_no_warning'} = {
             'normalized' => 'nodename_002e-a'
           }
         ],
-        'normalized' => 'nodename_002e-a',
+        'normalized' => 'nodename_002e-a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -426,7 +432,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               'text' => 'comma'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -457,7 +463,9 @@ $result_trees{'invalid_node_name_no_warning'} = {
             'normalized' => 'node_002ccomma'
           }
         ],
-        'normalized' => 'node_002ccomma',
+        'normalized' => 'node_002ccomma'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -489,7 +497,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -551,7 +559,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -608,7 +616,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'text' => 'machin'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -698,7 +706,9 @@ $result_trees{'invalid_node_name_no_warning'} = {
             'normalized' => 'bidule_003a'
           }
         ],
-        'normalized' => 'bidule_003a',
+        'normalized' => 'bidule_003a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -785,24 +795,28 @@ $result_nodes{'invalid_node_name_no_warning'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'nodename_002e-a'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'node_002ccomma'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'bidule_003a'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -832,24 +846,28 @@ $result_menus{'invalid_node_name_no_warning'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'nodename_002e-a'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'node_002ccomma'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'bidule_003a'
               },
+              'info' => {},
               'structure' => {
                 'menu_prev' => {},
                 'menu_up' => {},
diff --git a/tp/t/results/info_tests/invalid_node_name_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_warning.pl
index f0ec452cf1..33a3b8b404 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -25,7 +25,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -42,7 +42,7 @@ $result_trees{'invalid_node_name_warning'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -291,7 +291,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -300,9 +300,11 @@ $result_trees{'invalid_node_name_warning'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -334,7 +336,9 @@ $result_trees{'invalid_node_name_warning'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -366,7 +370,7 @@ $result_trees{'invalid_node_name_warning'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -393,7 +397,9 @@ $result_trees{'invalid_node_name_warning'} = {
             'normalized' => 'nodename_002e-a'
           }
         ],
-        'normalized' => 'nodename_002e-a',
+        'normalized' => 'nodename_002e-a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -426,7 +432,7 @@ $result_trees{'invalid_node_name_warning'} = {
               'text' => 'comma'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -457,7 +463,9 @@ $result_trees{'invalid_node_name_warning'} = {
             'normalized' => 'node_002ccomma'
           }
         ],
-        'normalized' => 'node_002ccomma',
+        'normalized' => 'node_002ccomma'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -489,7 +497,7 @@ $result_trees{'invalid_node_name_warning'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -551,7 +559,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -608,7 +616,7 @@ $result_trees{'invalid_node_name_warning'} = {
                       'text' => 'machin'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -698,7 +706,9 @@ $result_trees{'invalid_node_name_warning'} = {
             'normalized' => 'bidule_003a'
           }
         ],
-        'normalized' => 'bidule_003a',
+        'normalized' => 'bidule_003a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -785,24 +795,28 @@ $result_nodes{'invalid_node_name_warning'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'nodename_002e-a'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'node_002ccomma'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'bidule_003a'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -832,24 +846,28 @@ $result_menus{'invalid_node_name_warning'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'nodename_002e-a'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'node_002ccomma'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'bidule_003a'
               },
+              'info' => {},
               'structure' => {
                 'menu_prev' => {},
                 'menu_up' => {},
diff --git a/tp/t/results/info_tests/known_encoding.pl 
b/tp/t/results/info_tests/known_encoding.pl
index e916aefd82..3c26f437c9 100644
--- a/tp/t/results/info_tests/known_encoding.pl
+++ b/tp/t/results/info_tests/known_encoding.pl
@@ -22,7 +22,7 @@ $result_trees{'known_encoding'} = {
                   'text' => 'latin1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,9 +33,11 @@ $result_trees{'known_encoding'} = {
           'extra' => {
             'input_encoding_name' => 'iso-8859-1',
             'input_perl_encoding' => 'iso-8859-1',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'latin1'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
@@ -58,7 +60,7 @@ $result_trees{'known_encoding'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -85,7 +87,9 @@ $result_trees{'known_encoding'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -117,14 +121,16 @@ $result_nodes{'known_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'known_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'known_encoding'} = [
diff --git a/tp/t/results/info_tests/multiline_image_and_align.pl 
b/tp/t/results/info_tests/multiline_image_and_align.pl
index d0aa2e445b..82b25fc331 100644
--- a/tp/t/results/info_tests/multiline_image_and_align.pl
+++ b/tp/t/results/info_tests/multiline_image_and_align.pl
@@ -35,7 +35,7 @@ $result_trees{'multiline_image_and_align'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -86,7 +86,7 @@ $result_trees{'multiline_image_and_align'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -94,7 +94,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -137,7 +137,7 @@ $result_trees{'multiline_image_and_align'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -145,7 +145,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -191,7 +191,7 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => ' iiiii'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -199,7 +199,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -216,7 +216,7 @@ $result_trees{'multiline_image_and_align'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -368,7 +368,7 @@ $result_trees{'multiline_image_and_align'} = {
                       'text' => 'flushright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -377,9 +377,11 @@ $result_trees{'multiline_image_and_align'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -413,19 +415,19 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -450,7 +452,7 @@ $result_trees{'multiline_image_and_align'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -458,7 +460,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -490,19 +492,19 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -527,7 +529,7 @@ $result_trees{'multiline_image_and_align'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -535,7 +537,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -567,19 +569,19 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -604,7 +606,7 @@ $result_trees{'multiline_image_and_align'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -612,7 +614,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -644,19 +646,19 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -684,7 +686,7 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => ' iiiii'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -692,7 +694,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -709,7 +711,7 @@ $result_trees{'multiline_image_and_align'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -735,19 +737,19 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -799,19 +801,19 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -849,19 +851,19 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -914,19 +916,19 @@ $result_trees{'multiline_image_and_align'} = {
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -965,7 +967,7 @@ $result_trees{'multiline_image_and_align'} = {
                       'text' => 'flushright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -974,9 +976,11 @@ $result_trees{'multiline_image_and_align'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
diff --git a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl 
b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
index 4961fc6a63..f5eef2464a 100644
--- a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
+++ b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
@@ -18,7 +18,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                           'text' => '0.4 0.6'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -56,7 +56,9 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                     'misc_args' => [
                       '0.4',
                       '0.6'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -260,7 +262,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                                       'text' => 'index entry within multitable'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -280,7 +282,9 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
                                   'index_type_command' => 'cindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -383,7 +387,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -392,9 +396,11 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -404,7 +410,9 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -442,7 +450,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -558,7 +566,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                                       'text' => 'index entry'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -578,7 +586,9 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
                                   'index_type_command' => 'cindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -733,7 +743,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -742,9 +752,11 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -767,7 +779,9 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -789,7 +803,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -800,7 +814,9 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -890,7 +906,9 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -987,7 +1005,8 @@ $result_nodes{'multitable_anchor_and_index_entry'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'multitable_anchor_and_index_entry'} = {
@@ -995,7 +1014,8 @@ $result_menus{'multitable_anchor_and_index_entry'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'multitable_anchor_and_index_entry'} = [];
diff --git a/tp/t/results/info_tests/nested_footnotes_separate.pl 
b/tp/t/results/info_tests/nested_footnotes_separate.pl
index 3bb5d2abcb..4450af8fef 100644
--- a/tp/t/results/info_tests/nested_footnotes_separate.pl
+++ b/tp/t/results/info_tests/nested_footnotes_separate.pl
@@ -17,7 +17,7 @@ $result_trees{'nested_footnotes_separate'} = {
                   'text' => 'separate'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'nested_footnotes_separate'} = {
           'extra' => {
             'misc_args' => [
               'separate'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -48,7 +50,7 @@ $result_trees{'nested_footnotes_separate'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -151,7 +153,9 @@ $result_trees{'nested_footnotes_separate'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,14 +188,16 @@ $result_nodes{'nested_footnotes_separate'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'nested_footnotes_separate'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'nested_footnotes_separate'} = [];
diff --git a/tp/t/results/info_tests/nested_multitable_anchor_index.pl 
b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index 7866af38cb..49269a2d0b 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -18,7 +18,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -56,7 +56,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +101,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                   'type' => 'bracketed'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -188,7 +188,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                                       'text' => 'index entry 
inside'
                                                     }
                                                   ],
-                                                  'extra' => {
+                                                  'info' => {
                                                     'spaces_after_argument' => 
'
 '
                                                   },
@@ -208,7 +208,9 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                                   'index_ignore_chars' => {},
                                                   'index_name' => 'cp',
                                                   'index_type_command' => 
'cindex'
-                                                },
+                                                }
+                                              },
+                                              'info' => {
                                                 'spaces_before_argument' => ' '
                                               },
                                               'source_info' => {
@@ -248,7 +250,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                       'text' => 'multitable'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -257,9 +259,11 @@ $result_trees{'nested_multitable_anchor_index'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'multitable'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 8,
@@ -282,7 +286,9 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                 ],
                                 'type' => 'bracketed_multitable_prototype'
                               }
-                            ],
+                            ]
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -413,7 +419,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                       'text' => 'index entry'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -433,7 +439,9 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
                                   'index_type_command' => 'cindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -473,7 +481,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -482,9 +490,11 @@ $result_trees{'nested_multitable_anchor_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -507,7 +517,9 @@ $result_trees{'nested_multitable_anchor_index'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -529,7 +541,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -540,7 +552,9 @@ $result_trees{'nested_multitable_anchor_index'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -635,7 +649,9 @@ $result_trees{'nested_multitable_anchor_index'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -701,7 +717,8 @@ $result_nodes{'nested_multitable_anchor_index'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'nested_multitable_anchor_index'} = {
@@ -709,7 +726,8 @@ $result_menus{'nested_multitable_anchor_index'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'nested_multitable_anchor_index'} = [];
diff --git a/tp/t/results/info_tests/no_node_but_top.pl 
b/tp/t/results/info_tests/no_node_but_top.pl
index e9e7f5f372..e930ea55bf 100644
--- a/tp/t/results/info_tests/no_node_but_top.pl
+++ b/tp/t/results/info_tests/no_node_but_top.pl
@@ -18,7 +18,7 @@ $result_trees{'no_node_but_top'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -26,7 +26,7 @@ $result_trees{'no_node_but_top'} = {
         }
       ],
       'cmdname' => 'top',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -52,7 +52,7 @@ $result_sectioning{'no_node_but_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
diff --git a/tp/t/results/info_tests/no_top_node.pl 
b/tp/t/results/info_tests/no_top_node.pl
index 284a911ad2..7328daa17d 100644
--- a/tp/t/results/info_tests/no_top_node.pl
+++ b/tp/t/results/info_tests/no_top_node.pl
@@ -18,7 +18,7 @@ $result_trees{'no_top_node'} = {
               'text' => 'node Top not Top node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'no_top_node'} = {
             'normalized' => 'node-Top-not-Top-node'
           }
         ],
-        'normalized' => 'node-Top-not-Top-node',
+        'normalized' => 'node-Top-not-Top-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -63,14 +65,16 @@ $result_nodes{'no_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'node-Top-not-Top-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'no_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'node-Top-not-Top-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'no_top_node'} = [];
diff --git a/tp/t/results/info_tests/note_in_strong.pl 
b/tp/t/results/info_tests/note_in_strong.pl
index 85c665465f..f95d79c5e3 100644
--- a/tp/t/results/info_tests/note_in_strong.pl
+++ b/tp/t/results/info_tests/note_in_strong.pl
@@ -18,7 +18,7 @@ $result_trees{'note_in_strong'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -260,7 +260,9 @@ $result_trees{'note_in_strong'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -313,14 +315,16 @@ $result_nodes{'note_in_strong'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'note_in_strong'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'note_in_strong'} = [];
diff --git a/tp/t/results/info_tests/note_in_strong_end_of_line.pl 
b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
index 9c4bacd255..160ef7e8dc 100644
--- a/tp/t/results/info_tests/note_in_strong_end_of_line.pl
+++ b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
@@ -18,7 +18,7 @@ $result_trees{'note_in_strong_end_of_line'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -114,7 +114,9 @@ $result_trees{'note_in_strong_end_of_line'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -149,14 +151,16 @@ $result_nodes{'note_in_strong_end_of_line'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'note_in_strong_end_of_line'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'note_in_strong_end_of_line'} = [];
diff --git a/tp/t/results/info_tests/novalidate_empty_refs.pl 
b/tp/t/results/info_tests/novalidate_empty_refs.pl
index d173d81f02..b0f9eacd63 100644
--- a/tp/t/results/info_tests/novalidate_empty_refs.pl
+++ b/tp/t/results/info_tests/novalidate_empty_refs.pl
@@ -45,7 +45,7 @@ $result_trees{'novalidate_empty_refs'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -157,7 +157,9 @@ $result_trees{'novalidate_empty_refs'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -187,7 +189,9 @@ $result_trees{'novalidate_empty_refs'} = {
             ],
             'normalized' => '-'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -204,7 +208,7 @@ $result_trees{'novalidate_empty_refs'} = {
               'cmdname' => ':'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -220,7 +224,9 @@ $result_trees{'novalidate_empty_refs'} = {
             ],
             'normalized' => ''
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -252,7 +258,7 @@ $result_trees{'novalidate_empty_refs'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -268,7 +274,9 @@ $result_trees{'novalidate_empty_refs'} = {
             ],
             'normalized' => '-'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -314,14 +322,16 @@ $result_nodes{'novalidate_empty_refs'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'novalidate_empty_refs'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'novalidate_empty_refs'} = [
diff --git a/tp/t/results/info_tests/only_documentencoding.pl 
b/tp/t/results/info_tests/only_documentencoding.pl
index 42c6e51680..0b9444ca46 100644
--- a/tp/t/results/info_tests/only_documentencoding.pl
+++ b/tp/t/results/info_tests/only_documentencoding.pl
@@ -24,9 +24,11 @@ $result_trees{'only_documentencoding'} = {
           'extra' => {
             'input_encoding_name' => 'iso-8859-1',
             'input_perl_encoding' => 'iso-8859-1',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ISO-8859-1'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index c1a8a5ee78..981220d98f 100644
--- a/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -14,7 +14,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -54,7 +54,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -63,9 +63,11 @@ $result_trees{'paragraphindent_and_preamble'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -92,7 +94,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
                       'text' => '1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -103,7 +105,9 @@ $result_trees{'paragraphindent_and_preamble'} = {
               'extra' => {
                 'misc_args' => [
                   '1'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -145,7 +149,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -165,7 +169,9 @@ $result_trees{'paragraphindent_and_preamble'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -188,7 +194,7 @@ $result_trees{'paragraphindent_and_preamble'} = {
               'text' => 'paragraphindent in preamble effect in preamble'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -231,7 +237,8 @@ $result_trees{'paragraphindent_and_preamble'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -300,9 +307,11 @@ $result_sectioning{'paragraphindent_and_preamble'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -320,17 +329,20 @@ $result_nodes{'paragraphindent_and_preamble'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'paragraphindent_and_preamble'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'paragraphindent_and_preamble'} = [];
diff --git a/tp/t/results/info_tests/paragraphindent_asis_first.pl 
b/tp/t/results/info_tests/paragraphindent_asis_first.pl
index e920bf467c..02b345c17c 100644
--- a/tp/t/results/info_tests/paragraphindent_asis_first.pl
+++ b/tp/t/results/info_tests/paragraphindent_asis_first.pl
@@ -40,7 +40,7 @@ $result_trees{'paragraphindent_asis_first'} = {
                   'text' => 'asis'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -51,7 +51,9 @@ $result_trees{'paragraphindent_asis_first'} = {
           'extra' => {
             'misc_args' => [
               'asis'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl 
b/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
index 380d2fd1ff..50ed8ed733 100644
--- a/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
+++ b/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
@@ -14,7 +14,7 @@ $result_trees{'paragraphindent_in_preamble_and_in_document'} 
= {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -54,7 +54,7 @@ $result_trees{'paragraphindent_in_preamble_and_in_document'} 
= {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -63,9 +63,11 @@ $result_trees{'paragraphindent_in_preamble_and_in_document'} 
= {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -92,7 +94,7 @@ $result_trees{'paragraphindent_in_preamble_and_in_document'} 
= {
                       'text' => '1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -103,7 +105,9 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
               'extra' => {
                 'misc_args' => [
                   '1'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -145,7 +149,7 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -165,7 +169,9 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -188,7 +194,7 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
               'text' => 'paragraphindent in preamble effect in preamble'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -238,7 +244,7 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
                   'text' => '3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -249,7 +255,9 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
           'extra' => {
             'misc_args' => [
               '3'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -278,7 +286,8 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -354,9 +363,11 @@ 
$result_sectioning{'paragraphindent_in_preamble_and_in_document'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -374,17 +385,20 @@ 
$result_nodes{'paragraphindent_in_preamble_and_in_document'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'paragraphindent_in_preamble_and_in_document'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'paragraphindent_in_preamble_and_in_document'} = [];
diff --git a/tp/t/results/info_tests/paragraphindent_none_first.pl 
b/tp/t/results/info_tests/paragraphindent_none_first.pl
index 4b4d61bb5e..406c863368 100644
--- a/tp/t/results/info_tests/paragraphindent_none_first.pl
+++ b/tp/t/results/info_tests/paragraphindent_none_first.pl
@@ -58,7 +58,7 @@ $result_trees{'paragraphindent_none_first'} = {
                   'text' => 'none'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -69,7 +69,9 @@ $result_trees{'paragraphindent_none_first'} = {
           'extra' => {
             'misc_args' => [
               'none'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
index dd92663afb..1af7f2a799 100644
--- a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
@@ -14,7 +14,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -54,7 +54,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -63,9 +63,11 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -98,7 +100,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -118,7 +120,9 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -141,7 +145,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
               'text' => 'paragraphindent effect in preamble'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -191,7 +195,7 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -202,7 +206,9 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
           'extra' => {
             'misc_args' => [
               '1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -231,7 +237,8 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -300,9 +307,11 @@ $result_sectioning{'paragraphindent_not_in_preamble'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -320,17 +329,20 @@ $result_nodes{'paragraphindent_not_in_preamble'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'paragraphindent_not_in_preamble'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'paragraphindent_not_in_preamble'} = [];
diff --git a/tp/t/results/info_tests/pxref_test.pl 
b/tp/t/results/info_tests/pxref_test.pl
index 10f3bcafde..3b92c7d5ed 100644
--- a/tp/t/results/info_tests/pxref_test.pl
+++ b/tp/t/results/info_tests/pxref_test.pl
@@ -18,7 +18,7 @@ $result_trees{'pxref_test'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -108,7 +108,7 @@ $result_trees{'pxref_test'} = {
                       'text' => 'name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -206,7 +206,7 @@ $result_trees{'pxref_test'} = {
                       'text' => 'name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -249,7 +249,9 @@ $result_trees{'pxref_test'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -288,14 +290,16 @@ $result_nodes{'pxref_test'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'pxref_test'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'pxref_test'} = [];
diff --git a/tp/t/results/info_tests/quote_node_names_info.pl 
b/tp/t/results/info_tests/quote_node_names_info.pl
index 31986350b0..3bc74eb7f8 100644
--- a/tp/t/results/info_tests/quote_node_names_info.pl
+++ b/tp/t/results/info_tests/quote_node_names_info.pl
@@ -24,7 +24,7 @@ $result_trees{'quote_node_names_info'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'quote_node_names_info'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'quote_node_names_info'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'the::caption and a word'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -137,7 +139,7 @@ $result_trees{'quote_node_names_info'} = {
                           'text' => 'direction'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -173,7 +175,7 @@ $result_trees{'quote_node_names_info'} = {
                           'text' => 'ion'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -193,7 +195,7 @@ $result_trees{'quote_node_names_info'} = {
                           'text' => 'direct::i.on'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -245,7 +247,9 @@ $result_trees{'quote_node_names_info'} = {
                         'normalized' => 'direct_003a_003ai_002eon'
                       }
                     ],
-                    'normalized' => 'normal-node',
+                    'normalized' => 'normal-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -287,7 +291,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'the::caption'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -339,7 +343,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'the::caption and a word'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -355,7 +359,7 @@ $result_trees{'quote_node_names_info'} = {
                           'text' => 'blah:blah'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -375,7 +379,9 @@ $result_trees{'quote_node_names_info'} = {
                         'normalized' => 'blah_003ablah'
                       }
                     ],
-                    'normalized' => 'blah_003ablah',
+                    'normalized' => 'blah_003ablah'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -417,7 +423,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'the::caption'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -469,7 +475,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'the::caption and a word'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -485,7 +491,7 @@ $result_trees{'quote_node_names_info'} = {
                           'text' => 'blumpty.fump'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -505,7 +511,9 @@ $result_trees{'quote_node_names_info'} = {
                         'normalized' => 'blumpty_002efump'
                       }
                     ],
-                    'normalized' => 'blumpty_002efump',
+                    'normalized' => 'blumpty_002efump'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -547,7 +555,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'the::caption'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -675,7 +683,7 @@ $result_trees{'quote_node_names_info'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -695,7 +703,9 @@ $result_trees{'quote_node_names_info'} = {
                         'normalized' => 'secret_002cnode'
                       }
                     ],
-                    'normalized' => 'secret_002cnode',
+                    'normalized' => 'secret_002cnode'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -916,7 +926,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'label'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -927,7 +937,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'man_ual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -988,7 +998,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'label'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -999,7 +1009,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'man_ual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1060,7 +1070,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'label'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1071,7 +1081,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'man:u.al'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1082,7 +1092,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'Book Title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1135,7 +1145,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'label'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1146,7 +1156,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'man:u.al'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1157,7 +1167,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'Book Title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1210,7 +1220,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'la:bel'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1221,7 +1231,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'man:u.al'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1232,7 +1242,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'Book Title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1267,7 +1277,7 @@ $result_trees{'quote_node_names_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1656,7 +1666,7 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1665,9 +1675,11 @@ $result_trees{'quote_node_names_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 40,
@@ -1703,7 +1715,7 @@ $result_trees{'quote_node_names_info'} = {
               'text' => 'blah:blah'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1732,7 +1744,8 @@ $result_trees{'quote_node_names_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1750,7 +1763,7 @@ $result_trees{'quote_node_names_info'} = {
               'text' => 'blumpty.fump'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1765,7 +1778,8 @@ $result_trees{'quote_node_names_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1783,7 +1797,7 @@ $result_trees{'quote_node_names_info'} = {
               'text' => 'normal node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1798,7 +1812,8 @@ $result_trees{'quote_node_names_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1831,7 +1846,7 @@ $result_trees{'quote_node_names_info'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1846,7 +1861,8 @@ $result_trees{'quote_node_names_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1863,7 +1879,7 @@ $result_trees{'quote_node_names_info'} = {
               'text' => 'top secret node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1899,7 +1915,9 @@ $result_trees{'quote_node_names_info'} = {
             'normalized' => 'top-secret-node'
           }
         ],
-        'normalized' => 'top-secret-node',
+        'normalized' => 'top-secret-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2104,6 +2122,7 @@ $result_sectioning{'quote_node_names_info'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -2117,9 +2136,11 @@ $result_sectioning{'quote_node_names_info'} = {
                   'extra' => {
                     'normalized' => 'blah_003ablah'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2136,9 +2157,11 @@ $result_sectioning{'quote_node_names_info'} = {
                   'extra' => {
                     'normalized' => 'blumpty_002efump'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -2156,9 +2179,11 @@ $result_sectioning{'quote_node_names_info'} = {
                   'extra' => {
                     'normalized' => 'normal-node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -2176,9 +2201,11 @@ $result_sectioning{'quote_node_names_info'} = {
                   'extra' => {
                     'normalized' => 'secret_002cnode'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -2229,6 +2256,7 @@ $result_nodes{'quote_node_names_info'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2236,12 +2264,14 @@ $result_nodes{'quote_node_names_info'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'blah_003ablah'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -2249,12 +2279,14 @@ $result_nodes{'quote_node_names_info'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'blumpty_002efump'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -2262,12 +2294,14 @@ $result_nodes{'quote_node_names_info'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => 'normal-node'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'extra' => {
@@ -2329,30 +2363,35 @@ $result_menus{'quote_node_names_info'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'blah_003ablah'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'blumpty_002efump'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'normal-node'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'secret_002cnode'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/info_tests/ref_tests.pl 
b/tp/t/results/info_tests/ref_tests.pl
index 5be9a9684e..b56f18a643 100644
--- a/tp/t/results/info_tests/ref_tests.pl
+++ b/tp/t/results/info_tests/ref_tests.pl
@@ -25,7 +25,7 @@ $result_trees{'ref_tests'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -219,7 +219,7 @@ $result_trees{'ref_tests'} = {
                       'text' => 'name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -271,7 +271,7 @@ $result_trees{'ref_tests'} = {
                       'text' => 'name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -327,7 +327,7 @@ $result_trees{'ref_tests'} = {
                               'text' => 'name'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'type' => 'brace_command_arg'
@@ -390,7 +390,7 @@ $result_trees{'ref_tests'} = {
                       'text' => 'name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -438,7 +438,9 @@ $result_trees{'ref_tests'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -501,14 +503,16 @@ $result_nodes{'ref_tests'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'ref_tests'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'ref_tests'} = [];
diff --git a/tp/t/results/info_tests/space_at_menu_end.pl 
b/tp/t/results/info_tests/space_at_menu_end.pl
index 5fbf902b0e..7fc24d4948 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -18,7 +18,7 @@ $result_trees{'space_at_menu_end'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'space_at_menu_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -121,7 +121,7 @@ $result_trees{'space_at_menu_end'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -130,9 +130,11 @@ $result_trees{'space_at_menu_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -173,7 +175,9 @@ $result_trees{'space_at_menu_end'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -218,6 +222,7 @@ $result_nodes{'space_at_menu_end'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -238,6 +243,7 @@ $result_menus{'space_at_menu_end'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index f42a53d906..feaa2bf6cf 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -18,7 +18,7 @@ $result_trees{'space_in_menu'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'space_in_menu'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'space_in_menu'} = {
               'text' => 'Element'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +88,7 @@ $result_trees{'space_in_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -152,7 +154,7 @@ $result_trees{'space_in_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -161,9 +163,11 @@ $result_trees{'space_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -183,7 +187,8 @@ $result_trees{'space_in_menu'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -200,7 +205,7 @@ $result_trees{'space_in_menu'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -220,7 +225,9 @@ $result_trees{'space_in_menu'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -237,7 +244,7 @@ $result_trees{'space_in_menu'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -261,7 +268,8 @@ $result_trees{'space_in_menu'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -320,9 +328,11 @@ $result_sectioning{'space_in_menu'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -333,9 +343,11 @@ $result_sectioning{'space_in_menu'} = {
                   'extra' => {
                     'normalized' => 'node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -364,6 +376,7 @@ $result_nodes{'space_in_menu'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -373,6 +386,7 @@ $result_nodes{'space_in_menu'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -380,12 +394,14 @@ $result_nodes{'space_in_menu'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -403,12 +419,14 @@ $result_menus{'space_in_menu'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/info_tests/space_in_setfilename.pl 
b/tp/t/results/info_tests/space_in_setfilename.pl
index ab03219e5e..4549c27e52 100644
--- a/tp/t/results/info_tests/space_in_setfilename.pl
+++ b/tp/t/results/info_tests/space_in_setfilename.pl
@@ -42,7 +42,7 @@ $result_trees{'space_in_setfilename'} = {
                   'cmdname' => ' '
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -51,7 +51,9 @@ $result_trees{'space_in_setfilename'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'missing_argument' => 1,
+            'missing_argument' => 1
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'space_in_setfilename'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'space_in_setfilename'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,14 +128,16 @@ $result_nodes{'space_in_setfilename'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'space_in_setfilename'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'space_in_setfilename'} = [
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index 0ced1c30ad..122b20a6a5 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -26,7 +26,7 @@ $result_trees{'split_no_copying'} = {
                   'text' => 'split-nocopying.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -35,9 +35,11 @@ $result_trees{'split_no_copying'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'split-nocopying.info'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
@@ -60,7 +62,7 @@ $result_trees{'split_no_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -80,7 +82,9 @@ $result_trees{'split_no_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -97,7 +101,7 @@ $result_trees{'split_no_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -128,7 +132,7 @@ $result_trees{'split_no_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -194,7 +198,7 @@ $result_trees{'split_no_copying'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -203,9 +207,11 @@ $result_trees{'split_no_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -225,7 +231,8 @@ $result_trees{'split_no_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -242,7 +249,7 @@ $result_trees{'split_no_copying'} = {
               'text' => 'Ch1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -262,7 +269,9 @@ $result_trees{'split_no_copying'} = {
             'normalized' => 'Ch1'
           }
         ],
-        'normalized' => 'Ch1',
+        'normalized' => 'Ch1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -279,7 +288,7 @@ $result_trees{'split_no_copying'} = {
               'text' => 'Ch1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -308,7 +317,8 @@ $result_trees{'split_no_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -385,9 +395,11 @@ $result_sectioning{'split_no_copying'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -398,9 +410,11 @@ $result_sectioning{'split_no_copying'} = {
                   'extra' => {
                     'normalized' => 'Ch1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -429,6 +443,7 @@ $result_nodes{'split_no_copying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -438,6 +453,7 @@ $result_nodes{'split_no_copying'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -445,12 +461,14 @@ $result_nodes{'split_no_copying'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Ch1'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -468,12 +486,14 @@ $result_menus{'split_no_copying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Ch1'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/info_tests/split_test_before_first_node.pl 
b/tp/t/results/info_tests/split_test_before_first_node.pl
index df4caef267..2dd56cefbd 100644
--- a/tp/t/results/info_tests/split_test_before_first_node.pl
+++ b/tp/t/results/info_tests/split_test_before_first_node.pl
@@ -17,7 +17,7 @@ $result_trees{'split_test_before_first_node'} = {
                   'text' => 'split_test_before_first_node.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -26,9 +26,11 @@ $result_trees{'split_test_before_first_node'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'split_test_before_first_node.info'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -65,7 +67,7 @@ $result_trees{'split_test_before_first_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -85,7 +87,9 @@ $result_trees{'split_test_before_first_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -102,7 +106,7 @@ $result_trees{'split_test_before_first_node'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -133,7 +137,7 @@ $result_trees{'split_test_before_first_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -199,7 +203,7 @@ $result_trees{'split_test_before_first_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -208,9 +212,11 @@ $result_trees{'split_test_before_first_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -230,7 +236,8 @@ $result_trees{'split_test_before_first_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -247,7 +254,7 @@ $result_trees{'split_test_before_first_node'} = {
               'text' => 'chap1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -267,7 +274,9 @@ $result_trees{'split_test_before_first_node'} = {
             'normalized' => 'chap1'
           }
         ],
-        'normalized' => 'chap1',
+        'normalized' => 'chap1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -284,7 +293,7 @@ $result_trees{'split_test_before_first_node'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -313,7 +322,8 @@ $result_trees{'split_test_before_first_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -381,9 +391,11 @@ $result_sectioning{'split_test_before_first_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -394,9 +406,11 @@ $result_sectioning{'split_test_before_first_node'} = {
                   'extra' => {
                     'normalized' => 'chap1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -425,6 +439,7 @@ $result_nodes{'split_test_before_first_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -434,6 +449,7 @@ $result_nodes{'split_test_before_first_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -441,12 +457,14 @@ $result_nodes{'split_test_before_first_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap1'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -464,12 +482,14 @@ $result_menus{'split_test_before_first_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chap1'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git 
a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl 
b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
index 00b27bb100..7dbd3e37a3 100644
--- a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
+++ b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
@@ -17,7 +17,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} = 
{
                   'text' => 'split_test_before_first_node.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -26,9 +26,11 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'split_test_before_first_node.info'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -60,7 +62,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} = 
{
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -80,7 +82,9 @@ $result_trees{'split_test_before_first_node_no_empty_line'} = 
{
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -97,7 +101,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -128,7 +132,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -194,7 +198,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -203,9 +207,11 @@ 
$result_trees{'split_test_before_first_node_no_empty_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -225,7 +231,8 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -242,7 +249,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
               'text' => 'chap1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -262,7 +269,9 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
             'normalized' => 'chap1'
           }
         ],
-        'normalized' => 'chap1',
+        'normalized' => 'chap1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -279,7 +288,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -308,7 +317,8 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -374,9 +384,11 @@ 
$result_sectioning{'split_test_before_first_node_no_empty_line'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -387,9 +399,11 @@ 
$result_sectioning{'split_test_before_first_node_no_empty_line'} = {
                   'extra' => {
                     'normalized' => 'chap1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -418,6 +432,7 @@ $result_nodes{'split_test_before_first_node_no_empty_line'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -427,6 +442,7 @@ $result_nodes{'split_test_before_first_node_no_empty_line'} 
= {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -434,12 +450,14 @@ 
$result_nodes{'split_test_before_first_node_no_empty_line'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap1'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -457,12 +475,14 @@ 
$result_menus{'split_test_before_first_node_no_empty_line'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chap1'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index 38b9a8de26..103840dee9 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -18,7 +18,7 @@ $result_trees{'test_index'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'test_index'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'test_index'} = {
               'text' => 'Element top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -147,7 +149,7 @@ $result_trees{'test_index'} = {
                       'text' => 'in Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -167,7 +169,9 @@ $result_trees{'test_index'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -185,7 +189,7 @@ $result_trees{'test_index'} = {
                       'cmdname' => '@'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,7 +209,9 @@ $result_trees{'test_index'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -233,7 +239,7 @@ $result_trees{'test_index'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -253,7 +259,9 @@ $result_trees{'test_index'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -271,7 +279,7 @@ $result_trees{'test_index'} = {
                       'text' => '"'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -291,7 +299,9 @@ $result_trees{'test_index'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -503,7 +513,9 @@ $result_trees{'test_index'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -531,7 +543,7 @@ $result_trees{'test_index'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -540,9 +552,11 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -550,7 +564,7 @@ $result_trees{'test_index'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -578,7 +592,7 @@ $result_trees{'test_index'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -599,7 +613,7 @@ $result_trees{'test_index'} = {
                               'text' => 'a fun'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -619,7 +633,9 @@ $result_trees{'test_index'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -665,7 +681,7 @@ $result_trees{'test_index'} = {
                               'text' => 'second fun'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -685,7 +701,9 @@ $result_trees{'test_index'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -702,7 +720,7 @@ $result_trees{'test_index'} = {
                               'text' => 'itemx fun'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -722,7 +740,9 @@ $result_trees{'test_index'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -755,7 +775,7 @@ $result_trees{'test_index'} = {
                       'text' => 'ftable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -764,9 +784,11 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ftable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -775,7 +797,9 @@ $result_trees{'test_index'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -792,7 +816,7 @@ $result_trees{'test_index'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -907,7 +931,7 @@ $result_trees{'test_index'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -916,9 +940,11 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -938,7 +964,8 @@ $result_trees{'test_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -955,7 +982,7 @@ $result_trees{'test_index'} = {
               'text' => 'name'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -975,7 +1002,9 @@ $result_trees{'test_index'} = {
             'normalized' => 'name'
           }
         ],
-        'normalized' => 'name',
+        'normalized' => 'name'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -992,7 +1021,7 @@ $result_trees{'test_index'} = {
               'text' => 'A chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1014,7 +1043,7 @@ $result_trees{'test_index'} = {
                   'text' => 'index entry 
looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1034,7 +1063,9 @@ $result_trees{'test_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1052,7 +1083,7 @@ $result_trees{'test_index'} = {
                   'text' => 'function index entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1072,7 +1103,9 @@ $result_trees{'test_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1101,7 +1134,7 @@ $result_trees{'test_index'} = {
                       'text' => 'other function'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1121,7 +1154,9 @@ $result_trees{'test_index'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'findex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1221,7 +1256,7 @@ $result_trees{'test_index'} = {
                   'text' => 'after lines.'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1241,7 +1276,9 @@ $result_trees{'test_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2314,7 +2351,7 @@ $result_trees{'test_index'} = {
                   'text' => 'after more than 100 lines'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2334,7 +2371,9 @@ $result_trees{'test_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2350,7 +2389,8 @@ $result_trees{'test_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2367,7 +2407,7 @@ $result_trees{'test_index'} = {
               'text' => 'name1 
looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2388,7 +2428,9 @@ $result_trees{'test_index'} = {
             'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
           }
         ],
-        'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
+        'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2405,7 +2447,7 @@ $result_trees{'test_index'} = {
               'text' => 'Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2427,7 +2469,7 @@ $result_trees{'test_index'} = {
                   'text' => 'index entry in appendix before para'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2447,7 +2489,9 @@ $result_trees{'test_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2488,7 +2532,7 @@ $result_trees{'test_index'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2499,7 +2543,9 @@ $result_trees{'test_index'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2521,7 +2567,7 @@ $result_trees{'test_index'} = {
                   'text' => 'index entry between indices'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2541,7 +2587,9 @@ $result_trees{'test_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2573,7 +2621,7 @@ $result_trees{'test_index'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2584,7 +2632,9 @@ $result_trees{'test_index'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2599,7 +2649,8 @@ $result_trees{'test_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2616,7 +2667,7 @@ $result_trees{'test_index'} = {
               'text' => 'appendixsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2631,7 +2682,7 @@ $result_trees{'test_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2648,7 +2699,7 @@ $result_trees{'test_index'} = {
               'text' => 'appendixsubsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2663,7 +2714,7 @@ $result_trees{'test_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2680,7 +2731,7 @@ $result_trees{'test_index'} = {
               'text' => 'appendixsubsubsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2702,7 +2753,7 @@ $result_trees{'test_index'} = {
                   'text' => 'chapheading'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2710,7 +2761,7 @@ $result_trees{'test_index'} = {
             }
           ],
           'cmdname' => 'chapheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2725,7 +2776,7 @@ $result_trees{'test_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2742,7 +2793,7 @@ $result_trees{'test_index'} = {
               'text' => 'centerchap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2757,7 +2808,7 @@ $result_trees{'test_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2774,7 +2825,7 @@ $result_trees{'test_index'} = {
               'text' => 'chapter end'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2796,7 +2847,7 @@ $result_trees{'test_index'} = {
                   'text' => 'index in chapter end'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2816,7 +2867,9 @@ $result_trees{'test_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2843,7 +2896,7 @@ $result_trees{'test_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3423,9 +3476,11 @@ $result_sectioning{'test_index'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -3436,9 +3491,11 @@ $result_sectioning{'test_index'} = {
                   'extra' => {
                     'normalized' => 'name'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -3456,24 +3513,26 @@ $result_sectioning{'test_index'} = {
                     'isindex' => 1,
                     'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'appendixsec',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'appendixsubsec',
-                          'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
                                 'cmdname' => 'appendixsubsubsec',
-                                'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => 'A.1.1.1',
@@ -3503,7 +3562,7 @@ $result_sectioning{'test_index'} = {
             },
             {
               'cmdname' => 'centerchap',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -3514,7 +3573,7 @@ $result_sectioning{'test_index'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 'B',
@@ -3559,6 +3618,7 @@ $result_nodes{'test_index'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -3568,6 +3628,7 @@ $result_nodes{'test_index'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -3575,12 +3636,14 @@ $result_nodes{'test_index'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'name'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -3588,6 +3651,7 @@ $result_nodes{'test_index'} = {
             'associated_section' => {
               'cmdname' => 'appendix',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 'A'
               }
@@ -3595,6 +3659,7 @@ $result_nodes{'test_index'} = {
             'isindex' => 1,
             'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -3618,12 +3683,14 @@ $result_menus{'test_index'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'name'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
@@ -3631,6 +3698,7 @@ $result_menus{'test_index'} = {
             'isindex' => 1,
             'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index ae4ffd62e4..44aa154e3b 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -18,7 +18,7 @@ $result_trees{'text_before_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'text_before_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'text_before_node'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'text_before_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -138,7 +140,7 @@ $result_trees{'text_before_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -147,9 +149,11 @@ $result_trees{'text_before_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -178,7 +182,8 @@ $result_trees{'text_before_node'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -195,7 +200,7 @@ $result_trees{'text_before_node'} = {
               'text' => 'chapter node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -215,7 +220,9 @@ $result_trees{'text_before_node'} = {
             'normalized' => 'chapter-node'
           }
         ],
-        'normalized' => 'chapter-node',
+        'normalized' => 'chapter-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -236,7 +243,8 @@ $result_trees{'text_before_node'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -288,9 +296,11 @@ $result_sectioning{'text_before_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -301,9 +311,11 @@ $result_sectioning{'text_before_node'} = {
                   'extra' => {
                     'normalized' => 'chapter-node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -332,6 +344,7 @@ $result_nodes{'text_before_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -341,6 +354,7 @@ $result_nodes{'text_before_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -348,12 +362,14 @@ $result_nodes{'text_before_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -371,12 +387,14 @@ $result_menus{'text_before_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index f72bd748fd..a1453584df 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -18,7 +18,7 @@ $result_trees{'top_node_normalization'} = {
               'text' => 'ToP'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -106,7 +106,7 @@ $result_trees{'top_node_normalization'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -172,7 +172,7 @@ $result_trees{'top_node_normalization'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -181,9 +181,11 @@ $result_trees{'top_node_normalization'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -210,7 +212,9 @@ $result_trees{'top_node_normalization'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -257,6 +261,7 @@ $result_nodes{'top_node_normalization'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {},
     'node_next' => {},
@@ -272,6 +277,7 @@ $result_menus{'top_node_normalization'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {},
     'menu_up' => {},
diff --git a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl 
b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
index 958878a2c4..dda5df3b37 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
@@ -14,7 +14,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -54,7 +54,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -63,9 +63,11 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -92,7 +94,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
                       'text' => '1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -103,7 +105,9 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
               'extra' => {
                 'misc_args' => [
                   '1'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -125,7 +129,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
                       'text' => '6'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -136,7 +140,9 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
               'extra' => {
                 'misc_args' => [
                   '6'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -178,7 +184,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -198,7 +204,9 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -221,7 +229,7 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
               'text' => 'paragraphindent in preamble effect in preamble'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +272,8 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -336,9 +345,11 @@ $result_sectioning{'two_paragraphindent_in_preamble'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -356,17 +367,20 @@ $result_nodes{'two_paragraphindent_in_preamble'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'two_paragraphindent_in_preamble'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'two_paragraphindent_in_preamble'} = [];
diff --git 
a/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl 
b/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
index 02ebc7bc6b..7974ed1cb5 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
@@ -14,7 +14,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -54,7 +54,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -63,9 +63,11 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -92,7 +94,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
                       'text' => '1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -103,7 +105,9 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
               'extra' => {
                 'misc_args' => [
                   '1'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -125,7 +129,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
                       'text' => '6'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -136,7 +140,9 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
               'extra' => {
                 'misc_args' => [
                   '6'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -178,7 +184,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -198,7 +204,9 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -221,7 +229,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
               'text' => 'paragraphindent in preamble effect in preamble'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -271,7 +279,7 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
                   'text' => '3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -282,7 +290,9 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
           'extra' => {
             'misc_args' => [
               '3'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -311,7 +321,8 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -390,9 +401,11 @@ 
$result_sectioning{'two_paragraphindent_in_preamble_and_in_document'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -410,17 +423,20 @@ 
$result_nodes{'two_paragraphindent_in_preamble_and_in_document'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'two_paragraphindent_in_preamble_and_in_document'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'two_paragraphindent_in_preamble_and_in_document'} = [];
diff --git a/tp/t/results/info_tests/unknown_encoding.pl 
b/tp/t/results/info_tests/unknown_encoding.pl
index aaa7a20bb4..b219318f53 100644
--- a/tp/t/results/info_tests/unknown_encoding.pl
+++ b/tp/t/results/info_tests/unknown_encoding.pl
@@ -22,7 +22,7 @@ $result_trees{'unknown_encoding'} = {
                   'text' => 'ggg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -31,9 +31,11 @@ $result_trees{'unknown_encoding'} = {
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ggg'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
@@ -56,7 +58,7 @@ $result_trees{'unknown_encoding'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -83,7 +85,9 @@ $result_trees{'unknown_encoding'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -115,14 +119,16 @@ $result_nodes{'unknown_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'unknown_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'unknown_encoding'} = [
diff --git a/tp/t/results/info_tests/xref_test.pl 
b/tp/t/results/info_tests/xref_test.pl
index cf239c2828..9b7a7b2e42 100644
--- a/tp/t/results/info_tests/xref_test.pl
+++ b/tp/t/results/info_tests/xref_test.pl
@@ -25,7 +25,7 @@ $result_trees{'xref_test'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -203,7 +203,7 @@ $result_trees{'xref_test'} = {
                       'text' => 'name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -287,7 +287,9 @@ $result_trees{'xref_test'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -334,14 +336,16 @@ $result_nodes{'xref_test'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'xref_test'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'xref_test'} = [];
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 1adfc3d1b0..24afbd6310 100644
--- a/tp/t/results/init_files_tests/customize_special_element.pl
+++ b/tp/t/results/init_files_tests/customize_special_element.pl
@@ -22,7 +22,7 @@ $result_trees{'customize_special_element'} = {
                   'text' => 'separate'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,9 @@ $result_trees{'customize_special_element'} = {
           'extra' => {
             'misc_args' => [
               'separate'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -93,7 +95,7 @@ $result_trees{'customize_special_element'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +115,9 @@ $result_trees{'customize_special_element'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -130,7 +134,7 @@ $result_trees{'customize_special_element'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -145,7 +149,8 @@ $result_trees{'customize_special_element'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -162,7 +167,7 @@ $result_trees{'customize_special_element'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -182,7 +187,9 @@ $result_trees{'customize_special_element'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -199,7 +206,7 @@ $result_trees{'customize_special_element'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -221,7 +228,7 @@ $result_trees{'customize_special_element'} = {
                   'text' => 'fr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -230,9 +237,11 @@ $result_trees{'customize_special_element'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 13,
@@ -240,7 +249,8 @@ $result_trees{'customize_special_element'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -257,7 +267,7 @@ $result_trees{'customize_special_element'} = {
               'text' => 'Chapter fr'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -277,7 +287,9 @@ $result_trees{'customize_special_element'} = {
             'normalized' => 'Chapter-fr'
           }
         ],
-        'normalized' => 'Chapter-fr',
+        'normalized' => 'Chapter-fr'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -294,7 +306,7 @@ $result_trees{'customize_special_element'} = {
               'text' => 'chap fr'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -344,7 +356,8 @@ $result_trees{'customize_special_element'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -409,9 +422,11 @@ $result_sectioning{'customize_special_element'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -422,9 +437,11 @@ $result_sectioning{'customize_special_element'} = {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -441,9 +458,11 @@ $result_sectioning{'customize_special_element'} = {
                   'extra' => {
                     'normalized' => 'Chapter-fr'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -477,10 +496,12 @@ $result_nodes{'customize_special_element'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -488,12 +509,14 @@ $result_nodes{'customize_special_element'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -501,12 +524,14 @@ $result_nodes{'customize_special_element'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'Chapter-fr'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -528,6 +553,7 @@ $result_menus{'customize_special_element'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/init_files_tests/customize_translations.pl 
b/tp/t/results/init_files_tests/customize_translations.pl
index 0d403940fc..a908d3d62b 100644
--- a/tp/t/results/init_files_tests/customize_translations.pl
+++ b/tp/t/results/init_files_tests/customize_translations.pl
@@ -45,7 +45,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -65,7 +65,9 @@ $result_trees{'customize_translations'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -82,7 +84,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -97,7 +99,8 @@ $result_trees{'customize_translations'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -114,7 +117,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -134,7 +137,9 @@ $result_trees{'customize_translations'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -151,7 +156,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -200,7 +205,7 @@ $result_trees{'customize_translations'} = {
                   'text' => 'fr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -209,9 +214,11 @@ $result_trees{'customize_translations'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 12,
@@ -219,7 +226,8 @@ $result_trees{'customize_translations'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -236,7 +244,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'Chapter fr'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -256,7 +264,9 @@ $result_trees{'customize_translations'} = {
             'normalized' => 'Chapter-fr'
           }
         ],
-        'normalized' => 'Chapter-fr',
+        'normalized' => 'Chapter-fr'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -273,7 +283,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'chap fr'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -315,7 +325,8 @@ $result_trees{'customize_translations'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -332,7 +343,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'section fr'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -352,7 +363,9 @@ $result_trees{'customize_translations'} = {
             'normalized' => 'section-fr'
           }
         ],
-        'normalized' => 'section-fr',
+        'normalized' => 'section-fr'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -369,7 +382,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'sec fr'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -391,7 +404,7 @@ $result_trees{'customize_translations'} = {
                   'text' => 'de'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -400,9 +413,11 @@ $result_trees{'customize_translations'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'de'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 21,
@@ -410,7 +425,8 @@ $result_trees{'customize_translations'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -427,7 +443,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'Chapter de'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -447,7 +463,9 @@ $result_trees{'customize_translations'} = {
             'normalized' => 'Chapter-de'
           }
         ],
-        'normalized' => 'Chapter-de',
+        'normalized' => 'Chapter-de'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -464,7 +482,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'chap de'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -506,7 +524,8 @@ $result_trees{'customize_translations'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -523,7 +542,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'Last chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -543,7 +562,9 @@ $result_trees{'customize_translations'} = {
             'normalized' => 'Last-chapter'
           }
         ],
-        'normalized' => 'Last-chapter',
+        'normalized' => 'Last-chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -560,7 +581,7 @@ $result_trees{'customize_translations'} = {
               'text' => 'Last Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -575,7 +596,8 @@ $result_trees{'customize_translations'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -671,9 +693,11 @@ $result_sectioning{'customize_translations'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -684,9 +708,11 @@ $result_sectioning{'customize_translations'} = {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -703,9 +729,11 @@ $result_sectioning{'customize_translations'} = {
                   'extra' => {
                     'normalized' => 'Chapter-fr'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -716,9 +744,11 @@ $result_sectioning{'customize_translations'} = {
                         'extra' => {
                           'normalized' => 'section-fr'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.1',
@@ -742,9 +772,11 @@ $result_sectioning{'customize_translations'} = {
                   'extra' => {
                     'normalized' => 'Chapter-de'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -762,9 +794,11 @@ $result_sectioning{'customize_translations'} = {
                   'extra' => {
                     'normalized' => 'Last-chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -807,10 +841,12 @@ $result_nodes{'customize_translations'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -818,12 +854,14 @@ $result_nodes{'customize_translations'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -831,12 +869,14 @@ $result_nodes{'customize_translations'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'Chapter-fr'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -844,12 +884,14 @@ $result_nodes{'customize_translations'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => 'Chapter-de'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -857,12 +899,14 @@ $result_nodes{'customize_translations'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 4
                       }
                     },
                     'normalized' => 'Last-chapter'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -896,6 +940,7 @@ $result_menus{'customize_translations'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/init_files_tests/documentation_examples.pl 
b/tp/t/results/init_files_tests/documentation_examples.pl
index 0f2426aedf..d0a79f17d0 100644
--- a/tp/t/results/init_files_tests/documentation_examples.pl
+++ b/tp/t/results/init_files_tests/documentation_examples.pl
@@ -40,7 +40,7 @@ $result_trees{'documentation_examples'} = {
                           'text' => 'me'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -107,7 +107,7 @@ $result_trees{'documentation_examples'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -115,7 +115,8 @@ $result_trees{'documentation_examples'} = {
             }
           ],
           'cmdname' => 'settitle',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -140,7 +141,7 @@ $result_trees{'documentation_examples'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -237,7 +238,7 @@ $result_trees{'documentation_examples'} = {
                           'text' => 'my node'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -259,7 +260,7 @@ $result_trees{'documentation_examples'} = {
                               'text' => 'de'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -268,9 +269,11 @@ $result_trees{'documentation_examples'} = {
                       ],
                       'cmdname' => 'documentlanguage',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'de'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 25,
@@ -354,7 +357,9 @@ $result_trees{'documentation_examples'} = {
                         'normalized' => 'my-node'
                       }
                     ],
-                    'normalized' => 'my-node',
+                    'normalized' => 'my-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -452,7 +457,7 @@ $result_trees{'documentation_examples'} = {
                       'text' => 'someone'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -565,7 +570,7 @@ $result_trees{'documentation_examples'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -647,7 +652,7 @@ $result_trees{'documentation_examples'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -656,9 +661,11 @@ $result_trees{'documentation_examples'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -685,7 +692,7 @@ $result_trees{'documentation_examples'} = {
                   'text' => 'fr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -694,9 +701,11 @@ $result_trees{'documentation_examples'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 17,
@@ -775,7 +784,9 @@ $result_trees{'documentation_examples'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -860,12 +871,14 @@ $result_nodes{'documentation_examples'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'my-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -879,6 +892,7 @@ $result_menus{'documentation_examples'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/init_files_tests/macro_defined_txiinternalvalue_in_translation.pl
 
b/tp/t/results/init_files_tests/macro_defined_txiinternalvalue_in_translation.pl
index c6f01c1011..f1c4e0c4e2 100644
--- 
a/tp/t/results/init_files_tests/macro_defined_txiinternalvalue_in_translation.pl
+++ 
b/tp/t/results/init_files_tests/macro_defined_txiinternalvalue_in_translation.pl
@@ -17,7 +17,7 @@ 
$result_trees{'macro_defined_txiinternalvalue_in_translation'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ 
$result_trees{'macro_defined_txiinternalvalue_in_translation'} = {
           'extra' => {
             'misc_args' => [
               '1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -50,7 +52,7 @@ 
$result_trees{'macro_defined_txiinternalvalue_in_translation'} = {
                   'text' => '2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -61,7 +63,9 @@ 
$result_trees{'macro_defined_txiinternalvalue_in_translation'} = {
           'extra' => {
             'misc_args' => [
               '2'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/init_files_tests/modified_translation.pl 
b/tp/t/results/init_files_tests/modified_translation.pl
index a35a7c7fd4..d3f881195e 100644
--- a/tp/t/results/init_files_tests/modified_translation.pl
+++ b/tp/t/results/init_files_tests/modified_translation.pl
@@ -44,7 +44,7 @@ $result_trees{'modified_translation'} = {
                   'text' => 'fr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -53,9 +53,11 @@ $result_trees{'modified_translation'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
@@ -105,7 +107,7 @@ $result_trees{'modified_translation'} = {
                   'text' => 'pt'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -114,9 +116,11 @@ $result_trees{'modified_translation'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'pt'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 7,
diff --git a/tp/t/results/init_files_tests/redefined_need.pl 
b/tp/t/results/init_files_tests/redefined_need.pl
index 0a9068ee25..307ebe7842 100644
--- a/tp/t/results/init_files_tests/redefined_need.pl
+++ b/tp/t/results/init_files_tests/redefined_need.pl
@@ -17,7 +17,7 @@ $result_trees{'redefined_need'} = {
                   'text' => '0.1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'redefined_need'} = {
           'extra' => {
             'misc_args' => [
               '0.1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/init_files_tests/undefined_node_filename.pl 
b/tp/t/results/init_files_tests/undefined_node_filename.pl
index 0e885e409c..015e518926 100644
--- a/tp/t/results/init_files_tests/undefined_node_filename.pl
+++ b/tp/t/results/init_files_tests/undefined_node_filename.pl
@@ -18,7 +18,7 @@ $result_trees{'undefined_node_filename'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'undefined_node_filename'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'undefined_node_filename'} = {
               'text' => 'Other'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -82,7 +84,9 @@ $result_trees{'undefined_node_filename'} = {
             'normalized' => 'Other'
           }
         ],
-        'normalized' => 'Other',
+        'normalized' => 'Other'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,12 +117,14 @@ $result_nodes{'undefined_node_filename'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Other'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -132,6 +138,7 @@ $result_menus{'undefined_node_filename'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/invalid_nestings/bad_style_nesting.pl 
b/tp/t/results/invalid_nestings/bad_style_nesting.pl
index 4543635db8..bf2d8c2522 100644
--- a/tp/t/results/invalid_nestings/bad_style_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_style_nesting.pl
@@ -36,7 +36,7 @@ $result_trees{'bad_style_nesting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -62,7 +62,7 @@ $result_trees{'bad_style_nesting'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +71,11 @@ $result_trees{'bad_style_nesting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/invalid_nestings/bad_tab_nesting.pl 
b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
index a60c880e29..122c4a1644 100644
--- a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
@@ -33,7 +33,7 @@ $result_trees{'bad_tab_nesting'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -128,7 +128,7 @@ $result_trees{'bad_tab_nesting'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -137,9 +137,11 @@ $result_trees{'bad_tab_nesting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -162,7 +164,9 @@ $result_trees{'bad_tab_nesting'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl 
b/tp/t/results/invalid_nestings/block_not_matching.pl
index d88f7257ba..300539eaa1 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -12,7 +12,7 @@ $result_trees{'block_not_matching'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -148,7 +148,7 @@ $result_trees{'block_not_matching'} = {
               'type' => 'def_item'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -176,7 +176,7 @@ $result_trees{'block_not_matching'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -197,7 +197,7 @@ $result_trees{'block_not_matching'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -205,7 +205,7 @@ $result_trees{'block_not_matching'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -236,7 +236,9 @@ $result_trees{'block_not_matching'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -264,7 +266,7 @@ $result_trees{'block_not_matching'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -285,7 +287,7 @@ $result_trees{'block_not_matching'} = {
                               'text' => 'ref'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -293,7 +295,7 @@ $result_trees{'block_not_matching'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -310,7 +312,7 @@ $result_trees{'block_not_matching'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -343,7 +345,9 @@ $result_trees{'block_not_matching'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -360,7 +364,7 @@ $result_trees{'block_not_matching'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -393,7 +397,7 @@ $result_trees{'block_not_matching'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -426,7 +430,7 @@ $result_trees{'block_not_matching'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -459,7 +463,7 @@ $result_trees{'block_not_matching'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl 
b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
index 8951e9f819..340825a4a7 100644
--- a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
@@ -36,7 +36,7 @@ $result_trees{'cartouche_in_style_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -62,7 +62,7 @@ $result_trees{'cartouche_in_style_command'} = {
                       'text' => 'cartouche'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +71,11 @@ $result_trees{'cartouche_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index c6e0702dc5..265bfd2eb8 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -94,7 +94,7 @@ $result_trees{'center'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -102,7 +102,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -131,7 +131,7 @@ $result_trees{'center'} = {
                           'text' => 'cindex'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -150,7 +150,9 @@ $result_trees{'center'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -165,7 +167,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -186,7 +188,7 @@ $result_trees{'center'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -205,7 +207,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -243,7 +245,7 @@ $result_trees{'center'} = {
                           'text' => 'second center'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -251,7 +253,7 @@ $result_trees{'center'} = {
                     }
                   ],
                   'cmdname' => 'center',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -265,7 +267,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -307,7 +309,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -360,7 +362,7 @@ $result_trees{'center'} = {
                           'text' => 'center in code in center'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -368,7 +370,7 @@ $result_trees{'center'} = {
                     }
                   ],
                   'cmdname' => 'center',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -382,7 +384,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -431,7 +433,7 @@ $result_trees{'center'} = {
                   'text' => 'in center in code'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -439,7 +441,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -467,7 +469,7 @@ $result_trees{'center'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -493,7 +495,7 @@ $result_trees{'center'} = {
                           'text' => 'first item on center line'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -501,7 +503,7 @@ $result_trees{'center'} = {
                     }
                   ],
                   'cmdname' => 'center',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -521,7 +523,7 @@ $result_trees{'center'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -530,9 +532,11 @@ $result_trees{'center'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -541,7 +545,9 @@ $result_trees{'center'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -569,7 +575,7 @@ $result_trees{'center'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -590,7 +596,7 @@ $result_trees{'center'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -598,7 +604,7 @@ $result_trees{'center'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -627,7 +633,7 @@ $result_trees{'center'} = {
                               'text' => 'second item on center line'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -635,7 +641,7 @@ $result_trees{'center'} = {
                         }
                       ],
                       'cmdname' => 'center',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -658,7 +664,7 @@ $result_trees{'center'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -667,9 +673,11 @@ $result_trees{'center'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -678,7 +686,9 @@ $result_trees{'center'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -708,7 +718,7 @@ $result_trees{'center'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -730,7 +740,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -774,7 +784,7 @@ $result_trees{'center'} = {
                           'text' => 'end of samp'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -782,7 +792,7 @@ $result_trees{'center'} = {
                     }
                   ],
                   'cmdname' => 'center',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -796,7 +806,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -838,7 +848,7 @@ $result_trees{'center'} = {
                           'text' => 'after second center'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -846,7 +856,7 @@ $result_trees{'center'} = {
                     }
                   ],
                   'cmdname' => 'center',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -860,7 +870,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -912,7 +922,7 @@ $result_trees{'center'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -985,7 +995,7 @@ $result_trees{'center'} = {
                                   'text' => 'cbidule'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -993,7 +1003,7 @@ $result_trees{'center'} = {
                             }
                           ],
                           'cmdname' => 'center',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -1014,7 +1024,7 @@ $result_trees{'center'} = {
                                   'text' => 'cstruc'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1022,7 +1032,7 @@ $result_trees{'center'} = {
                             }
                           ],
                           'cmdname' => 'center',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -1058,7 +1068,7 @@ $result_trees{'center'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1067,9 +1077,11 @@ $result_trees{'center'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 43,
@@ -1092,7 +1104,9 @@ $result_trees{'center'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1127,7 +1141,7 @@ $result_trees{'center'} = {
                           'type' => 'command_as_argument'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1141,7 +1155,9 @@ $result_trees{'center'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
+                    'command_as_argument' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1155,7 +1171,7 @@ $result_trees{'center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/def_in_style_command.pl 
b/tp/t/results/invalid_nestings/def_in_style_command.pl
index 0356d10e48..845cee7c44 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -141,7 +141,7 @@ $result_trees{'def_in_style_command'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -150,9 +150,11 @@ $result_trees{'def_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -160,7 +162,7 @@ $result_trees{'def_in_style_command'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
index bd9b76ab3f..1c518b9498 100644
--- a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
@@ -12,7 +12,7 @@ $result_trees{'def_not_closed_in_menu_description'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -156,7 +156,7 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                           'type' => 'def_item'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -192,7 +192,7 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -201,9 +201,11 @@ $result_trees{'def_not_closed_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl 
b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
index 8d53a0f879..c3f0ed71c1 100644
--- a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
@@ -41,7 +41,7 @@ $result_trees{'enumerate_in_style_command'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -84,7 +84,7 @@ $result_trees{'enumerate_in_style_command'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -93,9 +93,11 @@ $result_trees{'enumerate_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -104,7 +106,9 @@ $result_trees{'enumerate_in_style_command'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/example_in_style_command.pl 
b/tp/t/results/invalid_nestings/example_in_style_command.pl
index 6a8d8fba95..a8eb9fdecc 100644
--- a/tp/t/results/invalid_nestings/example_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/example_in_style_command.pl
@@ -36,7 +36,7 @@ $result_trees{'example_in_style_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -62,7 +62,7 @@ $result_trees{'example_in_style_command'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +71,11 @@ $result_trees{'example_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/invalid_nestings/float_in_style_command.pl 
b/tp/t/results/invalid_nestings/float_in_style_command.pl
index 3496509a9e..caea887d83 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -49,7 +49,7 @@ $result_trees{'float_in_style_command'} = {
                   'text' => 'B'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -106,7 +106,7 @@ $result_trees{'float_in_style_command'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -115,9 +115,11 @@ $result_trees{'float_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -131,7 +133,6 @@ $result_trees{'float_in_style_command'} = {
               {}
             ],
             'normalized' => 'B',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -139,6 +140,9 @@ $result_trees{'float_in_style_command'} = {
               'normalized' => 'A'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
@@ -222,6 +226,7 @@ $result_floats{'float_in_style_command'} = {
           'normalized' => 'A'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/invalid_nestings/flushright_in_style_command.pl 
b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
index 03e8fa3bdd..4806a9e442 100644
--- a/tp/t/results/invalid_nestings/flushright_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
@@ -36,7 +36,7 @@ $result_trees{'flushright_in_style_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -62,7 +62,7 @@ $result_trees{'flushright_in_style_command'} = {
                       'text' => 'flushright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +71,11 @@ $result_trees{'flushright_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl 
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index 8c4f2b19b4..3b8ce98c1d 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -18,7 +18,7 @@ $result_trees{'footnote_in_ref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -90,7 +90,7 @@ $result_trees{'footnote_in_ref'} = {
                       'text' => '.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -119,7 +119,9 @@ $result_trees{'footnote_in_ref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -148,14 +150,16 @@ $result_nodes{'footnote_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'footnote_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'footnote_in_ref'} = [
diff --git a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl 
b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
index 766fa4f68b..f5cd105168 100644
--- a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
+++ b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'formats_not_closed_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -45,7 +45,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -66,7 +66,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                                   'text' => 'item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -74,7 +74,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -109,7 +109,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -208,7 +208,9 @@ $result_trees{'formats_not_closed_in_example'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -225,7 +227,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -234,9 +236,11 @@ $result_trees{'formats_not_closed_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl 
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 9c74fb3858..abe3ae38a1 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -18,7 +18,7 @@ $result_trees{'ignore_in_xref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -49,7 +49,7 @@ $result_trees{'ignore_in_xref'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -71,7 +71,7 @@ $result_trees{'ignore_in_xref'} = {
                                   'text' => 'ignore'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -80,9 +80,11 @@ $result_trees{'ignore_in_xref'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'ignore'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 6,
@@ -97,7 +99,7 @@ $result_trees{'ignore_in_xref'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '
 '
                   },
@@ -140,7 +142,9 @@ $result_trees{'ignore_in_xref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -175,14 +179,16 @@ $result_nodes{'ignore_in_xref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'ignore_in_xref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'ignore_in_xref'} = [
diff --git a/tp/t/results/invalid_nestings/ignored_text.pl 
b/tp/t/results/invalid_nestings/ignored_text.pl
index 62cbae5946..2123dc568b 100644
--- a/tp/t/results/invalid_nestings/ignored_text.pl
+++ b/tp/t/results/invalid_nestings/ignored_text.pl
@@ -22,7 +22,7 @@ $result_trees{'ignored_text'} = {
         }
       ],
       'cmdname' => 'node',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl 
b/tp/t/results/invalid_nestings/in_errormsg.pl
index 07f4cc910b..6bbbbf53a6 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -133,7 +133,7 @@ $result_trees{'in_errormsg'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
@@ -161,7 +161,7 @@ $result_trees{'in_errormsg'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -182,7 +182,7 @@ $result_trees{'in_errormsg'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -190,7 +190,7 @@ $result_trees{'in_errormsg'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -213,7 +213,7 @@ $result_trees{'in_errormsg'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -222,9 +222,11 @@ $result_trees{'in_errormsg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -233,7 +235,9 @@ $result_trees{'in_errormsg'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index 3057dba3ca..6e8969904a 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -25,7 +25,7 @@ $result_trees{'in_table'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -53,7 +53,7 @@ $result_trees{'in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -70,7 +70,7 @@ $result_trees{'in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -79,9 +79,11 @@ $result_trees{'in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -90,7 +92,9 @@ $result_trees{'in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -118,7 +122,7 @@ $result_trees{'in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -226,7 +230,7 @@ $result_trees{'in_table'} = {
                                       'text' => 'exdent'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -234,7 +238,7 @@ $result_trees{'in_table'} = {
                                 }
                               ],
                               'cmdname' => 'exdent',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -248,7 +252,7 @@ $result_trees{'in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -331,7 +335,7 @@ $result_trees{'in_table'} = {
 '
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'type' => 'brace_command_arg'
@@ -349,7 +353,7 @@ $result_trees{'in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -394,7 +398,7 @@ $result_trees{'in_table'} = {
                                       'text' => 'centered text in item'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -402,7 +406,7 @@ $result_trees{'in_table'} = {
                                 }
                               ],
                               'cmdname' => 'center',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -416,7 +420,7 @@ $result_trees{'in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -447,7 +451,7 @@ $result_trees{'in_table'} = {
                                       'text' => 'index'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -467,7 +471,9 @@ $result_trees{'in_table'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
                                   'index_type_command' => 'cindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -482,7 +488,7 @@ $result_trees{'in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -505,7 +511,7 @@ $result_trees{'in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -514,9 +520,11 @@ $result_trees{'in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -525,7 +533,9 @@ $result_trees{'in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -553,7 +563,7 @@ $result_trees{'in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -578,7 +588,7 @@ $result_trees{'in_table'} = {
                                       'text' => 'index'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -598,7 +608,9 @@ $result_trees{'in_table'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
                                   'index_type_command' => 'cindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -625,7 +637,9 @@ $result_trees{'in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -692,7 +706,7 @@ $result_trees{'in_table'} = {
                                       'text' => '2 index'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -712,7 +726,9 @@ $result_trees{'in_table'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
                                   'index_type_command' => 'cindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -739,7 +755,9 @@ $result_trees{'in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -798,7 +816,7 @@ $result_trees{'in_table'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -807,9 +825,11 @@ $result_trees{'in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -818,7 +838,9 @@ $result_trees{'in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -840,7 +862,7 @@ $result_trees{'in_table'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -851,7 +873,9 @@ $result_trees{'in_table'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -873,7 +897,7 @@ $result_trees{'in_table'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -884,7 +908,9 @@ $result_trees{'in_table'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -907,7 +933,9 @@ $result_trees{'in_table'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1001,7 +1029,8 @@ $result_nodes{'in_table'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'in_table'} = {
@@ -1009,7 +1038,8 @@ $result_menus{'in_table'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'in_table'} = [
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl 
b/tp/t/results/invalid_nestings/item_in_ref.pl
index 29a6128122..d141e9bb89 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -23,7 +23,7 @@ $result_trees{'item_in_ref'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -44,7 +44,7 @@ $result_trees{'item_in_ref'} = {
                               'text' => 'first item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -52,7 +52,7 @@ $result_trees{'item_in_ref'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -102,7 +102,7 @@ $result_trees{'item_in_ref'} = {
 '
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'type' => 'brace_command_arg'
@@ -136,7 +136,7 @@ $result_trees{'item_in_ref'} = {
                               'text' => 'second item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -144,7 +144,7 @@ $result_trees{'item_in_ref'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -167,7 +167,7 @@ $result_trees{'item_in_ref'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -176,9 +176,11 @@ $result_trees{'item_in_ref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -187,7 +189,9 @@ $result_trees{'item_in_ref'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl 
b/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
index 3eecbb5ecf..6dbe42ff81 100644
--- a/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
+++ b/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
@@ -17,7 +17,7 @@ $result_trees{'item_tab_outside_of_table_lists'} = {
                   'text' => 'itemx outside.'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -25,7 +25,7 @@ $result_trees{'item_tab_outside_of_table_lists'} = {
             }
           ],
           'cmdname' => 'itemx',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 
b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
index ac0478a8ca..dbf04238ec 100644
--- a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
+++ b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
@@ -23,7 +23,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -44,7 +44,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -52,7 +52,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -89,7 +89,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                               'type' => 'command_as_argument_inserted'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -108,7 +108,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                                       'text' => 'in nested itemize itemx'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -116,7 +116,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                                 }
                               ],
                               'cmdname' => 'itemx',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -136,7 +136,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                                   'text' => 'itemize'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -145,9 +145,11 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'itemize'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 7,
@@ -172,7 +174,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -191,7 +193,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                                       'text' => 'in nested enumerate itemx'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -199,7 +201,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                                 }
                               ],
                               'cmdname' => 'itemx',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -219,7 +221,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                                   'text' => 'enumerate'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -228,9 +230,11 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'enumerate'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 11,
@@ -266,7 +270,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -275,9 +279,11 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -286,7 +292,9 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/menu_in_style_command.pl 
b/tp/t/results/invalid_nestings/menu_in_style_command.pl
index 1f67880e5c..ac64d4d231 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -18,7 +18,7 @@ $result_trees{'menu_in_style_command'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,7 @@ $result_trees{'menu_in_style_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -130,7 +130,7 @@ $result_trees{'menu_in_style_command'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -139,9 +139,11 @@ $result_trees{'menu_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -168,7 +170,9 @@ $result_trees{'menu_in_style_command'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -209,6 +213,7 @@ $result_nodes{'menu_in_style_command'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -229,6 +234,7 @@ $result_menus{'menu_in_style_command'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/multitable_in_style_command.pl 
b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
index b2455cbcc1..565c11c05e 100644
--- a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
@@ -61,7 +61,7 @@ $result_trees{'multitable_in_style_command'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -142,7 +142,7 @@ $result_trees{'multitable_in_style_command'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -151,9 +151,11 @@ $result_trees{'multitable_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -176,7 +178,9 @@ $result_trees{'multitable_in_style_command'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/multitable_item_in_index.pl 
b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
index ecbf8f83d9..be6ac5f4c2 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -33,7 +33,7 @@ $result_trees{'multitable_item_in_index'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -56,7 +56,7 @@ $result_trees{'multitable_item_in_index'} = {
                           'text' => 'on item line'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -75,7 +75,9 @@ $result_trees{'multitable_item_in_index'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'vr',
                       'index_type_command' => 'vindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -96,7 +98,7 @@ $result_trees{'multitable_item_in_index'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -105,9 +107,11 @@ $result_trees{'multitable_item_in_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -130,7 +134,9 @@ $result_trees{'multitable_item_in_index'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/node_in_copying.pl 
b/tp/t/results/invalid_nestings/node_in_copying.pl
index d7bb8cb9b6..f30012a374 100644
--- a/tp/t/results/invalid_nestings/node_in_copying.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying.pl
@@ -12,7 +12,7 @@ $result_trees{'node_in_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -37,7 +37,7 @@ $result_trees{'node_in_copying'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -64,7 +64,9 @@ $result_trees{'node_in_copying'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -92,14 +94,16 @@ $result_nodes{'node_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'node'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'node_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'node'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'node_in_copying'} = [
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 b07161b324..fc0a63ed2f 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
@@ -12,7 +12,7 @@ $result_trees{'node_in_copying_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -63,7 +63,7 @@ $result_trees{'node_in_copying_not_closed'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -83,7 +83,9 @@ $result_trees{'node_in_copying_not_closed'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -100,7 +102,7 @@ $result_trees{'node_in_copying_not_closed'} = {
               'text' => 'Top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +132,8 @@ $result_trees{'node_in_copying_not_closed'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -172,9 +175,11 @@ $result_sectioning{'node_in_copying_not_closed'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -192,17 +197,20 @@ $result_nodes{'node_in_copying_not_closed'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'node_in_copying_not_closed'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'node_in_copying_not_closed'} = [
diff --git a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
index ce09e0eec1..388a96603f 100644
--- a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
@@ -26,7 +26,7 @@ $result_trees{'node_on_index_entry_line'} = {
             }
           ],
           'cmdname' => 'cindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -63,7 +63,7 @@ $result_trees{'node_on_index_entry_line'} = {
               'text' => 'b'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -83,7 +83,7 @@ $result_trees{'node_on_index_entry_line'} = {
               'text' => 'c'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -103,7 +103,7 @@ $result_trees{'node_on_index_entry_line'} = {
               'text' => 'd'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -167,7 +167,9 @@ $result_trees{'node_on_index_entry_line'} = {
             'normalized' => 'd'
           }
         ],
-        'normalized' => 'a',
+        'normalized' => 'a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -205,6 +207,7 @@ $result_nodes{'node_on_index_entry_line'} = {
   'extra' => {
     'normalized' => 'a'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'extra' => {
@@ -244,6 +247,7 @@ $result_menus{'node_on_index_entry_line'} = {
   'extra' => {
     'normalized' => 'a'
   },
+  'info' => {},
   'structure' => {}
 };
 
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 af574f5a31..e8c2385694 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -64,7 +64,7 @@ $result_trees{'on_block_command_line'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -133,7 +133,7 @@ $result_trees{'on_block_command_line'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -142,9 +142,11 @@ $result_trees{'on_block_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -161,7 +163,9 @@ $result_trees{'on_block_command_line'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -270,7 +274,7 @@ $result_trees{'on_block_command_line'} = {
                           'text' => 'exdent'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -278,7 +282,7 @@ $result_trees{'on_block_command_line'} = {
                     }
                   ],
                   'cmdname' => 'exdent',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -301,7 +305,7 @@ $result_trees{'on_block_command_line'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -310,9 +314,11 @@ $result_trees{'on_block_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -320,7 +326,7 @@ $result_trees{'on_block_command_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index 3de9dc59a2..794f4053c9 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -129,7 +129,7 @@ $result_trees{'on_def_line'} = {
                               'text' => 'exdent'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -138,7 +138,9 @@ $result_trees{'on_def_line'} = {
                       ],
                       'cmdname' => 'exdent',
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -298,7 +300,7 @@ $result_trees{'on_def_line'} = {
                               'text' => 'exdentx'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -307,7 +309,9 @@ $result_trees{'on_def_line'} = {
                       ],
                       'cmdname' => 'exdent',
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -342,7 +346,9 @@ $result_trees{'on_def_line'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn'
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -360,7 +366,7 @@ $result_trees{'on_def_line'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -369,9 +375,11 @@ $result_trees{'on_def_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -379,7 +387,7 @@ $result_trees{'on_def_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
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 aee17580d1..a50888cec6 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -104,7 +104,7 @@ $result_trees{'on_index_entry_line'} = {
                           'text' => 'exdent'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -112,7 +112,7 @@ $result_trees{'on_index_entry_line'} = {
                     }
                   ],
                   'cmdname' => 'exdent',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -137,7 +137,9 @@ $result_trees{'on_index_entry_line'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl 
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index d23334e8c0..6f2bcaa4a6 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -104,7 +104,7 @@ $result_trees{'on_itemize_line'} = {
                           'text' => 'exdent'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -112,7 +112,7 @@ $result_trees{'on_itemize_line'} = {
                     }
                   ],
                   'cmdname' => 'exdent',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -161,7 +161,7 @@ $result_trees{'on_itemize_line'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -170,9 +170,11 @@ $result_trees{'on_itemize_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -180,7 +182,7 @@ $result_trees{'on_itemize_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -209,7 +211,7 @@ $result_trees{'on_itemize_line'} = {
                   'text' => 'in item'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -226,7 +228,7 @@ $result_trees{'on_itemize_line'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -235,9 +237,11 @@ $result_trees{'on_itemize_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -245,7 +249,7 @@ $result_trees{'on_itemize_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/on_node_line.pl 
b/tp/t/results/invalid_nestings/on_node_line.pl
index 73f466d304..441e2aa15d 100644
--- a/tp/t/results/invalid_nestings/on_node_line.pl
+++ b/tp/t/results/invalid_nestings/on_node_line.pl
@@ -30,7 +30,7 @@ $result_trees{'on_node_line'} = {
                       'text' => 'b'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -41,7 +41,7 @@ $result_trees{'on_node_line'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -52,7 +52,7 @@ $result_trees{'on_node_line'} = {
                       'text' => 'filename'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -181,7 +181,7 @@ $result_trees{'on_node_line'} = {
                       'text' => 'exdent'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -189,7 +189,7 @@ $result_trees{'on_node_line'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -199,7 +199,7 @@ $result_trees{'on_node_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -230,7 +230,9 @@ $result_trees{'on_node_line'} = {
             'normalized' => '-'
           }
         ],
-        'normalized' => 'a',
+        'normalized' => 'a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -265,6 +267,7 @@ $result_nodes{'on_node_line'} = {
   'extra' => {
     'normalized' => 'a'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'extra' => {
@@ -293,6 +296,7 @@ $result_menus{'on_node_line'} = {
   'extra' => {
     'normalized' => 'a'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index a0bf6eac6f..b5b5d58aca 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -108,7 +108,7 @@ $result_trees{'on_section_line'} = {
                       'text' => 'exdent'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -116,7 +116,7 @@ $result_trees{'on_section_line'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -130,7 +130,7 @@ $result_trees{'on_section_line'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -157,7 +157,7 @@ $result_sectioning{'on_section_line'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
diff --git a/tp/t/results/invalid_nestings/on_subheading_line.pl 
b/tp/t/results/invalid_nestings/on_subheading_line.pl
index 0e84181f13..0de4ce77bd 100644
--- a/tp/t/results/invalid_nestings/on_subheading_line.pl
+++ b/tp/t/results/invalid_nestings/on_subheading_line.pl
@@ -107,7 +107,7 @@ $result_trees{'on_subheading_line'} = {
                           'text' => 'exdent'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -115,7 +115,7 @@ $result_trees{'on_subheading_line'} = {
                     }
                   ],
                   'cmdname' => 'exdent',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -129,7 +129,7 @@ $result_trees{'on_subheading_line'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl 
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index acb495c3e8..af95919edf 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -18,7 +18,7 @@ $result_trees{'quotation_in_ref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,7 @@ $result_trees{'quotation_in_ref'} = {
                   'type' => 'brace_command_arg'
                 },
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '
 '
                   },
@@ -65,7 +65,7 @@ $result_trees{'quotation_in_ref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -91,7 +91,7 @@ $result_trees{'quotation_in_ref'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -100,9 +100,11 @@ $result_trees{'quotation_in_ref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -138,7 +140,9 @@ $result_trees{'quotation_in_ref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -172,14 +176,16 @@ $result_nodes{'quotation_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'quotation_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'quotation_in_ref'} = [
diff --git a/tp/t/results/invalid_nestings/quotation_in_style_command.pl 
b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
index b4f75f52b5..6d83f82445 100644
--- a/tp/t/results/invalid_nestings/quotation_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
@@ -36,7 +36,7 @@ $result_trees{'quotation_in_style_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -62,7 +62,7 @@ $result_trees{'quotation_in_style_command'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +71,11 @@ $result_trees{'quotation_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/invalid_nestings/raw_block_on_line.pl 
b/tp/t/results/invalid_nestings/raw_block_on_line.pl
index b85a8b8839..ab47deecd0 100644
--- a/tp/t/results/invalid_nestings/raw_block_on_line.pl
+++ b/tp/t/results/invalid_nestings/raw_block_on_line.pl
@@ -16,7 +16,7 @@ $result_trees{'raw_block_on_line'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -40,7 +40,7 @@ $result_trees{'raw_block_on_line'} = {
             }
           ],
           'cmdname' => 'cindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/recursive_copying.pl 
b/tp/t/results/invalid_nestings/recursive_copying.pl
index a26d397b1d..24f3650ff7 100644
--- a/tp/t/results/invalid_nestings/recursive_copying.pl
+++ b/tp/t/results/invalid_nestings/recursive_copying.pl
@@ -12,7 +12,7 @@ $result_trees{'recursive_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -48,7 +48,7 @@ $result_trees{'recursive_copying'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -57,9 +57,11 @@ $result_trees{'recursive_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/invalid_nestings/ref_in_anchor.pl 
b/tp/t/results/invalid_nestings/ref_in_anchor.pl
index fed907bfa8..095142f97b 100644
--- a/tp/t/results/invalid_nestings/ref_in_anchor.pl
+++ b/tp/t/results/invalid_nestings/ref_in_anchor.pl
@@ -18,7 +18,7 @@ $result_trees{'ref_in_anchor'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +96,9 @@ $result_trees{'ref_in_anchor'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -125,14 +127,16 @@ $result_nodes{'ref_in_anchor'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'ref_in_anchor'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'ref_in_anchor'} = [
diff --git a/tp/t/results/invalid_nestings/ref_in_ref.pl 
b/tp/t/results/invalid_nestings/ref_in_ref.pl
index 41ca1ec1b0..4a1ae9040e 100644
--- a/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -18,7 +18,7 @@ $result_trees{'ref_in_ref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +96,9 @@ $result_trees{'ref_in_ref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -125,14 +127,16 @@ $result_nodes{'ref_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'ref_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'ref_in_ref'} = [
diff --git a/tp/t/results/invalid_nestings/section_in_copying.pl 
b/tp/t/results/invalid_nestings/section_in_copying.pl
index 5b94697bc8..8645d7df46 100644
--- a/tp/t/results/invalid_nestings/section_in_copying.pl
+++ b/tp/t/results/invalid_nestings/section_in_copying.pl
@@ -12,7 +12,7 @@ $result_trees{'section_in_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -58,7 +58,7 @@ $result_trees{'section_in_copying'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -66,7 +66,7 @@ $result_trees{'section_in_copying'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -96,7 +96,7 @@ $result_sectioning{'section_in_copying'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_in_flushright.pl 
b/tp/t/results/invalid_nestings/section_in_flushright.pl
index 5834867fb6..31c9c6fedf 100644
--- a/tp/t/results/invalid_nestings/section_in_flushright.pl
+++ b/tp/t/results/invalid_nestings/section_in_flushright.pl
@@ -12,7 +12,7 @@ $result_trees{'section_in_flushright'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -58,7 +58,7 @@ $result_trees{'section_in_flushright'} = {
               'text' => 'a section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -66,7 +66,7 @@ $result_trees{'section_in_flushright'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -99,7 +99,7 @@ $result_sectioning{'section_in_flushright'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_in_footnote.pl 
b/tp/t/results/invalid_nestings/section_in_footnote.pl
index f5a1f597c1..2548b90e31 100644
--- a/tp/t/results/invalid_nestings/section_in_footnote.pl
+++ b/tp/t/results/invalid_nestings/section_in_footnote.pl
@@ -33,7 +33,7 @@ $result_trees{'section_in_footnote'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
@@ -57,7 +57,7 @@ $result_trees{'section_in_footnote'} = {
               'text' => 'a section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -65,7 +65,7 @@ $result_trees{'section_in_footnote'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -95,7 +95,7 @@ $result_sectioning{'section_in_footnote'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_in_math.pl 
b/tp/t/results/invalid_nestings/section_in_math.pl
index 7e7fd5fe6a..48bb3e1236 100644
--- a/tp/t/results/invalid_nestings/section_in_math.pl
+++ b/tp/t/results/invalid_nestings/section_in_math.pl
@@ -70,7 +70,7 @@ $result_trees{'section_in_math'} = {
               'text' => 'sec1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +107,7 @@ $result_trees{'section_in_math'} = {
                 }
               ],
               'cmdname' => 'math',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -120,7 +120,7 @@ $result_trees{'section_in_math'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +137,7 @@ $result_trees{'section_in_math'} = {
               'text' => 'sec2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -145,7 +145,7 @@ $result_trees{'section_in_math'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -186,7 +186,7 @@ $result_sectioning{'section_in_math'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
@@ -195,7 +195,7 @@ $result_sectioning{'section_in_math'} = {
       },
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 2,
diff --git a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl 
b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
index e606f5dffa..83a7e7adfa 100644
--- a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
+++ b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
@@ -23,7 +23,7 @@ $result_trees{'section_in_nested_block_commands'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -44,7 +44,7 @@ $result_trees{'section_in_nested_block_commands'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -52,7 +52,7 @@ $result_trees{'section_in_nested_block_commands'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -83,7 +83,7 @@ $result_trees{'section_in_nested_block_commands'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -126,7 +126,9 @@ $result_trees{'section_in_nested_block_commands'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -146,7 +148,7 @@ $result_trees{'section_in_nested_block_commands'} = {
               'text' => 'a section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -154,7 +156,7 @@ $result_trees{'section_in_nested_block_commands'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -195,7 +197,7 @@ $result_sectioning{'section_in_nested_block_commands'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl 
b/tp/t/results/invalid_nestings/section_in_table.pl
index 89653735d6..71c871dc4c 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -23,7 +23,7 @@ $result_trees{'section_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -44,7 +44,7 @@ $result_trees{'section_in_table'} = {
                               'text' => 'Before'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -52,7 +52,7 @@ $result_trees{'section_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -79,7 +79,9 @@ $result_trees{'section_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -99,7 +101,7 @@ $result_trees{'section_in_table'} = {
               'text' => 'Subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -132,7 +134,7 @@ $result_trees{'section_in_table'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -170,7 +172,7 @@ $result_sectioning{'section_in_table'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_on_def_line.pl 
b/tp/t/results/invalid_nestings/section_on_def_line.pl
index 0356c47913..6cbacc82ed 100644
--- a/tp/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_def_line.pl
@@ -35,7 +35,7 @@ $result_trees{'section_on_def_line'} = {
               'type' => 'def_line'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -55,7 +55,7 @@ $result_trees{'section_on_def_line'} = {
               'text' => 's'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -84,7 +84,7 @@ $result_trees{'section_on_def_line'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -116,7 +116,7 @@ $result_sectioning{'section_on_def_line'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_on_defx_line.pl 
b/tp/t/results/invalid_nestings/section_on_defx_line.pl
index 7ba775d4aa..81c6889314 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -117,7 +117,9 @@ $result_trees{'section_on_defx_line'} = {
               'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'deffnx'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -128,7 +130,7 @@ $result_trees{'section_on_defx_line'} = {
               'type' => 'def_line'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -148,7 +150,7 @@ $result_trees{'section_on_defx_line'} = {
               'text' => 's'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -177,7 +179,7 @@ $result_trees{'section_on_defx_line'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -216,7 +218,7 @@ $result_sectioning{'section_on_defx_line'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
index 49d0fc0c50..77f38bfaf4 100644
--- a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
@@ -21,7 +21,7 @@ $result_trees{'section_on_index_entry_line'} = {
             }
           ],
           'cmdname' => 'cindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -41,7 +41,7 @@ $result_trees{'section_on_index_entry_line'} = {
               'text' => 'b'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -65,7 +65,7 @@ $result_trees{'section_on_index_entry_line'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -95,7 +95,7 @@ $result_sectioning{'section_on_index_entry_line'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
diff --git 
a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl 
b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
index fd02588304..34b4c90989 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
@@ -49,7 +49,7 @@ $result_trees{'style_not_closed_before_first_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -80,7 +80,9 @@ $result_trees{'style_not_closed_before_first_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -111,14 +113,16 @@ $result_nodes{'style_not_closed_before_first_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'style_not_closed_before_first_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'style_not_closed_before_first_node'} = [
diff --git a/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl 
b/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl
index 5eab0510d8..83cace9550 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_in_block_command.pl
@@ -12,7 +12,7 @@ $result_trees{'style_not_closed_in_block_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -56,7 +56,7 @@ $result_trees{'style_not_closed_in_block_command'} = {
                       'text' => 'cartouche'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +65,11 @@ $result_trees{'style_not_closed_in_block_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl 
b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
index a3664f2bcb..7b149b6a6d 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
@@ -23,7 +23,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -44,7 +44,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                               'text' => 'first item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -52,7 +52,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -114,7 +114,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                               'text' => 'in item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -122,7 +122,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -145,7 +145,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -154,9 +154,11 @@ $result_trees{'style_not_closed_in_table_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -165,7 +167,9 @@ $result_trees{'style_not_closed_in_table_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
index 770664832a..dafcc69b80 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
@@ -18,7 +18,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -138,7 +140,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -147,9 +149,11 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -193,7 +197,8 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -210,7 +215,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -230,7 +235,9 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -247,7 +254,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -286,7 +293,8 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -354,9 +362,11 @@ 
$result_sectioning{'style_not_closed_no_newline_root_commands'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -367,9 +377,11 @@ 
$result_sectioning{'style_not_closed_no_newline_root_commands'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -398,6 +410,7 @@ $result_nodes{'style_not_closed_no_newline_root_commands'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -407,6 +420,7 @@ $result_nodes{'style_not_closed_no_newline_root_commands'} 
= {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -414,12 +428,14 @@ 
$result_nodes{'style_not_closed_no_newline_root_commands'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -437,12 +453,14 @@ 
$result_menus{'style_not_closed_no_newline_root_commands'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
index 7215fb1e6c..f45d60f914 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
@@ -18,7 +18,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'style_not_closed_root_commands'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'style_not_closed_root_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -138,7 +140,7 @@ $result_trees{'style_not_closed_root_commands'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -147,9 +149,11 @@ $result_trees{'style_not_closed_root_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -198,7 +202,8 @@ $result_trees{'style_not_closed_root_commands'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -215,7 +220,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -235,7 +240,9 @@ $result_trees{'style_not_closed_root_commands'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -252,7 +259,7 @@ $result_trees{'style_not_closed_root_commands'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -296,7 +303,8 @@ $result_trees{'style_not_closed_root_commands'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -368,9 +376,11 @@ $result_sectioning{'style_not_closed_root_commands'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -381,9 +391,11 @@ $result_sectioning{'style_not_closed_root_commands'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -412,6 +424,7 @@ $result_nodes{'style_not_closed_root_commands'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -421,6 +434,7 @@ $result_nodes{'style_not_closed_root_commands'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -428,12 +442,14 @@ $result_nodes{'style_not_closed_root_commands'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -451,12 +467,14 @@ $result_menus{'style_not_closed_root_commands'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl 
b/tp/t/results/invalid_nestings/tab_in_index.pl
index 8cf38616b6..e18243148b 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -33,7 +33,7 @@ $result_trees{'tab_in_index'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -99,7 +99,7 @@ $result_trees{'tab_in_index'} = {
                                       'text' => 'in tab'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -118,7 +118,9 @@ $result_trees{'tab_in_index'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'vr',
                                   'index_type_command' => 'vindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -158,7 +160,7 @@ $result_trees{'tab_in_index'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -167,9 +169,11 @@ $result_trees{'tab_in_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -192,7 +196,9 @@ $result_trees{'tab_in_index'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl 
b/tp/t/results/invalid_nestings/table_in_code.pl
index be1e50f249..4f1a9a99ac 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -51,7 +51,7 @@ $result_trees{'table_in_code'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -72,7 +72,7 @@ $result_trees{'table_in_code'} = {
                               'text' => 'line'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -80,7 +80,7 @@ $result_trees{'table_in_code'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -117,7 +117,7 @@ $result_trees{'table_in_code'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -126,9 +126,11 @@ $result_trees{'table_in_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -137,7 +139,9 @@ $result_trees{'table_in_code'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
index 2f57fd2dd5..e0f143384a 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
@@ -12,7 +12,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +101,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                           'type' => 'command_as_argument'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -122,7 +122,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                                       'text' => 'item'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -130,7 +130,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                                 }
                               ],
                               'cmdname' => 'item',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -165,7 +165,9 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
+                    'command_as_argument' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -185,7 +187,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -194,9 +196,11 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git 
a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
index 21632cb933..ba909fb74e 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
@@ -12,7 +12,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -69,7 +69,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                               'type' => 'command_as_argument'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -90,7 +90,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                                           'text' => 'item'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -98,7 +98,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                                     }
                                   ],
                                   'cmdname' => 'item',
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'source_info' => {
@@ -129,7 +129,9 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                         }
                       ],
                       'extra' => {
-                        'command_as_argument' => {},
+                        'command_as_argument' => {}
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -165,7 +167,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -174,9 +176,11 @@ $result_trees{'table_not_closed_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/invalid_nestings/table_on_item_line.pl 
b/tp/t/results/invalid_nestings/table_on_item_line.pl
index a0648e3f65..921f6160a8 100644
--- a/tp/t/results/invalid_nestings/table_on_item_line.pl
+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
@@ -23,7 +23,7 @@ $result_trees{'table_on_item_line'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -57,7 +57,7 @@ $result_trees{'table_on_item_line'} = {
                                       'type' => 'command_as_argument'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -71,7 +71,9 @@ $result_trees{'table_on_item_line'} = {
                                 }
                               ],
                               'extra' => {
-                                'command_as_argument' => {},
+                                'command_as_argument' => {}
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -85,7 +87,7 @@ $result_trees{'table_on_item_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -121,7 +123,7 @@ $result_trees{'table_on_item_line'} = {
                               'text' => 'in nested table item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -129,7 +131,7 @@ $result_trees{'table_on_item_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -173,7 +175,7 @@ $result_trees{'table_on_item_line'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -182,9 +184,11 @@ $result_trees{'table_on_item_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -193,7 +197,9 @@ $result_trees{'table_on_item_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
index 70c7ddcc18..8280479309 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
@@ -44,7 +44,7 @@ $result_trees{'unclosed_verb_end_of_line_on_misc_line'} = {
             }
           ],
           'cmdname' => 'setfilename',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
index ba8dd57879..7e07655375 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
@@ -43,7 +43,7 @@ $result_trees{'unclosed_verb_on_misc_line'} = {
             }
           ],
           'cmdname' => 'setfilename',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
index 3d7a6235c5..aa6f84b789 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
@@ -55,7 +55,7 @@ $result_trees{'unclosed_verb_on_section_line'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -85,7 +85,7 @@ $result_sectioning{'unclosed_verb_on_section_line'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 14996d5064..7491915730 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -18,7 +18,7 @@ $result_trees{'verbatim_in_ref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,7 @@ $result_trees{'verbatim_in_ref'} = {
                   'type' => 'brace_command_arg'
                 },
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' 
 '
                   },
@@ -65,7 +65,7 @@ $result_trees{'verbatim_in_ref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -87,7 +87,7 @@ $result_trees{'verbatim_in_ref'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,9 +96,11 @@ $result_trees{'verbatim_in_ref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -138,7 +140,9 @@ $result_trees{'verbatim_in_ref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -171,14 +175,16 @@ $result_nodes{'verbatim_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'verbatim_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'verbatim_in_ref'} = [
diff --git a/tp/t/results/itemize/accent_argument.pl 
b/tp/t/results/itemize/accent_argument.pl
index a8b60e9f0f..f57f9b16c9 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -25,7 +25,7 @@ $result_trees{'accent_argument'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -68,7 +68,7 @@ $result_trees{'accent_argument'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -77,9 +77,11 @@ $result_trees{'accent_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -87,7 +89,7 @@ $result_trees{'accent_argument'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -124,7 +126,7 @@ $result_trees{'accent_argument'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -167,7 +169,7 @@ $result_trees{'accent_argument'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -176,9 +178,11 @@ $result_trees{'accent_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -186,7 +190,7 @@ $result_trees{'accent_argument'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/asis_as_itemize_argument.pl 
b/tp/t/results/itemize/asis_as_itemize_argument.pl
index e05d8b72b8..a7cf0177f4 100644
--- a/tp/t/results/itemize/asis_as_itemize_argument.pl
+++ b/tp/t/results/itemize/asis_as_itemize_argument.pl
@@ -23,7 +23,7 @@ $result_trees{'asis_as_itemize_argument'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -66,7 +66,7 @@ $result_trees{'asis_as_itemize_argument'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -75,9 +75,11 @@ $result_trees{'asis_as_itemize_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -86,7 +88,9 @@ $result_trees{'asis_as_itemize_argument'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/bad_enumerate_arguments.pl 
b/tp/t/results/itemize/bad_enumerate_arguments.pl
index a5687b731b..58d3d43e96 100644
--- a/tp/t/results/itemize/bad_enumerate_arguments.pl
+++ b/tp/t/results/itemize/bad_enumerate_arguments.pl
@@ -17,7 +17,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   'text' => 'a b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -34,7 +34,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'bad_enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -54,7 +56,9 @@ $result_trees{'bad_enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -76,7 +80,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   'text' => '!'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -93,7 +97,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -102,9 +106,11 @@ $result_trees{'bad_enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -113,7 +119,9 @@ $result_trees{'bad_enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -150,7 +158,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -167,7 +175,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -176,9 +184,11 @@ $result_trees{'bad_enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -187,7 +197,9 @@ $result_trees{'bad_enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -212,7 +224,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   'cmdname' => '@'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -229,7 +241,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -238,9 +250,11 @@ $result_trees{'bad_enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -249,7 +263,9 @@ $result_trees{'bad_enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'a',
+            'enumerate_specification' => 'a'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -271,7 +287,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                   'text' => 'a0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -288,7 +304,7 @@ $result_trees{'bad_enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -297,9 +313,11 @@ $result_trees{'bad_enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -308,7 +326,9 @@ $result_trees{'bad_enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/comment_first_on_enumerate_line.pl 
b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
index 7e58512f43..37063286e8 100644
--- a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
+++ b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
@@ -69,7 +69,7 @@ $result_trees{'comment_first_on_enumerate_line'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -78,9 +78,11 @@ $result_trees{'comment_first_on_enumerate_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -89,7 +91,9 @@ $result_trees{'comment_first_on_enumerate_line'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl 
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index 4323ca97ae..25d4cf1b70 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -75,7 +75,7 @@ $result_trees{'comment_first_on_itemize_line'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -84,9 +84,11 @@ $result_trees{'comment_first_on_itemize_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -95,7 +97,9 @@ $result_trees{'comment_first_on_itemize_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/empty_accent_argument.pl 
b/tp/t/results/itemize/empty_accent_argument.pl
index 9629b13246..a784d3874d 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -80,7 +80,7 @@ $result_trees{'empty_accent_argument'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -89,9 +89,11 @@ $result_trees{'empty_accent_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -99,7 +101,7 @@ $result_trees{'empty_accent_argument'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -127,7 +129,7 @@ $result_trees{'empty_accent_argument'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -170,7 +172,7 @@ $result_trees{'empty_accent_argument'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -179,9 +181,11 @@ $result_trees{'empty_accent_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -189,7 +193,7 @@ $result_trees{'empty_accent_argument'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -222,7 +226,7 @@ $result_trees{'empty_accent_argument'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -265,7 +269,7 @@ $result_trees{'empty_accent_argument'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -274,9 +278,11 @@ $result_trees{'empty_accent_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -284,7 +290,7 @@ $result_trees{'empty_accent_argument'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/enumerate_and_empty_lines.pl 
b/tp/t/results/itemize/enumerate_and_empty_lines.pl
index 20cf0876ee..b9493f3354 100644
--- a/tp/t/results/itemize/enumerate_and_empty_lines.pl
+++ b/tp/t/results/itemize/enumerate_and_empty_lines.pl
@@ -12,7 +12,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -58,7 +58,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -93,7 +93,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -102,9 +102,11 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 8,
@@ -176,7 +178,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -202,7 +204,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -211,9 +213,11 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 16,
@@ -248,7 +252,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -274,7 +278,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                               'text' => 'quotation'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -283,9 +287,11 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 20,
@@ -330,7 +336,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -356,7 +362,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                               'text' => 'quotation'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -365,9 +371,11 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 26,
@@ -399,7 +407,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -408,9 +416,11 @@ $result_trees{'enumerate_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -435,7 +445,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -478,7 +488,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -487,9 +497,11 @@ $result_trees{'enumerate_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
diff --git a/tp/t/results/itemize/enumerate_argument.pl 
b/tp/t/results/itemize/enumerate_argument.pl
index c011104c25..470a1da7ee 100644
--- a/tp/t/results/itemize/enumerate_argument.pl
+++ b/tp/t/results/itemize/enumerate_argument.pl
@@ -17,7 +17,7 @@ $result_trees{'enumerate_argument'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -34,7 +34,7 @@ $result_trees{'enumerate_argument'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'enumerate_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -54,7 +56,9 @@ $result_trees{'enumerate_argument'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -107,7 +111,7 @@ $result_trees{'enumerate_argument'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -116,9 +120,11 @@ $result_trees{'enumerate_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -127,7 +133,9 @@ $result_trees{'enumerate_argument'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'A',
+            'enumerate_specification' => 'A'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -165,7 +173,9 @@ $result_trees{'enumerate_argument'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -181,7 +191,7 @@ $result_trees{'enumerate_argument'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -190,9 +200,11 @@ $result_trees{'enumerate_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -201,7 +213,9 @@ $result_trees{'enumerate_argument'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'z',
+            'enumerate_specification' => 'z'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/enumerate_argument_item.pl 
b/tp/t/results/itemize/enumerate_argument_item.pl
index fa5fd0f284..559c9361dd 100644
--- a/tp/t/results/itemize/enumerate_argument_item.pl
+++ b/tp/t/results/itemize/enumerate_argument_item.pl
@@ -17,7 +17,7 @@ $result_trees{'enumerate_argument_item'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -86,7 +86,7 @@ $result_trees{'enumerate_argument_item'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -95,9 +95,11 @@ $result_trees{'enumerate_argument_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -106,7 +108,9 @@ $result_trees{'enumerate_argument_item'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -211,7 +215,7 @@ $result_trees{'enumerate_argument_item'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -220,9 +224,11 @@ $result_trees{'enumerate_argument_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -231,7 +237,9 @@ $result_trees{'enumerate_argument_item'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'A',
+            'enumerate_specification' => 'A'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -269,7 +277,9 @@ $result_trees{'enumerate_argument_item'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -337,7 +347,7 @@ $result_trees{'enumerate_argument_item'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -346,9 +356,11 @@ $result_trees{'enumerate_argument_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -357,7 +369,9 @@ $result_trees{'enumerate_argument_item'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'z',
+            'enumerate_specification' => 'z'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/enumerate_in_example.pl 
b/tp/t/results/itemize/enumerate_in_example.pl
index 68e4f473d4..9d01e79bc3 100644
--- a/tp/t/results/itemize/enumerate_in_example.pl
+++ b/tp/t/results/itemize/enumerate_in_example.pl
@@ -17,7 +17,7 @@ $result_trees{'enumerate_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -29,7 +29,7 @@ $result_trees{'enumerate_in_example'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -107,7 +107,7 @@ $result_trees{'enumerate_in_example'} = {
                           'text' => 'enumerate'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -116,9 +116,11 @@ $result_trees{'enumerate_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'enumerate'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 8,
@@ -143,7 +145,7 @@ $result_trees{'enumerate_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -152,9 +154,11 @@ $result_trees{'enumerate_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
diff --git a/tp/t/results/itemize/enumerate_letters.pl 
b/tp/t/results/itemize/enumerate_letters.pl
index 3599129d26..4996b939b1 100644
--- a/tp/t/results/itemize/enumerate_letters.pl
+++ b/tp/t/results/itemize/enumerate_letters.pl
@@ -17,7 +17,7 @@ $result_trees{'enumerate_letters'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -5390,7 +5390,7 @@ $result_trees{'enumerate_letters'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -5399,9 +5399,11 @@ $result_trees{'enumerate_letters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 208,
@@ -5410,7 +5412,9 @@ $result_trees{'enumerate_letters'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'c',
+            'enumerate_specification' => 'c'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl 
b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
index a1e0bc9b99..e0bb2296c5 100644
--- a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
@@ -12,7 +12,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -45,7 +45,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
                           'text' => 'itemx enumerate'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -53,7 +53,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
                     }
                   ],
                   'cmdname' => 'itemx',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -93,7 +93,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -102,9 +102,11 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/itemize/headitem_itemx_in_itemize.pl 
b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
index 59413ca757..fe2dc25ae6 100644
--- a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
@@ -18,7 +18,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -51,7 +51,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
                           'text' => 'itemx'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -59,7 +59,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
                     }
                   ],
                   'cmdname' => 'itemx',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -99,7 +99,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -108,9 +108,11 @@ $result_trees{'headitem_itemx_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl 
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index f7c8dac249..df5dd8e0c5 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -24,7 +24,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +116,9 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -130,7 +135,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -147,7 +152,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -216,7 +221,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -225,9 +230,11 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -252,7 +259,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -276,7 +283,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                           'text' => 'index inter in enumerate between lines'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -296,7 +303,9 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -348,7 +357,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -357,9 +366,11 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -384,7 +395,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -408,7 +419,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                           'text' => 'index inter in enumerate after line'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -428,7 +439,9 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -475,7 +488,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -484,9 +497,11 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -511,7 +526,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -530,7 +545,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                           'text' => 'index inter in enumerate before line'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -550,7 +565,9 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -602,7 +619,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -611,9 +628,11 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -638,7 +657,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -663,7 +682,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                               'text' => 'cindex'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -683,7 +702,9 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
                           'index_type_command' => 'cindex'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -733,7 +754,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -742,9 +763,11 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -769,7 +792,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -788,7 +811,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                           'text' => 'first idx'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -808,7 +831,9 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -842,7 +867,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                           'text' => 'sedond idx'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -862,7 +887,9 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -880,7 +907,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                           'text' => 'another'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -900,7 +927,9 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -947,7 +976,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -956,9 +985,11 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -981,7 +1012,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1111,9 +1143,11 @@ $result_sectioning{'inter_item_commands_in_enumerate'} = 
{
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1124,9 +1158,11 @@ $result_sectioning{'inter_item_commands_in_enumerate'} = 
{
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1155,10 +1191,12 @@ $result_nodes{'inter_item_commands_in_enumerate'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1166,12 +1204,14 @@ $result_nodes{'inter_item_commands_in_enumerate'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1187,6 +1227,7 @@ $result_menus{'inter_item_commands_in_enumerate'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index b097781963..0b79f7a570 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -24,7 +24,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'inter_item_commands_in_itemize'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'inter_item_commands_in_itemize'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +116,9 @@ $result_trees{'inter_item_commands_in_itemize'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -130,7 +135,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -158,7 +163,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -193,7 +198,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                           'text' => 'also a cindex in itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -213,7 +218,9 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -260,7 +267,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -269,9 +276,11 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -280,7 +289,9 @@ $result_trees{'inter_item_commands_in_itemize'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -308,7 +319,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -327,7 +338,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                           'text' => 'index entry within itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -347,7 +358,9 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -407,7 +420,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                           'text' => 'item'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -427,7 +440,9 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -464,7 +479,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -473,9 +488,11 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -484,7 +501,9 @@ $result_trees{'inter_item_commands_in_itemize'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -507,7 +526,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -548,7 +567,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                               'text' => 'also a cindex in itemize'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -568,7 +587,9 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
                           'index_type_command' => 'cindex'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -618,7 +639,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -627,9 +648,11 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -647,7 +670,8 @@ $result_trees{'inter_item_commands_in_itemize'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -737,9 +761,11 @@ $result_sectioning{'inter_item_commands_in_itemize'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -750,9 +776,11 @@ $result_sectioning{'inter_item_commands_in_itemize'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -781,10 +809,12 @@ $result_nodes{'inter_item_commands_in_itemize'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -792,12 +822,14 @@ $result_nodes{'inter_item_commands_in_itemize'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -813,6 +845,7 @@ $result_menus{'inter_item_commands_in_itemize'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl 
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index 5e86dc92d5..7a238e001e 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -17,7 +17,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'text' => 'youhou'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -63,7 +63,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -98,7 +98,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -107,9 +107,11 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 8,
@@ -181,7 +183,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -207,7 +209,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -216,9 +218,11 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 16,
@@ -235,7 +239,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -261,7 +265,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                               'text' => 'quotation'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -270,9 +274,11 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 19,
@@ -317,7 +323,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -343,7 +349,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                               'text' => 'quotation'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -352,9 +358,11 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 25,
@@ -386,7 +394,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -395,9 +403,11 @@ $result_trees{'itemize_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -405,7 +415,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -428,7 +438,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -474,7 +484,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -509,7 +519,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -518,9 +528,11 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 35,
@@ -592,7 +604,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -618,7 +630,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -627,9 +639,11 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 43,
@@ -664,7 +678,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -690,7 +704,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                               'text' => 'quotation'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -699,9 +713,11 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 47,
@@ -746,7 +762,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -772,7 +788,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                               'text' => 'quotation'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -781,9 +797,11 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 53,
@@ -815,7 +833,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -824,9 +842,11 @@ $result_trees{'itemize_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 54,
@@ -871,7 +891,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -918,7 +938,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -927,9 +947,11 @@ $result_trees{'itemize_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 60,
@@ -938,7 +960,9 @@ $result_trees{'itemize_and_empty_lines'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -989,7 +1013,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1032,7 +1056,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                           'type' => 'command_as_argument'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1075,7 +1099,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                               'text' => 'itemize'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1084,9 +1108,11 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'itemize'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 70,
@@ -1095,7 +1121,9 @@ $result_trees{'itemize_and_empty_lines'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
+                    'command_as_argument' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1131,7 +1159,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1140,9 +1168,11 @@ $result_trees{'itemize_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 72,
@@ -1151,7 +1181,9 @@ $result_trees{'itemize_and_empty_lines'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1188,7 +1220,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1287,7 +1319,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1296,9 +1328,11 @@ $result_trees{'itemize_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 80,
@@ -1307,7 +1341,9 @@ $result_trees{'itemize_and_empty_lines'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/itemize_in_example.pl 
b/tp/t/results/itemize/itemize_in_example.pl
index aaf5c48293..c4c0c06ccc 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'itemize_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -35,7 +35,7 @@ $result_trees{'itemize_in_example'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -87,7 +87,7 @@ $result_trees{'itemize_in_example'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -96,9 +96,11 @@ $result_trees{'itemize_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
@@ -107,7 +109,9 @@ $result_trees{'itemize_in_example'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -140,7 +144,7 @@ $result_trees{'itemize_in_example'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -183,7 +187,7 @@ $result_trees{'itemize_in_example'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -192,9 +196,11 @@ $result_trees{'itemize_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 10,
@@ -203,7 +209,9 @@ $result_trees{'itemize_in_example'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -230,7 +238,7 @@ $result_trees{'itemize_in_example'} = {
                       'text' => '+'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -273,7 +281,7 @@ $result_trees{'itemize_in_example'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -282,9 +290,11 @@ $result_trees{'itemize_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 14,
@@ -292,7 +302,7 @@ $result_trees{'itemize_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -319,7 +329,7 @@ $result_trees{'itemize_in_example'} = {
                       'text' => 'm--n'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -362,7 +372,7 @@ $result_trees{'itemize_in_example'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -371,9 +381,11 @@ $result_trees{'itemize_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 18,
@@ -381,7 +393,7 @@ $result_trees{'itemize_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -421,7 +433,7 @@ $result_trees{'itemize_in_example'} = {
                       'text' => ' a--n itemize line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -464,7 +476,7 @@ $result_trees{'itemize_in_example'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -473,9 +485,11 @@ $result_trees{'itemize_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 22,
@@ -483,7 +497,7 @@ $result_trees{'itemize_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -500,7 +514,7 @@ $result_trees{'itemize_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -509,9 +523,11 @@ $result_trees{'itemize_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
diff --git a/tp/t/results/itemize/itemize_line_commands_with_brace.pl 
b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
index 29f502965e..a978cd65b8 100644
--- a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
+++ b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
@@ -28,7 +28,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -71,7 +71,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -80,9 +80,11 @@ $result_trees{'itemize_line_commands_with_brace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -91,7 +93,9 @@ $result_trees{'itemize_line_commands_with_brace'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -124,7 +128,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -167,7 +171,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -176,9 +180,11 @@ $result_trees{'itemize_line_commands_with_brace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -187,7 +193,9 @@ $result_trees{'itemize_line_commands_with_brace'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/itemize_long_item.pl 
b/tp/t/results/itemize/itemize_long_item.pl
index 3a4f7bc72b..be9a84fddc 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -17,7 +17,7 @@ $result_trees{'itemize_long_item'} = {
                   'text' => 'youhou itemize very long item aaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -63,7 +63,7 @@ $result_trees{'itemize_long_item'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -98,7 +98,7 @@ $result_trees{'itemize_long_item'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -107,9 +107,11 @@ $result_trees{'itemize_long_item'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 8,
@@ -181,7 +183,7 @@ $result_trees{'itemize_long_item'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -207,7 +209,7 @@ $result_trees{'itemize_long_item'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -216,9 +218,11 @@ $result_trees{'itemize_long_item'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 16,
@@ -253,7 +257,7 @@ $result_trees{'itemize_long_item'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -279,7 +283,7 @@ $result_trees{'itemize_long_item'} = {
                               'text' => 'quotation'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -288,9 +292,11 @@ $result_trees{'itemize_long_item'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 20,
@@ -335,7 +341,7 @@ $result_trees{'itemize_long_item'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -361,7 +367,7 @@ $result_trees{'itemize_long_item'} = {
                               'text' => 'quotation'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -370,9 +376,11 @@ $result_trees{'itemize_long_item'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 26,
@@ -404,7 +412,7 @@ $result_trees{'itemize_long_item'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -413,9 +421,11 @@ $result_trees{'itemize_long_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -423,7 +433,7 @@ $result_trees{'itemize_long_item'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/not_closed_item.pl 
b/tp/t/results/itemize/not_closed_item.pl
index fc343eb53b..027f5468f1 100644
--- a/tp/t/results/itemize/not_closed_item.pl
+++ b/tp/t/results/itemize/not_closed_item.pl
@@ -18,7 +18,7 @@ $result_trees{'not_closed_item'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/itemize/not_closed_itemize.pl 
b/tp/t/results/itemize/not_closed_itemize.pl
index 36823984d4..43ced1c968 100644
--- a/tp/t/results/itemize/not_closed_itemize.pl
+++ b/tp/t/results/itemize/not_closed_itemize.pl
@@ -18,7 +18,7 @@ $result_trees{'not_closed_itemize'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/itemize/table_in_itemize.pl 
b/tp/t/results/itemize/table_in_itemize.pl
index c9e2749e8e..67883a7d24 100644
--- a/tp/t/results/itemize/table_in_itemize.pl
+++ b/tp/t/results/itemize/table_in_itemize.pl
@@ -23,7 +23,7 @@ $result_trees{'table_in_itemize'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -80,7 +80,7 @@ $result_trees{'table_in_itemize'} = {
                           'type' => 'command_as_argument'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -101,7 +101,7 @@ $result_trees{'table_in_itemize'} = {
                                       'text' => 'table one'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -109,7 +109,7 @@ $result_trees{'table_in_itemize'} = {
                                 }
                               ],
                               'cmdname' => 'item',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -164,7 +164,7 @@ $result_trees{'table_in_itemize'} = {
                                       'text' => 'table two'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -172,7 +172,7 @@ $result_trees{'table_in_itemize'} = {
                                 }
                               ],
                               'cmdname' => 'item',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -223,7 +223,7 @@ $result_trees{'table_in_itemize'} = {
                               'text' => 'table'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -232,9 +232,11 @@ $result_trees{'table_in_itemize'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'table'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 13,
@@ -243,7 +245,9 @@ $result_trees{'table_in_itemize'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
+                    'command_as_argument' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -301,9 +305,11 @@ $result_trees{'table_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -312,7 +318,9 @@ $result_trees{'table_in_itemize'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/itemize/w_argument.pl 
b/tp/t/results/itemize/w_argument.pl
index 956a0a123c..2683a9fa96 100644
--- a/tp/t/results/itemize/w_argument.pl
+++ b/tp/t/results/itemize/w_argument.pl
@@ -28,7 +28,7 @@ $result_trees{'w_argument'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -133,7 +133,7 @@ $result_trees{'w_argument'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -142,9 +142,11 @@ $result_trees{'w_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -153,7 +155,9 @@ $result_trees{'w_argument'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index a8e6b8830d..f6ae2c39cf 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -19,7 +19,7 @@ $result_trees{'appendix_translated'} = {
                       'text' => 'fr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'appendix_translated'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'fr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'appendix_translated'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,9 @@ $result_trees{'appendix_translated'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +97,7 @@ $result_trees{'appendix_translated'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -108,7 +112,8 @@ $result_trees{'appendix_translated'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -125,7 +130,7 @@ $result_trees{'appendix_translated'} = {
               'text' => 'dernier'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -155,7 +160,7 @@ $result_trees{'appendix_translated'} = {
           }
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -200,14 +205,16 @@ $result_sectioning{'appendix_translated'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'appendix',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 'A',
@@ -236,17 +243,20 @@ $result_nodes{'appendix_translated'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'appendix_translated'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'appendix_translated'} = [];
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index b62a19ecc4..312eb65832 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -19,7 +19,7 @@ $result_trees{'command_translated'} = {
                       'text' => 'fr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'command_translated'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'fr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'command_translated'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,9 @@ $result_trees{'command_translated'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -106,7 +110,7 @@ $result_trees{'command_translated'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -143,7 +147,8 @@ $result_trees{'command_translated'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,9 +189,11 @@ $result_sectioning{'command_translated'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -204,17 +211,20 @@ $result_nodes{'command_translated'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'command_translated'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'command_translated'} = [];
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index 56625da8fc..3bf2cb6a07 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -19,7 +19,7 @@ $result_trees{'multiple'} = {
                       'text' => 'fr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'multiple'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'fr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -45,7 +47,7 @@ $result_trees{'multiple'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -203,7 +205,7 @@ $result_trees{'multiple'} = {
                               'text' => 'defivar'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -212,9 +214,11 @@ $result_trees{'multiple'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'defivar'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 6,
@@ -222,7 +226,7 @@ $result_trees{'multiple'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -239,7 +243,7 @@ $result_trees{'multiple'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -248,9 +252,11 @@ $result_trees{'multiple'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -283,7 +289,7 @@ $result_trees{'multiple'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -303,7 +309,9 @@ $result_trees{'multiple'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -320,7 +328,7 @@ $result_trees{'multiple'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -335,7 +343,8 @@ $result_trees{'multiple'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -352,7 +361,7 @@ $result_trees{'multiple'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -373,7 +382,9 @@ $result_trees{'multiple'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -390,7 +401,7 @@ $result_trees{'multiple'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -553,7 +564,7 @@ $result_trees{'multiple'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -562,9 +573,11 @@ $result_trees{'multiple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -572,7 +585,7 @@ $result_trees{'multiple'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -594,7 +607,7 @@ $result_trees{'multiple'} = {
                   'text' => 'de'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -603,9 +616,11 @@ $result_trees{'multiple'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'de'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 19,
@@ -645,7 +660,7 @@ $result_trees{'multiple'} = {
                   'text' => 'hr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -654,9 +669,11 @@ $result_trees{'multiple'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'hr'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 23,
@@ -817,7 +834,7 @@ $result_trees{'multiple'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -826,9 +843,11 @@ $result_trees{'multiple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -836,7 +855,7 @@ $result_trees{'multiple'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -878,7 +897,7 @@ $result_trees{'multiple'} = {
                   'text' => 'vr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -889,7 +908,9 @@ $result_trees{'multiple'} = {
           'extra' => {
             'misc_args' => [
               'vr'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -899,7 +920,8 @@ $result_trees{'multiple'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1008,9 +1030,11 @@ $result_sectioning{'multiple'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1022,9 +1046,11 @@ $result_sectioning{'multiple'} = {
                     'isindex' => 1,
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1053,10 +1079,12 @@ $result_nodes{'multiple'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1064,6 +1092,7 @@ $result_nodes{'multiple'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1071,6 +1100,7 @@ $result_nodes{'multiple'} = {
         'isindex' => 1,
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1086,6 +1116,7 @@ $result_menus{'multiple'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index ab56f49285..c53f3472c6 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -19,7 +19,7 @@ $result_trees{'multiple_in_preamble'} = {
                       'text' => 'fr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'multiple_in_preamble'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'fr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -45,7 +47,7 @@ $result_trees{'multiple_in_preamble'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -203,7 +205,7 @@ $result_trees{'multiple_in_preamble'} = {
                               'text' => 'defivar'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -212,9 +214,11 @@ $result_trees{'multiple_in_preamble'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'defivar'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 6,
@@ -222,7 +226,7 @@ $result_trees{'multiple_in_preamble'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -239,7 +243,7 @@ $result_trees{'multiple_in_preamble'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -248,9 +252,11 @@ $result_trees{'multiple_in_preamble'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -277,7 +283,7 @@ $result_trees{'multiple_in_preamble'} = {
                       'text' => 'hr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -286,9 +292,11 @@ $result_trees{'multiple_in_preamble'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'hr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -314,7 +322,7 @@ $result_trees{'multiple_in_preamble'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -334,7 +342,9 @@ $result_trees{'multiple_in_preamble'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -351,7 +361,7 @@ $result_trees{'multiple_in_preamble'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -366,7 +376,8 @@ $result_trees{'multiple_in_preamble'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -383,7 +394,7 @@ $result_trees{'multiple_in_preamble'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -403,7 +414,9 @@ $result_trees{'multiple_in_preamble'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -420,7 +433,7 @@ $result_trees{'multiple_in_preamble'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -583,7 +596,7 @@ $result_trees{'multiple_in_preamble'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -592,9 +605,11 @@ $result_trees{'multiple_in_preamble'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -602,7 +617,7 @@ $result_trees{'multiple_in_preamble'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -624,7 +639,7 @@ $result_trees{'multiple_in_preamble'} = {
                   'text' => 'de'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -633,9 +648,11 @@ $result_trees{'multiple_in_preamble'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'de'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 21,
@@ -769,7 +786,7 @@ $result_trees{'multiple_in_preamble'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -778,9 +795,11 @@ $result_trees{'multiple_in_preamble'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -788,7 +807,7 @@ $result_trees{'multiple_in_preamble'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -798,7 +817,8 @@ $result_trees{'multiple_in_preamble'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -896,9 +916,11 @@ $result_sectioning{'multiple_in_preamble'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -909,9 +931,11 @@ $result_sectioning{'multiple_in_preamble'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -940,10 +964,12 @@ $result_nodes{'multiple_in_preamble'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -951,12 +977,14 @@ $result_nodes{'multiple_in_preamble'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -972,6 +1000,7 @@ $result_menus{'multiple_in_preamble'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl 
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index a2eb505356..e7470a8082 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -19,7 +19,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       'text' => 'fr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'fr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -45,7 +47,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -203,7 +205,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                               'text' => 'defivar'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -212,9 +214,11 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'defivar'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 6,
@@ -222,7 +226,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -239,7 +243,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -248,9 +252,11 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -277,7 +283,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       'text' => 'hr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -286,9 +292,11 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'hr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -325,7 +333,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                   'text' => 'de'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -334,9 +342,11 @@ $result_trees{'multiple_in_preamble_before_node'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'de'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 13,
@@ -359,7 +369,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -379,7 +389,9 @@ $result_trees{'multiple_in_preamble_before_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -396,7 +408,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -411,7 +423,8 @@ $result_trees{'multiple_in_preamble_before_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -428,7 +441,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -448,7 +461,9 @@ $result_trees{'multiple_in_preamble_before_node'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -465,7 +480,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -628,7 +643,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -637,9 +652,11 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -647,7 +664,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -657,7 +674,8 @@ $result_trees{'multiple_in_preamble_before_node'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -745,9 +763,11 @@ $result_sectioning{'multiple_in_preamble_before_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -758,9 +778,11 @@ $result_sectioning{'multiple_in_preamble_before_node'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -789,10 +811,12 @@ $result_nodes{'multiple_in_preamble_before_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -800,12 +824,14 @@ $result_nodes{'multiple_in_preamble_before_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -821,6 +847,7 @@ $result_menus{'multiple_in_preamble_before_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index 96615b3380..9740840fea 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -19,7 +19,7 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'multiple_lang_chapters.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multiple_lang_chapters.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -45,7 +47,7 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'utf-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -56,9 +58,11 @@ $result_trees{'multiple_lang_chapters'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'utf-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -94,7 +98,7 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'ja'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -103,9 +107,11 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ja'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -131,7 +137,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -151,7 +157,9 @@ $result_trees{'multiple_lang_chapters'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -168,7 +176,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'Multi language file'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -185,7 +193,7 @@ $result_trees{'multiple_lang_chapters'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -447,7 +455,7 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -456,9 +464,11 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -485,7 +495,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'text' => 'ja'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -494,9 +504,11 @@ $result_trees{'multiple_lang_chapters'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ja'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 23,
@@ -504,7 +516,8 @@ $result_trees{'multiple_lang_chapters'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -521,7 +534,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'chapter ja'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -541,7 +554,9 @@ $result_trees{'multiple_lang_chapters'} = {
             'normalized' => 'chapter-ja'
           }
         ],
-        'normalized' => 'chapter-ja',
+        'normalized' => 'chapter-ja'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -558,7 +573,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'ja'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -733,7 +748,7 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -742,9 +757,11 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -752,7 +769,7 @@ $result_trees{'multiple_lang_chapters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -774,7 +791,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'text' => 'en'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,9 +800,11 @@ $result_trees{'multiple_lang_chapters'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'en'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 31,
@@ -793,7 +812,8 @@ $result_trees{'multiple_lang_chapters'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -810,7 +830,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'chapter en'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -830,7 +850,9 @@ $result_trees{'multiple_lang_chapters'} = {
             'normalized' => 'chapter-en'
           }
         ],
-        'normalized' => 'chapter-en',
+        'normalized' => 'chapter-en'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -847,7 +869,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'en'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1022,7 +1044,7 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1031,9 +1053,11 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -1041,7 +1065,7 @@ $result_trees{'multiple_lang_chapters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1063,7 +1087,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'text' => 'fr_FR'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1072,9 +1096,11 @@ $result_trees{'multiple_lang_chapters'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr_FR'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 39,
@@ -1082,7 +1108,8 @@ $result_trees{'multiple_lang_chapters'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1099,7 +1126,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'chapter fr_FR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1119,7 +1146,9 @@ $result_trees{'multiple_lang_chapters'} = {
             'normalized' => 'chapter-fr_005fFR'
           }
         ],
-        'normalized' => 'chapter-fr_005fFR',
+        'normalized' => 'chapter-fr_005fFR'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1136,7 +1165,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'fr_FR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1272,7 +1301,7 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1281,9 +1310,11 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1291,7 +1322,7 @@ $result_trees{'multiple_lang_chapters'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1313,7 +1344,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'text' => 'de'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1322,9 +1353,11 @@ $result_trees{'multiple_lang_chapters'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'de'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 46,
@@ -1332,7 +1365,8 @@ $result_trees{'multiple_lang_chapters'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1349,7 +1383,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'chapter de'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1369,7 +1403,9 @@ $result_trees{'multiple_lang_chapters'} = {
             'normalized' => 'chapter-de'
           }
         ],
-        'normalized' => 'chapter-de',
+        'normalized' => 'chapter-de'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1386,7 +1422,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'de'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1408,7 +1444,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'text' => 'pt_BR'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1417,9 +1453,11 @@ $result_trees{'multiple_lang_chapters'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'pt_BR'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 50,
@@ -1427,7 +1465,8 @@ $result_trees{'multiple_lang_chapters'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1444,7 +1483,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'chapter pt_BR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1464,7 +1503,9 @@ $result_trees{'multiple_lang_chapters'} = {
             'normalized' => 'chapter-pt_005fBR'
           }
         ],
-        'normalized' => 'chapter-pt_005fBR',
+        'normalized' => 'chapter-pt_005fBR'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1481,7 +1522,7 @@ $result_trees{'multiple_lang_chapters'} = {
               'text' => 'pt_bR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1535,7 +1576,8 @@ $result_trees{'multiple_lang_chapters'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1703,9 +1745,11 @@ $result_sectioning{'multiple_lang_chapters'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1716,9 +1760,11 @@ $result_sectioning{'multiple_lang_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-ja'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1735,9 +1781,11 @@ $result_sectioning{'multiple_lang_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-en'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1755,9 +1803,11 @@ $result_sectioning{'multiple_lang_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-fr_005fFR'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -1775,9 +1825,11 @@ $result_sectioning{'multiple_lang_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-de'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -1795,9 +1847,11 @@ $result_sectioning{'multiple_lang_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-pt_005fBR'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 5,
@@ -1843,6 +1897,7 @@ $result_nodes{'multiple_lang_chapters'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1852,6 +1907,7 @@ $result_nodes{'multiple_lang_chapters'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1859,12 +1915,14 @@ $result_nodes{'multiple_lang_chapters'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter-ja'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1872,12 +1930,14 @@ $result_nodes{'multiple_lang_chapters'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'chapter-en'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1885,12 +1945,14 @@ $result_nodes{'multiple_lang_chapters'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => 'chapter-fr_005fFR'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -1898,12 +1960,14 @@ $result_nodes{'multiple_lang_chapters'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 4
                       }
                     },
                     'normalized' => 'chapter-de'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -1911,12 +1975,14 @@ $result_nodes{'multiple_lang_chapters'} = {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_number' => 5
                           }
                         },
                         'normalized' => 'chapter-pt_005fBR'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_prev' => {},
                         'node_up' => {}
@@ -1958,36 +2024,42 @@ $result_menus{'multiple_lang_chapters'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter-ja'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'chapter-en'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'chapter-fr_005fFR'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'chapter-de'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'chapter-pt_005fBR'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_prev' => {},
                         'menu_up' => {},
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 0299be9a5e..a139358aca 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -19,7 +19,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'multiple_lang_chapters.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multiple_lang_chapters.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -45,7 +47,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'utf-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -56,9 +58,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'utf-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -94,7 +98,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'ja'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -103,9 +107,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ja'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -131,7 +137,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -151,7 +157,9 @@ $result_trees{'multiple_lang_chapters_latex'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -168,7 +176,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'Multi language file'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -185,7 +193,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -447,7 +455,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -456,9 +464,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -485,7 +495,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'text' => 'ja'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -494,9 +504,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ja'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 23,
@@ -504,7 +516,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -521,7 +534,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'chapter ja'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -541,7 +554,9 @@ $result_trees{'multiple_lang_chapters_latex'} = {
             'normalized' => 'chapter-ja'
           }
         ],
-        'normalized' => 'chapter-ja',
+        'normalized' => 'chapter-ja'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -558,7 +573,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'ja'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -733,7 +748,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -742,9 +757,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -752,7 +769,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -774,7 +791,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'text' => 'en'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,9 +800,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'en'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 31,
@@ -793,7 +812,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -810,7 +830,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'chapter en'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -830,7 +850,9 @@ $result_trees{'multiple_lang_chapters_latex'} = {
             'normalized' => 'chapter-en'
           }
         ],
-        'normalized' => 'chapter-en',
+        'normalized' => 'chapter-en'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -847,7 +869,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'en'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1022,7 +1044,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1031,9 +1053,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -1041,7 +1065,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1063,7 +1087,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'text' => 'fr_FR'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1072,9 +1096,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr_FR'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 39,
@@ -1082,7 +1108,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1099,7 +1126,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'chapter fr_FR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1119,7 +1146,9 @@ $result_trees{'multiple_lang_chapters_latex'} = {
             'normalized' => 'chapter-fr_005fFR'
           }
         ],
-        'normalized' => 'chapter-fr_005fFR',
+        'normalized' => 'chapter-fr_005fFR'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1136,7 +1165,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'fr_FR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1272,7 +1301,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1281,9 +1310,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1291,7 +1322,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1313,7 +1344,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'text' => 'de'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1322,9 +1353,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'de'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 46,
@@ -1332,7 +1365,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1349,7 +1383,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'chapter de'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1369,7 +1403,9 @@ $result_trees{'multiple_lang_chapters_latex'} = {
             'normalized' => 'chapter-de'
           }
         ],
-        'normalized' => 'chapter-de',
+        'normalized' => 'chapter-de'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1386,7 +1422,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'de'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1408,7 +1444,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'text' => 'pt_BR'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1417,9 +1453,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'pt_BR'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 50,
@@ -1427,7 +1465,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1444,7 +1483,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'chapter pt_BR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1464,7 +1503,9 @@ $result_trees{'multiple_lang_chapters_latex'} = {
             'normalized' => 'chapter-pt_005fBR'
           }
         ],
-        'normalized' => 'chapter-pt_005fBR',
+        'normalized' => 'chapter-pt_005fBR'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1481,7 +1522,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               'text' => 'pt_bR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1535,7 +1576,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1703,9 +1745,11 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1716,9 +1760,11 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'normalized' => 'chapter-ja'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1735,9 +1781,11 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'normalized' => 'chapter-en'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1755,9 +1803,11 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'normalized' => 'chapter-fr_005fFR'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -1775,9 +1825,11 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'normalized' => 'chapter-de'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -1795,9 +1847,11 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'normalized' => 'chapter-pt_005fBR'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 5,
@@ -1843,6 +1897,7 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1852,6 +1907,7 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1859,12 +1915,14 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter-ja'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1872,12 +1930,14 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'chapter-en'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1885,12 +1945,14 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => 'chapter-fr_005fFR'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -1898,12 +1960,14 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 4
                       }
                     },
                     'normalized' => 'chapter-de'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -1911,12 +1975,14 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_number' => 5
                           }
                         },
                         'normalized' => 'chapter-pt_005fBR'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_prev' => {},
                         'node_up' => {}
@@ -1958,36 +2024,42 @@ $result_menus{'multiple_lang_chapters_latex'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter-ja'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'chapter-en'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'chapter-fr_005fFR'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'chapter-de'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'chapter-pt_005fBR'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_prev' => {},
                         'menu_up' => {},
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index fe9ff16fe5..df7d2d5bd2 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -19,7 +19,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'multiple_lang_chapters.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multiple_lang_chapters.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -45,7 +47,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'utf-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -56,9 +58,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'utf-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -105,7 +109,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,9 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +148,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'Multi language file'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -159,7 +165,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -421,7 +427,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -430,9 +436,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -459,7 +467,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'text' => 'ja'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -468,9 +476,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ja'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 23,
@@ -478,7 +488,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -495,7 +506,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'chapter ja'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -515,7 +526,9 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
             'normalized' => 'chapter-ja'
           }
         ],
-        'normalized' => 'chapter-ja',
+        'normalized' => 'chapter-ja'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -532,7 +545,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'ja'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -707,7 +720,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -716,9 +729,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -726,7 +741,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -748,7 +763,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'text' => 'en'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -757,9 +772,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'en'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 31,
@@ -767,7 +784,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -784,7 +802,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'chapter en'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -804,7 +822,9 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
             'normalized' => 'chapter-en'
           }
         ],
-        'normalized' => 'chapter-en',
+        'normalized' => 'chapter-en'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -821,7 +841,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'en'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -996,7 +1016,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1005,9 +1025,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -1015,7 +1037,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1037,7 +1059,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'text' => 'fr_FR'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1046,9 +1068,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'fr_FR'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 39,
@@ -1056,7 +1080,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1073,7 +1098,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'chapter fr_FR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1093,7 +1118,9 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
             'normalized' => 'chapter-fr_005fFR'
           }
         ],
-        'normalized' => 'chapter-fr_005fFR',
+        'normalized' => 'chapter-fr_005fFR'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1110,7 +1137,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'fr_FR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1246,7 +1273,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1255,9 +1282,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1265,7 +1294,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1287,7 +1316,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'text' => 'de'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1296,9 +1325,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'de'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 46,
@@ -1306,7 +1337,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1323,7 +1355,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'chapter de'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1343,7 +1375,9 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
             'normalized' => 'chapter-de'
           }
         ],
-        'normalized' => 'chapter-de',
+        'normalized' => 'chapter-de'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1360,7 +1394,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'de'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1382,7 +1416,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'text' => 'pt_BR'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1391,9 +1425,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'pt_BR'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 50,
@@ -1401,7 +1437,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1418,7 +1455,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'chapter pt_BR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1438,7 +1475,9 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
             'normalized' => 'chapter-pt_005fBR'
           }
         ],
-        'normalized' => 'chapter-pt_005fBR',
+        'normalized' => 'chapter-pt_005fBR'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1455,7 +1494,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               'text' => 'pt_bR'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1509,7 +1548,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1676,9 +1716,11 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = 
{
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1689,9 +1731,11 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = 
{
                   'extra' => {
                     'normalized' => 'chapter-ja'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1708,9 +1752,11 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = 
{
                   'extra' => {
                     'normalized' => 'chapter-en'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1728,9 +1774,11 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = 
{
                   'extra' => {
                     'normalized' => 'chapter-fr_005fFR'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -1748,9 +1796,11 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = 
{
                   'extra' => {
                     'normalized' => 'chapter-de'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -1768,9 +1818,11 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = 
{
                   'extra' => {
                     'normalized' => 'chapter-pt_005fBR'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 5,
@@ -1816,6 +1868,7 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1825,6 +1878,7 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1832,12 +1886,14 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter-ja'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1845,12 +1901,14 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'chapter-en'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1858,12 +1916,14 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => 'chapter-fr_005fFR'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -1871,12 +1931,14 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 4
                       }
                     },
                     'normalized' => 'chapter-de'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -1884,12 +1946,14 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_number' => 5
                           }
                         },
                         'normalized' => 'chapter-pt_005fBR'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_prev' => {},
                         'node_up' => {}
@@ -1931,36 +1995,42 @@ $result_menus{'multiple_lang_chapters_texi2html'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter-ja'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'chapter-en'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'chapter-fr_005fFR'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'chapter-de'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'chapter-pt_005fBR'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_prev' => {},
                         'menu_up' => {},
diff --git a/tp/t/results/languages/simple.pl b/tp/t/results/languages/simple.pl
index 17c3b0e9b7..5a7b8f8d4e 100644
--- a/tp/t/results/languages/simple.pl
+++ b/tp/t/results/languages/simple.pl
@@ -19,7 +19,7 @@ $result_trees{'simple'} = {
                       'text' => 'fr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'simple'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'fr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'simple'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -192,7 +194,7 @@ $result_trees{'simple'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -201,9 +203,11 @@ $result_trees{'simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -211,7 +215,7 @@ $result_trees{'simple'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -233,7 +237,9 @@ $result_trees{'simple'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -275,14 +281,16 @@ $result_nodes{'simple'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'simple'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'simple'} = [];
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index d5312125d8..1b4d7e1e2f 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -19,7 +19,7 @@ $result_trees{'unknown_language'} = {
                       'text' => 'unknown'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'unknown_language'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'unknown'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'unknown_language'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,9 @@ $result_trees{'unknown_language'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +97,7 @@ $result_trees{'unknown_language'} = {
               'text' => 'unknkown language'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -159,7 +163,7 @@ $result_trees{'unknown_language'} = {
                   'text' => 'another_UNKNOWN'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -168,9 +172,11 @@ $result_trees{'unknown_language'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'another_UNKNOWN'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 8,
@@ -222,7 +228,8 @@ $result_trees{'unknown_language'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -274,9 +281,11 @@ $result_sectioning{'unknown_language'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -294,17 +303,20 @@ $result_nodes{'unknown_language'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'unknown_language'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'unknown_language'} = [
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 32282349c0..0be9519dca 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -19,7 +19,7 @@ $result_trees{'unknown_region'} = {
                       'text' => 'fr_NOWHERE'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'unknown_region'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'fr_NOWHERE'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'unknown_region'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -192,7 +194,7 @@ $result_trees{'unknown_region'} = {
                       'text' => 'defivar'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -201,9 +203,11 @@ $result_trees{'unknown_region'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -211,7 +215,7 @@ $result_trees{'unknown_region'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -233,7 +237,9 @@ $result_trees{'unknown_region'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -275,14 +281,16 @@ $result_nodes{'unknown_region'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'unknown_region'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'unknown_region'} = [
diff --git a/tp/t/results/latex_tests/anchor_before_top.pl 
b/tp/t/results/latex_tests/anchor_before_top.pl
index 937390113d..e6f84076e9 100644
--- a/tp/t/results/latex_tests/anchor_before_top.pl
+++ b/tp/t/results/latex_tests/anchor_before_top.pl
@@ -68,7 +68,7 @@ $result_trees{'anchor_before_top'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +88,9 @@ $result_trees{'anchor_before_top'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -105,7 +107,7 @@ $result_trees{'anchor_before_top'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +122,8 @@ $result_trees{'anchor_before_top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +140,7 @@ $result_trees{'anchor_before_top'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -157,7 +160,9 @@ $result_trees{'anchor_before_top'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -174,7 +179,7 @@ $result_trees{'anchor_before_top'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -225,7 +230,8 @@ $result_trees{'anchor_before_top'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -279,9 +285,11 @@ $result_sectioning{'anchor_before_top'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -292,9 +300,11 @@ $result_sectioning{'anchor_before_top'} = {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -323,10 +333,12 @@ $result_nodes{'anchor_before_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -334,12 +346,14 @@ $result_nodes{'anchor_before_top'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -355,6 +369,7 @@ $result_menus{'anchor_before_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/anchor_in_copying.pl 
b/tp/t/results/latex_tests/anchor_in_copying.pl
index 4c8e6ff3d9..e63e09bf3a 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -14,7 +14,7 @@ $result_trees{'anchor_in_copying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -70,7 +70,7 @@ $result_trees{'anchor_in_copying'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -79,9 +79,11 @@ $result_trees{'anchor_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -114,7 +116,7 @@ $result_trees{'anchor_in_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -134,7 +136,9 @@ $result_trees{'anchor_in_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -151,7 +155,7 @@ $result_trees{'anchor_in_copying'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -166,7 +170,8 @@ $result_trees{'anchor_in_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -183,7 +188,7 @@ $result_trees{'anchor_in_copying'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -203,7 +208,9 @@ $result_trees{'anchor_in_copying'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -220,7 +227,7 @@ $result_trees{'anchor_in_copying'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -271,7 +278,8 @@ $result_trees{'anchor_in_copying'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -327,9 +335,11 @@ $result_sectioning{'anchor_in_copying'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -340,9 +350,11 @@ $result_sectioning{'anchor_in_copying'} = {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -371,10 +383,12 @@ $result_nodes{'anchor_in_copying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -382,12 +396,14 @@ $result_nodes{'anchor_in_copying'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -403,6 +419,7 @@ $result_menus{'anchor_in_copying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
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 4344e42b47..f260145616 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
@@ -14,7 +14,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -70,7 +70,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -79,9 +79,11 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -114,7 +116,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -134,7 +136,9 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -151,7 +155,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -166,7 +170,8 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -183,7 +188,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -203,7 +208,9 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -220,7 +227,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -332,7 +339,8 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -397,9 +405,11 @@ $result_sectioning{'anchor_in_copying_insertcopying_chap'} 
= {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -410,9 +420,11 @@ $result_sectioning{'anchor_in_copying_insertcopying_chap'} 
= {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -441,10 +453,12 @@ $result_nodes{'anchor_in_copying_insertcopying_chap'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -452,12 +466,14 @@ $result_nodes{'anchor_in_copying_insertcopying_chap'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -473,6 +489,7 @@ $result_menus{'anchor_in_copying_insertcopying_chap'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
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 6dd17b4f08..9ed7615642 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
@@ -14,7 +14,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -70,7 +70,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -79,9 +79,11 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} = 
{
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -103,7 +105,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -120,7 +122,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                           'text' => 'Manual'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -128,7 +130,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                     }
                   ],
                   'cmdname' => 'title',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -207,7 +209,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -216,9 +218,11 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 11,
@@ -251,7 +255,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -271,7 +275,9 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -288,7 +294,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -303,7 +309,8 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -320,7 +327,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -340,7 +347,9 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -357,7 +366,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -439,7 +448,8 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -510,9 +520,11 @@ 
$result_sectioning{'anchor_in_copying_insertcopying_titlepage'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -523,9 +535,11 @@ 
$result_sectioning{'anchor_in_copying_insertcopying_titlepage'} = {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -554,10 +568,12 @@ 
$result_nodes{'anchor_in_copying_insertcopying_titlepage'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -565,12 +581,14 @@ 
$result_nodes{'anchor_in_copying_insertcopying_titlepage'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -586,6 +604,7 @@ $result_menus{'anchor_in_copying_insertcopying_titlepage'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
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 feb5d2b379..3b4af67cf1 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
@@ -14,7 +14,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -70,7 +70,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -79,9 +79,11 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -103,7 +105,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -120,7 +122,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                           'text' => 'Manual'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -128,7 +130,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                     }
                   ],
                   'cmdname' => 'title',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -175,7 +177,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -184,9 +186,11 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 10,
@@ -219,7 +223,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -239,7 +243,9 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -256,7 +262,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -271,7 +277,8 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -288,7 +295,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -308,7 +315,9 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -325,7 +334,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -437,7 +446,8 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -510,9 +520,11 @@ 
$result_sectioning{'anchor_in_copying_insertcopying_titlepage_chap'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -523,9 +535,11 @@ 
$result_sectioning{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -554,10 +568,12 @@ 
$result_nodes{'anchor_in_copying_insertcopying_titlepage_chap'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -565,12 +581,14 @@ 
$result_nodes{'anchor_in_copying_insertcopying_titlepage_chap'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -586,6 +604,7 @@ 
$result_menus{'anchor_in_copying_insertcopying_titlepage_chap'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index 87070dbd0e..cb73708e27 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -24,7 +24,7 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
               'text' => 'node before'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -94,7 +94,9 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
             'normalized' => 'node-before'
           }
         ],
-        'normalized' => 'node-before',
+        'normalized' => 'node-before'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -111,7 +113,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -131,7 +133,9 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -148,7 +152,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'text' => 'top sectionning'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -206,7 +210,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -223,7 +228,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'text' => 'after'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -293,7 +298,9 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
             'normalized' => 'after'
           }
         ],
-        'normalized' => 'after',
+        'normalized' => 'after'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -310,7 +317,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -330,7 +337,9 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -347,7 +356,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -412,7 +421,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -423,7 +432,9 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -574,7 +585,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -585,7 +596,9 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -724,7 +737,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -839,9 +853,11 @@ 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -852,9 +868,11 @@ 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -883,10 +901,12 @@ 
$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -894,12 +914,14 @@ 
$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -915,6 +937,7 @@ 
$result_menus{'anchor_links_xref_xrefautomaticsectiontitle'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index 1a9321fb28..11780295aa 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -65,7 +65,7 @@ $result_trees{'brace_in_index'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -89,7 +89,7 @@ $result_trees{'brace_in_index'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -98,9 +98,11 @@ $result_trees{'brace_in_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -127,7 +129,7 @@ $result_trees{'brace_in_index'} = {
                   'cmdname' => '{'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -146,7 +148,9 @@ $result_trees{'brace_in_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -184,7 +188,7 @@ $result_trees{'brace_in_index'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -203,7 +207,9 @@ $result_trees{'brace_in_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -241,7 +247,7 @@ $result_trees{'brace_in_index'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -260,7 +266,9 @@ $result_trees{'brace_in_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -408,7 +416,7 @@ $result_trees{'brace_in_index'} = {
                       'text' => 'defun'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -417,9 +425,11 @@ $result_trees{'brace_in_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -427,7 +437,7 @@ $result_trees{'brace_in_index'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index 65f1133756..2d616828d7 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -71,7 +71,7 @@ $result_trees{'custom_headings'} = {
                       'cmdname' => 'thischapternum'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -79,7 +79,7 @@ $result_trees{'custom_headings'} = {
                 }
               ],
               'cmdname' => 'evenheading',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -141,7 +141,7 @@ $result_trees{'custom_headings'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -149,7 +149,7 @@ $result_trees{'custom_headings'} = {
                 }
               ],
               'cmdname' => 'evenfooting',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -177,7 +177,7 @@ $result_trees{'custom_headings'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -197,7 +197,9 @@ $result_trees{'custom_headings'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -214,7 +216,7 @@ $result_trees{'custom_headings'} = {
               'text' => 'top sectionning'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -229,7 +231,8 @@ $result_trees{'custom_headings'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -246,7 +249,7 @@ $result_trees{'custom_headings'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -266,7 +269,9 @@ $result_trees{'custom_headings'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -283,7 +288,7 @@ $result_trees{'custom_headings'} = {
               'text' => 'ch--ap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -356,7 +361,8 @@ $result_trees{'custom_headings'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -373,7 +379,7 @@ $result_trees{'custom_headings'} = {
               'text' => 'sec1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -388,7 +394,8 @@ $result_trees{'custom_headings'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -405,7 +412,7 @@ $result_trees{'custom_headings'} = {
               'text' => 'chap 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -433,7 +440,7 @@ $result_trees{'custom_headings'} = {
                   'text' => ' titi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -441,7 +448,7 @@ $result_trees{'custom_headings'} = {
             }
           ],
           'cmdname' => 'everyheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -514,7 +521,8 @@ $result_trees{'custom_headings'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -531,7 +539,7 @@ $result_trees{'custom_headings'} = {
               'text' => 'chap 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -586,7 +594,7 @@ $result_trees{'custom_headings'} = {
                   'text' => ' dd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -594,7 +602,7 @@ $result_trees{'custom_headings'} = {
             }
           ],
           'cmdname' => 'everyfooting',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -609,7 +617,8 @@ $result_trees{'custom_headings'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -716,9 +725,11 @@ $result_sectioning{'custom_headings'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -729,14 +740,17 @@ $result_sectioning{'custom_headings'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -754,6 +768,7 @@ $result_sectioning{'custom_headings'} = {
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -766,6 +781,7 @@ $result_sectioning{'custom_headings'} = {
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -804,10 +820,12 @@ $result_nodes{'custom_headings'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -815,12 +833,14 @@ $result_nodes{'custom_headings'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -836,6 +856,7 @@ $result_menus{'custom_headings'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/enumerate_arguments.pl 
b/tp/t/results/latex_tests/enumerate_arguments.pl
index a5a4f65348..18ec6a5e07 100644
--- a/tp/t/results/latex_tests/enumerate_arguments.pl
+++ b/tp/t/results/latex_tests/enumerate_arguments.pl
@@ -21,7 +21,7 @@ $result_trees{'enumerate_arguments'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -90,7 +90,7 @@ $result_trees{'enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -99,9 +99,11 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -110,7 +112,9 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'a',
+            'enumerate_specification' => 'a'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -132,7 +136,7 @@ $result_trees{'enumerate_arguments'} = {
                   'text' => 'A'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -201,7 +205,7 @@ $result_trees{'enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -210,9 +214,11 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -221,7 +227,9 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'A',
+            'enumerate_specification' => 'A'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -243,7 +251,7 @@ $result_trees{'enumerate_arguments'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -312,7 +320,7 @@ $result_trees{'enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -321,9 +329,11 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -332,7 +342,9 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'c',
+            'enumerate_specification' => 'c'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -354,7 +366,7 @@ $result_trees{'enumerate_arguments'} = {
                   'text' => 'C'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -423,7 +435,7 @@ $result_trees{'enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -432,9 +444,11 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -443,7 +457,9 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'C',
+            'enumerate_specification' => 'C'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -465,7 +481,7 @@ $result_trees{'enumerate_arguments'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -534,7 +550,7 @@ $result_trees{'enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -543,9 +559,11 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -554,7 +572,9 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -576,7 +596,7 @@ $result_trees{'enumerate_arguments'} = {
                   'text' => '3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -645,7 +665,7 @@ $result_trees{'enumerate_arguments'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -654,9 +674,11 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -665,7 +687,9 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '3',
+            'enumerate_specification' => '3'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
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 b7470a7590..2c44214f63 100644
--- a/tp/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tp/t/results/latex_tests/error_in_sectioning_command.pl
@@ -45,7 +45,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -65,7 +65,9 @@ $result_trees{'error_in_sectioning_command'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -82,7 +84,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -97,7 +99,8 @@ $result_trees{'error_in_sectioning_command'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -157,7 +160,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'text' => '): Indicating an Error Message'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -183,7 +186,9 @@ $result_trees{'error_in_sectioning_command'} = {
             'normalized' => 
'_0040error_007b_007d-_0028error_002d_002d_003e_0029_003a-Indicating-an-Error-Message'
           }
         ],
-        'normalized' => 
'_0040error_007b_007d-_0028error_002d_002d_003e_0029_003a-Indicating-an-Error-Message',
+        'normalized' => 
'_0040error_007b_007d-_0028error_002d_002d_003e_0029_003a-Indicating-an-Error-Message'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -243,7 +248,7 @@ $result_trees{'error_in_sectioning_command'} = {
               'text' => '): Indicating an Error Message'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -283,7 +288,8 @@ $result_trees{'error_in_sectioning_command'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -339,9 +345,11 @@ $result_sectioning{'error_in_sectioning_command'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -352,9 +360,11 @@ $result_sectioning{'error_in_sectioning_command'} = {
                   'extra' => {
                     'normalized' => 
'_0040error_007b_007d-_0028error_002d_002d_003e_0029_003a-Indicating-an-Error-Message'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -383,10 +393,12 @@ $result_nodes{'error_in_sectioning_command'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -394,12 +406,14 @@ $result_nodes{'error_in_sectioning_command'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 
'_0040error_007b_007d-_0028error_002d_002d_003e_0029_003a-Indicating-an-Error-Message'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -415,6 +429,7 @@ $result_menus{'error_in_sectioning_command'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/example_in_cartouche.pl 
b/tp/t/results/latex_tests/example_in_cartouche.pl
index d18b89d6b2..0727c9e1a5 100644
--- a/tp/t/results/latex_tests/example_in_cartouche.pl
+++ b/tp/t/results/latex_tests/example_in_cartouche.pl
@@ -16,7 +16,7 @@ $result_trees{'example_in_cartouche'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -56,7 +56,7 @@ $result_trees{'example_in_cartouche'} = {
                       'text' => 'cartouche'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +65,11 @@ $result_trees{'example_in_cartouche'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -89,7 +91,7 @@ $result_trees{'example_in_cartouche'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +103,7 @@ $result_trees{'example_in_cartouche'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -131,7 +133,7 @@ $result_trees{'example_in_cartouche'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -140,9 +142,11 @@ $result_trees{'example_in_cartouche'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 11,
@@ -164,7 +168,7 @@ $result_trees{'example_in_cartouche'} = {
                       'text' => 'cartouche'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -173,9 +177,11 @@ $result_trees{'example_in_cartouche'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index f1299026e3..b956c3e017 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -24,7 +24,7 @@ $result_trees{'float_and_refs'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'float_and_refs'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'float_and_refs'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'float_and_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'float_and_refs'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +116,9 @@ $result_trees{'float_and_refs'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -130,7 +135,7 @@ $result_trees{'float_and_refs'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -155,7 +160,7 @@ $result_trees{'float_and_refs'} = {
                   'text' => 'no type'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -242,7 +247,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -251,9 +256,11 @@ $result_trees{'float_and_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -269,11 +276,13 @@ $result_trees{'float_and_refs'} = {
             ],
             'normalized' => 'no-type',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 7,
@@ -301,7 +310,7 @@ $result_trees{'float_and_refs'} = {
                   'text' => 'with type'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -388,7 +397,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -397,9 +406,11 @@ $result_trees{'float_and_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -415,7 +426,6 @@ $result_trees{'float_and_refs'} = {
             ],
             'normalized' => 'with-type',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -423,6 +433,9 @@ $result_trees{'float_and_refs'} = {
               'normalized' => 'Thing'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 13,
@@ -450,7 +463,7 @@ $result_trees{'float_and_refs'} = {
                   'text' => 'my figure'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -537,7 +550,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -546,9 +559,11 @@ $result_trees{'float_and_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -564,7 +579,6 @@ $result_trees{'float_and_refs'} = {
             ],
             'normalized' => 'my-figure',
             'shortcaption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -572,6 +586,9 @@ $result_trees{'float_and_refs'} = {
               'normalized' => 'Figure'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 19,
@@ -584,7 +601,8 @@ $result_trees{'float_and_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -601,7 +619,7 @@ $result_trees{'float_and_refs'} = {
               'text' => 'refs'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -664,7 +682,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -706,7 +724,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -717,7 +735,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'three'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -759,7 +777,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -770,7 +788,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'three'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -781,7 +799,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'four'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -821,7 +839,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -832,7 +850,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'three'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -843,7 +861,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'four'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -854,7 +872,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'five'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -935,7 +953,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -977,7 +995,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -988,7 +1006,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'three'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1030,7 +1048,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1041,7 +1059,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'three'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1052,7 +1070,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'four'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1092,7 +1110,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1103,7 +1121,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'three'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1114,7 +1132,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'four'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1125,7 +1143,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'five'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1206,7 +1224,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1248,7 +1266,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1259,7 +1277,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'three'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1301,7 +1319,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1312,7 +1330,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'three'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1323,7 +1341,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'four'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1363,7 +1381,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'two'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1374,7 +1392,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'three'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1385,7 +1403,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'four'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1396,7 +1414,7 @@ $result_trees{'float_and_refs'} = {
                       'text' => 'five'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1429,7 +1447,8 @@ $result_trees{'float_and_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1446,7 +1465,7 @@ $result_trees{'float_and_refs'} = {
               'text' => 'lists'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1463,7 +1482,7 @@ $result_trees{'float_and_refs'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -1490,7 +1509,7 @@ $result_trees{'float_and_refs'} = {
                   'text' => 'Figure'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1499,7 +1518,6 @@ $result_trees{'float_and_refs'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -1507,6 +1525,9 @@ $result_trees{'float_and_refs'} = {
               'normalized' => 'Figure'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 48,
@@ -1521,7 +1542,7 @@ $result_trees{'float_and_refs'} = {
                   'text' => 'Thing'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1530,7 +1551,6 @@ $result_trees{'float_and_refs'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -1538,6 +1558,9 @@ $result_trees{'float_and_refs'} = {
               'normalized' => 'Thing'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 49,
@@ -1550,7 +1573,8 @@ $result_trees{'float_and_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1725,9 +1749,11 @@ $result_sectioning{'float_and_refs'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1738,9 +1764,11 @@ $result_sectioning{'float_and_refs'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1752,6 +1780,7 @@ $result_sectioning{'float_and_refs'} = {
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1764,6 +1793,7 @@ $result_sectioning{'float_and_refs'} = {
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -1801,10 +1831,12 @@ $result_nodes{'float_and_refs'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1812,12 +1844,14 @@ $result_nodes{'float_and_refs'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1833,6 +1867,7 @@ $result_menus{'float_and_refs'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
@@ -1853,6 +1888,7 @@ $result_floats{'float_and_refs'} = {
         'float_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1868,6 +1904,7 @@ $result_floats{'float_and_refs'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
@@ -1900,6 +1937,7 @@ $result_floats{'float_and_refs'} = {
           'normalized' => 'Figure'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
@@ -1932,6 +1970,7 @@ $result_floats{'float_and_refs'} = {
           'normalized' => 'Thing'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index 0f1ce020ff..2664d50deb 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -19,7 +19,7 @@ $result_trees{'fonttextsize'} = {
                       'text' => '10'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'fonttextsize'} = {
               'extra' => {
                 'misc_args' => [
                   '10'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -58,7 +60,7 @@ $result_trees{'fonttextsize'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -78,7 +80,9 @@ $result_trees{'fonttextsize'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -95,7 +99,7 @@ $result_trees{'fonttextsize'} = {
               'text' => 'section top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -110,7 +114,8 @@ $result_trees{'fonttextsize'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -127,7 +132,7 @@ $result_trees{'fonttextsize'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -147,7 +152,9 @@ $result_trees{'fonttextsize'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -164,7 +171,7 @@ $result_trees{'fonttextsize'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -179,7 +186,8 @@ $result_trees{'fonttextsize'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -196,7 +204,7 @@ $result_trees{'fonttextsize'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -211,7 +219,8 @@ $result_trees{'fonttextsize'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -228,7 +237,7 @@ $result_trees{'fonttextsize'} = {
               'text' => 'Subsection 10pts'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -259,7 +268,7 @@ $result_trees{'fonttextsize'} = {
                   'text' => '11'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -270,7 +279,9 @@ $result_trees{'fonttextsize'} = {
           'extra' => {
             'misc_args' => [
               '11'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -280,7 +291,8 @@ $result_trees{'fonttextsize'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -297,7 +309,7 @@ $result_trees{'fonttextsize'} = {
               'text' => 'Subsection 11pts'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -333,7 +345,7 @@ $result_trees{'fonttextsize'} = {
                   'text' => '8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -341,7 +353,8 @@ $result_trees{'fonttextsize'} = {
             }
           ],
           'cmdname' => 'fonttextsize',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -351,7 +364,8 @@ $result_trees{'fonttextsize'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -368,7 +382,7 @@ $result_trees{'fonttextsize'} = {
               'text' => 'Subsection 8pts'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -404,7 +418,7 @@ $result_trees{'fonttextsize'} = {
                   'text' => '15'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -412,7 +426,8 @@ $result_trees{'fonttextsize'} = {
             }
           ],
           'cmdname' => 'fonttextsize',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -422,7 +437,8 @@ $result_trees{'fonttextsize'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -439,7 +455,7 @@ $result_trees{'fonttextsize'} = {
               'text' => 'Subsection 15pts'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -463,7 +479,8 @@ $result_trees{'fonttextsize'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -551,9 +568,11 @@ $result_sectioning{'fonttextsize'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -564,19 +583,23 @@ $result_sectioning{'fonttextsize'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -586,6 +609,7 @@ $result_sectioning{'fonttextsize'} = {
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.2',
@@ -596,6 +620,7 @@ $result_sectioning{'fonttextsize'} = {
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.3',
@@ -606,6 +631,7 @@ $result_sectioning{'fonttextsize'} = {
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.4',
@@ -655,10 +681,12 @@ $result_nodes{'fonttextsize'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -666,12 +694,14 @@ $result_nodes{'fonttextsize'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -687,6 +717,7 @@ $result_menus{'fonttextsize'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index fd14b18f1f..072b8200b8 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -61,7 +61,7 @@ $result_trees{'indices'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -81,7 +81,9 @@ $result_trees{'indices'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -98,7 +100,7 @@ $result_trees{'indices'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +115,8 @@ $result_trees{'indices'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -130,7 +133,7 @@ $result_trees{'indices'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -151,7 +154,9 @@ $result_trees{'indices'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -168,7 +173,7 @@ $result_trees{'indices'} = {
               'text' => 'Index'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -259,7 +264,7 @@ $result_trees{'indices'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -281,7 +286,6 @@ $result_trees{'indices'} = {
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
             },
-            'spaces_before_argument' => ' ',
             'subentry' => {
               'args' => [
                 {
@@ -481,7 +485,7 @@ $result_trees{'indices'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -492,7 +496,9 @@ $result_trees{'indices'} = {
               'extra' => {
                 'level' => 1,
                 'seealso' => {},
-                'sortas' => 'a!"@b',
+                'sortas' => 'a!"@b'
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -502,6 +508,9 @@ $result_trees{'indices'} = {
               }
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 10,
@@ -518,7 +527,7 @@ $result_trees{'indices'} = {
                   'text' => '\\cmd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -540,7 +549,9 @@ $result_trees{'indices'} = {
               },
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -580,7 +591,7 @@ $result_trees{'indices'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -604,7 +615,9 @@ $result_trees{'indices'} = {
               'index_type_command' => 'cindex',
               'sortas' => '\\cmd'
             },
-            'sortas' => '\\cmd',
+            'sortas' => '\\cmd'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -682,7 +695,9 @@ $result_trees{'indices'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -701,7 +716,9 @@ $result_trees{'indices'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -763,7 +780,7 @@ $result_trees{'indices'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,7 +800,9 @@ $result_trees{'indices'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -806,7 +825,7 @@ $result_trees{'indices'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -817,7 +836,9 @@ $result_trees{'indices'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -839,7 +860,7 @@ $result_trees{'indices'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -850,7 +871,9 @@ $result_trees{'indices'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -860,7 +883,8 @@ $result_trees{'indices'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -949,9 +973,11 @@ $result_sectioning{'indices'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -963,9 +989,11 @@ $result_sectioning{'indices'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -994,10 +1022,12 @@ $result_nodes{'indices'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1005,6 +1035,7 @@ $result_nodes{'indices'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1012,6 +1043,7 @@ $result_nodes{'indices'} = {
         'isindex' => 1,
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1027,6 +1059,7 @@ $result_menus{'indices'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/informative_commands_in_top_node.pl 
b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
index fb52008742..f38b58a029 100644
--- a/tp/t/results/latex_tests/informative_commands_in_top_node.pl
+++ b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
@@ -24,7 +24,7 @@ $result_trees{'informative_commands_in_top_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'informative_commands_in_top_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'informative_commands_in_top_node'} = {
               'text' => 'top sectionning'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -83,7 +85,7 @@ $result_trees{'informative_commands_in_top_node'} = {
                   'text' => '5'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -94,7 +96,9 @@ $result_trees{'informative_commands_in_top_node'} = {
           'extra' => {
             'misc_args' => [
               '5'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -161,7 +165,7 @@ $result_trees{'informative_commands_in_top_node'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -169,7 +173,7 @@ $result_trees{'informative_commands_in_top_node'} = {
             }
           ],
           'cmdname' => 'evenfooting',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -186,7 +190,7 @@ $result_trees{'informative_commands_in_top_node'} = {
                   'text' => '2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -197,7 +201,9 @@ $result_trees{'informative_commands_in_top_node'} = {
           'extra' => {
             'misc_args' => [
               '2'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -212,7 +218,8 @@ $result_trees{'informative_commands_in_top_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -229,7 +236,7 @@ $result_trees{'informative_commands_in_top_node'} = {
               'text' => 'next node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -249,7 +256,9 @@ $result_trees{'informative_commands_in_top_node'} = {
             'normalized' => 'next-node'
           }
         ],
-        'normalized' => 'next-node',
+        'normalized' => 'next-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -266,7 +275,7 @@ $result_trees{'informative_commands_in_top_node'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -290,7 +299,8 @@ $result_trees{'informative_commands_in_top_node'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -344,9 +354,11 @@ $result_sectioning{'informative_commands_in_top_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -357,9 +369,11 @@ $result_sectioning{'informative_commands_in_top_node'} = {
                   'extra' => {
                     'normalized' => 'next-node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -388,10 +402,12 @@ $result_nodes{'informative_commands_in_top_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -399,12 +415,14 @@ $result_nodes{'informative_commands_in_top_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'next-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -420,6 +438,7 @@ $result_menus{'informative_commands_in_top_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/nested_enumerate.pl 
b/tp/t/results/latex_tests/nested_enumerate.pl
index 78f5d808fe..bf6a60b0fd 100644
--- a/tp/t/results/latex_tests/nested_enumerate.pl
+++ b/tp/t/results/latex_tests/nested_enumerate.pl
@@ -16,7 +16,7 @@ $result_trees{'nested_enumerate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -82,7 +82,7 @@ $result_trees{'nested_enumerate'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -148,7 +148,7 @@ $result_trees{'nested_enumerate'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -214,7 +214,7 @@ $result_trees{'nested_enumerate'} = {
                                 {
                                   'args' => [
                                     {
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -295,7 +295,7 @@ $result_trees{'nested_enumerate'} = {
                                               'text' => 'enumerate'
                                             }
                                           ],
-                                          'extra' => {
+                                          'info' => {
                                             'spaces_after_argument' => '
 '
                                           },
@@ -304,9 +304,11 @@ $result_trees{'nested_enumerate'} = {
                                       ],
                                       'cmdname' => 'end',
                                       'extra' => {
-                                        'spaces_before_argument' => ' ',
                                         'text_arg' => 'enumerate'
                                       },
+                                      'info' => {
+                                        'spaces_before_argument' => ' '
+                                      },
                                       'source_info' => {
                                         'file_name' => '',
                                         'line_nr' => 13,
@@ -341,7 +343,7 @@ $result_trees{'nested_enumerate'} = {
                                       'text' => 'enumerate'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -350,9 +352,11 @@ $result_trees{'nested_enumerate'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'enumerate'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 14,
@@ -387,7 +391,7 @@ $result_trees{'nested_enumerate'} = {
                               'text' => 'enumerate'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -396,9 +400,11 @@ $result_trees{'nested_enumerate'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'enumerate'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 15,
@@ -433,7 +439,7 @@ $result_trees{'nested_enumerate'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -442,9 +448,11 @@ $result_trees{'nested_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
diff --git a/tp/t/results/latex_tests/nested_itemize.pl 
b/tp/t/results/latex_tests/nested_itemize.pl
index c77ff37d13..6fee39644d 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -22,7 +22,7 @@ $result_trees{'nested_itemize'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -94,7 +94,7 @@ $result_trees{'nested_itemize'} = {
                           'type' => 'command_as_argument_inserted'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -166,7 +166,7 @@ $result_trees{'nested_itemize'} = {
                                   'type' => 'command_as_argument_inserted'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -238,7 +238,7 @@ $result_trees{'nested_itemize'} = {
                                           'type' => 
'command_as_argument_inserted'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -319,7 +319,7 @@ $result_trees{'nested_itemize'} = {
                                               'text' => 'itemize'
                                             }
                                           ],
-                                          'extra' => {
+                                          'info' => {
                                             'spaces_after_argument' => '
 '
                                           },
@@ -328,9 +328,11 @@ $result_trees{'nested_itemize'} = {
                                       ],
                                       'cmdname' => 'end',
                                       'extra' => {
-                                        'spaces_before_argument' => ' ',
                                         'text_arg' => 'itemize'
                                       },
+                                      'info' => {
+                                        'spaces_before_argument' => ' '
+                                      },
                                       'source_info' => {
                                         'file_name' => '',
                                         'line_nr' => 13,
@@ -365,7 +367,7 @@ $result_trees{'nested_itemize'} = {
                                       'text' => 'itemize'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -374,9 +376,11 @@ $result_trees{'nested_itemize'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'itemize'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 14,
@@ -411,7 +415,7 @@ $result_trees{'nested_itemize'} = {
                               'text' => 'itemize'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -420,9 +424,11 @@ $result_trees{'nested_itemize'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'itemize'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 15,
@@ -457,7 +463,7 @@ $result_trees{'nested_itemize'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -466,9 +472,11 @@ $result_trees{'nested_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl 
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
index bae5b4f10d..53c5ab66b9 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
@@ -19,7 +19,7 @@ $result_trees{'no_titlepage_and_setchapternewpage_odd'} = {
                       'text' => 'odd'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'no_titlepage_and_setchapternewpage_odd'} = {
               'extra' => {
                 'misc_args' => [
                   'odd'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl 
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
index ad90c25fdc..7d013f3ab1 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
@@ -19,7 +19,7 @@ $result_trees{'no_titlepage_and_setchapternewpage_on'} = {
                       'text' => 'on'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'no_titlepage_and_setchapternewpage_on'} = {
               'extra' => {
                 'misc_args' => [
                   'on'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/latex_tests/node_before_top.pl 
b/tp/t/results/latex_tests/node_before_top.pl
index 9069be0ed5..d2ea3397b6 100644
--- a/tp/t/results/latex_tests/node_before_top.pl
+++ b/tp/t/results/latex_tests/node_before_top.pl
@@ -24,7 +24,7 @@ $result_trees{'node_before_top'} = {
               'text' => 'before Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -51,7 +51,9 @@ $result_trees{'node_before_top'} = {
             'normalized' => 'before-Top'
           }
         ],
-        'normalized' => 'before-Top',
+        'normalized' => 'before-Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -68,7 +70,7 @@ $result_trees{'node_before_top'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,9 @@ $result_trees{'node_before_top'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -105,7 +109,7 @@ $result_trees{'node_before_top'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +124,8 @@ $result_trees{'node_before_top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +142,7 @@ $result_trees{'node_before_top'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -157,7 +162,9 @@ $result_trees{'node_before_top'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -174,7 +181,7 @@ $result_trees{'node_before_top'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -225,7 +232,8 @@ $result_trees{'node_before_top'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -279,9 +287,11 @@ $result_sectioning{'node_before_top'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -292,9 +302,11 @@ $result_sectioning{'node_before_top'} = {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -323,10 +335,12 @@ $result_nodes{'node_before_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -334,12 +348,14 @@ $result_nodes{'node_before_top'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -355,6 +371,7 @@ $result_menus{'node_before_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index 272b8eec40..4bb0872099 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -19,7 +19,7 @@ $result_trees{'pagesizes'} = {
                       'text' => '200mm,150mm'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -27,7 +27,8 @@ $result_trees{'pagesizes'} = {
                 }
               ],
               'cmdname' => 'pagesizes',
-              'extra' => {
+              'extra' => {},
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -55,7 +56,7 @@ $result_trees{'pagesizes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -75,7 +76,9 @@ $result_trees{'pagesizes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -92,7 +95,7 @@ $result_trees{'pagesizes'} = {
               'text' => 'section top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +110,8 @@ $result_trees{'pagesizes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +128,7 @@ $result_trees{'pagesizes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -144,7 +148,9 @@ $result_trees{'pagesizes'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -161,7 +167,7 @@ $result_trees{'pagesizes'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -183,7 +189,7 @@ $result_trees{'pagesizes'} = {
                   'text' => '11.5in'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -191,7 +197,8 @@ $result_trees{'pagesizes'} = {
             }
           ],
           'cmdname' => 'pagesizes',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -206,7 +213,8 @@ $result_trees{'pagesizes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -223,7 +231,7 @@ $result_trees{'pagesizes'} = {
               'text' => 'other pagesizes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -245,7 +253,7 @@ $result_trees{'pagesizes'} = {
                   'text' => ', 130mm'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -253,7 +261,8 @@ $result_trees{'pagesizes'} = {
             }
           ],
           'cmdname' => 'pagesizes',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -275,7 +284,7 @@ $result_trees{'pagesizes'} = {
                   'text' => ','
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -283,7 +292,8 @@ $result_trees{'pagesizes'} = {
             }
           ],
           'cmdname' => 'pagesizes',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -293,7 +303,8 @@ $result_trees{'pagesizes'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -353,9 +364,11 @@ $result_sectioning{'pagesizes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -366,9 +379,11 @@ $result_sectioning{'pagesizes'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -380,6 +395,7 @@ $result_sectioning{'pagesizes'} = {
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -413,10 +429,12 @@ $result_nodes{'pagesizes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -424,12 +442,14 @@ $result_nodes{'pagesizes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -445,6 +465,7 @@ $result_menus{'pagesizes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index abf4e5bf1e..48e164e2ab 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -65,7 +65,7 @@ $result_trees{'pagetype'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -85,7 +85,9 @@ $result_trees{'pagetype'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -102,7 +104,7 @@ $result_trees{'pagetype'} = {
               'text' => 'section top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -117,7 +119,8 @@ $result_trees{'pagetype'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -134,7 +137,7 @@ $result_trees{'pagetype'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -154,7 +157,9 @@ $result_trees{'pagetype'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -171,7 +176,7 @@ $result_trees{'pagetype'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -263,7 +268,8 @@ $result_trees{'pagetype'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -280,7 +286,7 @@ $result_trees{'pagetype'} = {
               'text' => 'afourpaper reset'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -304,7 +310,8 @@ $result_trees{'pagetype'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -378,9 +385,11 @@ $result_sectioning{'pagetype'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -391,9 +400,11 @@ $result_sectioning{'pagetype'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -405,6 +416,7 @@ $result_sectioning{'pagetype'} = {
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -438,10 +450,12 @@ $result_nodes{'pagetype'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -449,12 +463,14 @@ $result_nodes{'pagetype'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -470,6 +486,7 @@ $result_menus{'pagetype'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl 
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
index de18ff76b5..366c623223 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -19,7 +19,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
                       'text' => 'on'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
               'extra' => {
                 'misc_args' => [
                   'on'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -52,7 +54,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
                       'text' => 'odd'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -63,7 +65,9 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
               'extra' => {
                 'misc_args' => [
                   'odd'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -80,7 +84,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -106,7 +110,7 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -115,9 +119,11 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl 
b/tp/t/results/latex_tests/settitle_and_headings.pl
index e2bdd77184..1bf7afef6c 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -25,7 +25,7 @@ $result_trees{'settitle_and_headings'} = {
                       'text' => ' for a manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -33,7 +33,7 @@ $result_trees{'settitle_and_headings'} = {
                 }
               ],
               'cmdname' => 'settitle',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -55,7 +55,7 @@ $result_trees{'settitle_and_headings'} = {
                       'text' => 'double'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -66,7 +66,9 @@ $result_trees{'settitle_and_headings'} = {
               'extra' => {
                 'misc_args' => [
                   'double'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -94,7 +96,7 @@ $result_trees{'settitle_and_headings'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +164,8 @@ $result_trees{'settitle_and_headings'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -211,6 +214,7 @@ $result_sectioning{'settitle_and_headings'} = {
       {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index a6e8aeb423..b4b8e1ae12 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -25,7 +25,7 @@ $result_trees{'shorttitlepage'} = {
                       'text' => ' it can be long'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -33,7 +33,7 @@ $result_trees{'shorttitlepage'} = {
                 }
               ],
               'cmdname' => 'shorttitlepage',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -61,7 +61,7 @@ $result_trees{'shorttitlepage'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -81,7 +81,9 @@ $result_trees{'shorttitlepage'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -98,7 +100,7 @@ $result_trees{'shorttitlepage'} = {
               'text' => 'section top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +115,8 @@ $result_trees{'shorttitlepage'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -130,7 +133,7 @@ $result_trees{'shorttitlepage'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -150,7 +153,9 @@ $result_trees{'shorttitlepage'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -167,7 +172,7 @@ $result_trees{'shorttitlepage'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -191,7 +196,8 @@ $result_trees{'shorttitlepage'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -241,9 +247,11 @@ $result_sectioning{'shorttitlepage'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -254,9 +262,11 @@ $result_sectioning{'shorttitlepage'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -285,10 +295,12 @@ $result_nodes{'shorttitlepage'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -296,12 +308,14 @@ $result_nodes{'shorttitlepage'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -317,6 +331,7 @@ $result_menus{'shorttitlepage'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl 
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
index 0c1a55ab01..6dbbd1ae24 100644
--- a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
+++ b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
@@ -19,7 +19,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
                       'text' => 'on'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
               'extra' => {
                 'misc_args' => [
                   'on'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -52,7 +54,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
                       'text' => 'odd'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -63,7 +65,9 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
               'extra' => {
                 'misc_args' => [
                   'odd'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -85,7 +89,7 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
                       'text' => 'off'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,7 +100,9 @@ $result_trees{'three_setchapternewpage_on_odd_off'} = {
               'extra' => {
                 'misc_args' => [
                   'off'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/latex_tests/titlepage_and_headings.pl 
b/tp/t/results/latex_tests/titlepage_and_headings.pl
index d09965a38a..90058597be 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -14,7 +14,7 @@ $result_trees{'titlepage_and_headings'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,7 +40,7 @@ $result_trees{'titlepage_and_headings'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -49,9 +49,11 @@ $result_trees{'titlepage_and_headings'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
index 3933042992..8e0dff6218 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -19,7 +19,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
                       'text' => 'odd'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
               'extra' => {
                 'misc_args' => [
                   'odd'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -47,7 +49,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -73,7 +75,7 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -82,9 +84,11 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
index 6cf4335a47..c5a14ffcdb 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -19,7 +19,7 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
                       'text' => 'on'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
               'extra' => {
                 'misc_args' => [
                   'on'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -47,7 +49,7 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -73,7 +75,7 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -82,9 +84,11 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index 50aac7be9d..d15c82c201 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -14,7 +14,7 @@ $result_trees{'titlepage_classical'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,7 +40,7 @@ $result_trees{'titlepage_classical'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -49,9 +49,11 @@ $result_trees{'titlepage_classical'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'titlepage_classical'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -90,7 +92,7 @@ $result_trees{'titlepage_classical'} = {
                           'text' => 'Some manual tested'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -98,7 +100,7 @@ $result_trees{'titlepage_classical'} = {
                     }
                   ],
                   'cmdname' => 'title',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -115,7 +117,7 @@ $result_trees{'titlepage_classical'} = {
                           'text' => 'Subtitle manual tested'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -123,7 +125,7 @@ $result_trees{'titlepage_classical'} = {
                     }
                   ],
                   'cmdname' => 'subtitle',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -140,7 +142,7 @@ $result_trees{'titlepage_classical'} = {
                           'text' => 'Subtitle 2 manual tested'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -148,7 +150,7 @@ $result_trees{'titlepage_classical'} = {
                     }
                   ],
                   'cmdname' => 'subtitle',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -165,7 +167,7 @@ $result_trees{'titlepage_classical'} = {
                           'text' => 'First author'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -174,9 +176,11 @@ $result_trees{'titlepage_classical'} = {
                   ],
                   'cmdname' => 'author',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'titlepage' => {}
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -191,7 +195,7 @@ $result_trees{'titlepage_classical'} = {
                           'text' => 'Second author'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -200,9 +204,11 @@ $result_trees{'titlepage_classical'} = {
                   ],
                   'cmdname' => 'author',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'titlepage' => {}
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 10,
@@ -289,7 +295,7 @@ $result_trees{'titlepage_classical'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -298,9 +304,11 @@ $result_trees{'titlepage_classical'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 17,
@@ -333,7 +341,7 @@ $result_trees{'titlepage_classical'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -353,7 +361,9 @@ $result_trees{'titlepage_classical'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -370,7 +380,7 @@ $result_trees{'titlepage_classical'} = {
               'text' => 'section top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -385,7 +395,8 @@ $result_trees{'titlepage_classical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -402,7 +413,7 @@ $result_trees{'titlepage_classical'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -422,7 +433,9 @@ $result_trees{'titlepage_classical'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -439,7 +452,7 @@ $result_trees{'titlepage_classical'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -468,7 +481,8 @@ $result_trees{'titlepage_classical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -539,9 +553,11 @@ $result_sectioning{'titlepage_classical'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -552,9 +568,11 @@ $result_sectioning{'titlepage_classical'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -583,10 +601,12 @@ $result_nodes{'titlepage_classical'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -594,12 +614,14 @@ $result_nodes{'titlepage_classical'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -615,6 +637,7 @@ $result_menus{'titlepage_classical'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl 
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index 8add59292b..c3f882aacc 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -24,7 +24,7 @@ $result_trees{'titlepage_in_top_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'titlepage_in_top_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'titlepage_in_top_node'} = {
               'text' => 'top sectionning'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -92,7 +94,7 @@ $result_trees{'titlepage_in_top_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -109,7 +111,7 @@ $result_trees{'titlepage_in_top_node'} = {
                       'text' => 'the TTitle'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -117,7 +119,7 @@ $result_trees{'titlepage_in_top_node'} = {
                 }
               ],
               'cmdname' => 'title',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -134,7 +136,7 @@ $result_trees{'titlepage_in_top_node'} = {
                       'text' => 'titlepage'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -143,9 +145,11 @@ $result_trees{'titlepage_in_top_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'titlepage'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -165,7 +169,8 @@ $result_trees{'titlepage_in_top_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -182,7 +187,7 @@ $result_trees{'titlepage_in_top_node'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -202,7 +207,9 @@ $result_trees{'titlepage_in_top_node'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -219,7 +226,7 @@ $result_trees{'titlepage_in_top_node'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -243,7 +250,8 @@ $result_trees{'titlepage_in_top_node'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -299,9 +307,11 @@ $result_sectioning{'titlepage_in_top_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -312,9 +322,11 @@ $result_sectioning{'titlepage_in_top_node'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -343,10 +355,12 @@ $result_nodes{'titlepage_in_top_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -354,12 +368,14 @@ $result_nodes{'titlepage_in_top_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -375,6 +391,7 @@ $result_menus{'titlepage_in_top_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 6d018bed52..6bfbc05f29 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -14,7 +14,7 @@ $result_trees{'titlepage_long_title'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -37,7 +37,7 @@ $result_trees{'titlepage_long_title'} = {
                           'text' => ' and the title continue and keep on being 
unfinished until it is the end'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -45,7 +45,7 @@ $result_trees{'titlepage_long_title'} = {
                     }
                   ],
                   'cmdname' => 'title',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -67,7 +67,7 @@ $result_trees{'titlepage_long_title'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -76,9 +76,11 @@ $result_trees{'titlepage_long_title'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -111,7 +113,7 @@ $result_trees{'titlepage_long_title'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -131,7 +133,9 @@ $result_trees{'titlepage_long_title'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -148,7 +152,7 @@ $result_trees{'titlepage_long_title'} = {
               'text' => 'section top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -163,7 +167,8 @@ $result_trees{'titlepage_long_title'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -180,7 +185,7 @@ $result_trees{'titlepage_long_title'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -200,7 +205,9 @@ $result_trees{'titlepage_long_title'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -217,7 +224,7 @@ $result_trees{'titlepage_long_title'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -241,7 +248,8 @@ $result_trees{'titlepage_long_title'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -294,9 +302,11 @@ $result_sectioning{'titlepage_long_title'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -307,9 +317,11 @@ $result_sectioning{'titlepage_long_title'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -338,10 +350,12 @@ $result_nodes{'titlepage_long_title'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -349,12 +363,14 @@ $result_nodes{'titlepage_long_title'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -370,6 +386,7 @@ $result_menus{'titlepage_long_title'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index ef9d3ca7a7..8cd35bae03 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -14,7 +14,7 @@ $result_trees{'titlepage_no_author'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -31,7 +31,7 @@ $result_trees{'titlepage_no_author'} = {
                           'text' => 'Some manual tested'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -39,7 +39,7 @@ $result_trees{'titlepage_no_author'} = {
                     }
                   ],
                   'cmdname' => 'title',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -56,7 +56,7 @@ $result_trees{'titlepage_no_author'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -65,9 +65,11 @@ $result_trees{'titlepage_no_author'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -100,7 +102,7 @@ $result_trees{'titlepage_no_author'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +122,9 @@ $result_trees{'titlepage_no_author'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +141,7 @@ $result_trees{'titlepage_no_author'} = {
               'text' => 'section top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -152,7 +156,8 @@ $result_trees{'titlepage_no_author'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -169,7 +174,7 @@ $result_trees{'titlepage_no_author'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -189,7 +194,9 @@ $result_trees{'titlepage_no_author'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -206,7 +213,7 @@ $result_trees{'titlepage_no_author'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -230,7 +237,8 @@ $result_trees{'titlepage_no_author'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -282,9 +290,11 @@ $result_sectioning{'titlepage_no_author'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -295,9 +305,11 @@ $result_sectioning{'titlepage_no_author'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -326,10 +338,12 @@ $result_nodes{'titlepage_no_author'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -337,12 +351,14 @@ $result_nodes{'titlepage_no_author'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -358,6 +374,7 @@ $result_menus{'titlepage_no_author'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index 75bb3d77d1..09bf5e0a72 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -14,7 +14,7 @@ $result_trees{'titlepage_no_title'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -58,7 +58,7 @@ $result_trees{'titlepage_no_title'} = {
                           'text' => 'Some Author'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -67,9 +67,11 @@ $result_trees{'titlepage_no_title'} = {
                   ],
                   'cmdname' => 'author',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'titlepage' => {}
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -84,7 +86,7 @@ $result_trees{'titlepage_no_title'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -93,9 +95,11 @@ $result_trees{'titlepage_no_title'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -128,7 +132,7 @@ $result_trees{'titlepage_no_title'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -148,7 +152,9 @@ $result_trees{'titlepage_no_title'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -165,7 +171,7 @@ $result_trees{'titlepage_no_title'} = {
               'text' => 'section top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -180,7 +186,8 @@ $result_trees{'titlepage_no_title'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -197,7 +204,7 @@ $result_trees{'titlepage_no_title'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -217,7 +224,9 @@ $result_trees{'titlepage_no_title'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -234,7 +243,7 @@ $result_trees{'titlepage_no_title'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -258,7 +267,8 @@ $result_trees{'titlepage_no_title'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -313,9 +323,11 @@ $result_sectioning{'titlepage_no_title'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -326,9 +338,11 @@ $result_sectioning{'titlepage_no_title'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -357,10 +371,12 @@ $result_nodes{'titlepage_no_title'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -368,12 +384,14 @@ $result_nodes{'titlepage_no_title'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -389,6 +407,7 @@ $result_menus{'titlepage_no_title'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
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 5089f528e9..022fef89a0 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -14,7 +14,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,7 +40,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -49,9 +49,11 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,7 +98,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                           'text' => ' tested'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -104,7 +106,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                     }
                   ],
                   'cmdname' => 'title',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -127,7 +129,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                           'text' => ' tested'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -135,7 +137,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                     }
                   ],
                   'cmdname' => 'subtitle',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -158,7 +160,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                           'text' => ' tested'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -166,7 +168,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                     }
                   ],
                   'cmdname' => 'subtitle',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -189,7 +191,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                           'text' => ' author'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -198,9 +200,11 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   ],
                   'cmdname' => 'author',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'titlepage' => {}
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -254,7 +258,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                 {
                                   'args' => [
                                     {
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -304,7 +308,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                               'text' => 'displaymath'
                                             }
                                           ],
-                                          'extra' => {
+                                          'info' => {
                                             'spaces_after_argument' => '
 '
                                           },
@@ -313,9 +317,11 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                       ],
                                       'cmdname' => 'end',
                                       'extra' => {
-                                        'spaces_before_argument' => ' ',
                                         'text_arg' => 'displaymath'
                                       },
+                                      'info' => {
+                                        'spaces_before_argument' => ' '
+                                      },
                                       'source_info' => {
                                         'file_name' => '',
                                         'line_nr' => 16,
@@ -341,7 +347,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -350,9 +356,11 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   ],
                   'cmdname' => 'author',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'titlepage' => {}
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 10,
@@ -434,7 +442,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -443,9 +451,11 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 23,
@@ -478,7 +488,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -498,7 +508,9 @@ $result_trees{'titlepage_with_commands_classical'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -515,7 +527,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
               'text' => 'section top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -530,7 +542,8 @@ $result_trees{'titlepage_with_commands_classical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -547,7 +560,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -567,7 +580,9 @@ $result_trees{'titlepage_with_commands_classical'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -584,7 +599,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -613,7 +628,8 @@ $result_trees{'titlepage_with_commands_classical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -690,9 +706,11 @@ $result_sectioning{'titlepage_with_commands_classical'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -703,9 +721,11 @@ $result_sectioning{'titlepage_with_commands_classical'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -734,10 +754,12 @@ $result_nodes{'titlepage_with_commands_classical'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -745,12 +767,14 @@ $result_nodes{'titlepage_with_commands_classical'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -766,6 +790,7 @@ $result_menus{'titlepage_with_commands_classical'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/top_no_sectioning_command.pl 
b/tp/t/results/latex_tests/top_no_sectioning_command.pl
index 75edc2a3d2..de19d271e1 100644
--- a/tp/t/results/latex_tests/top_no_sectioning_command.pl
+++ b/tp/t/results/latex_tests/top_no_sectioning_command.pl
@@ -24,7 +24,7 @@ $result_trees{'top_no_sectioning_command'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -51,7 +51,9 @@ $result_trees{'top_no_sectioning_command'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -68,7 +70,7 @@ $result_trees{'top_no_sectioning_command'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,9 @@ $result_trees{'top_no_sectioning_command'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -105,7 +109,7 @@ $result_trees{'top_no_sectioning_command'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -156,7 +160,8 @@ $result_trees{'top_no_sectioning_command'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -202,9 +207,11 @@ $result_sectioning{'top_no_sectioning_command'} = {
             'extra' => {
               'normalized' => 'Chapter'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -222,6 +229,7 @@ $result_nodes{'top_no_sectioning_command'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -229,12 +237,14 @@ $result_nodes{'top_no_sectioning_command'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -248,6 +258,7 @@ $result_menus{'top_no_sectioning_command'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl 
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
index d88b958df8..411a587d89 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
@@ -19,7 +19,7 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
                       'text' => 'odd'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
               'extra' => {
                 'misc_args' => [
                   'odd'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -52,7 +54,7 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
                       'text' => 'on'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -63,7 +65,9 @@ $result_trees{'two_setchapternewpage_odd_on'} = {
               'extra' => {
                 'misc_args' => [
                   'on'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl 
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
index b82fd399c0..3580881be0 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
@@ -19,7 +19,7 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
                       'text' => 'on'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,9 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
               'extra' => {
                 'misc_args' => [
                   'on'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -52,7 +54,7 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
                       'text' => 'odd'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -63,7 +65,9 @@ $result_trees{'two_setchapternewpage_on_odd'} = {
               'extra' => {
                 'misc_args' => [
                   'odd'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/latex_tests/vbar_in_index.pl 
b/tp/t/results/latex_tests/vbar_in_index.pl
index f9892de5e5..1c8d1df28d 100644
--- a/tp/t/results/latex_tests/vbar_in_index.pl
+++ b/tp/t/results/latex_tests/vbar_in_index.pl
@@ -21,7 +21,7 @@ $result_trees{'vbar_in_index'} = {
                   'text' => 'A|B'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -40,7 +40,9 @@ $result_trees{'vbar_in_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -58,7 +60,7 @@ $result_trees{'vbar_in_index'} = {
                   'text' => 'C|D'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -77,7 +79,9 @@ $result_trees{'vbar_in_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/latex_tests/verbatim_in_smallformat.pl 
b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
index 3513c08637..f1a72aa0ce 100644
--- a/tp/t/results/latex_tests/verbatim_in_smallformat.pl
+++ b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
@@ -16,7 +16,7 @@ $result_trees{'verbatim_in_smallformat'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,7 @@ $result_trees{'verbatim_in_smallformat'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -50,7 +50,7 @@ $result_trees{'verbatim_in_smallformat'} = {
                           'text' => 'verbatim'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -59,9 +59,11 @@ $result_trees{'verbatim_in_smallformat'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'verbatim'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -83,7 +85,7 @@ $result_trees{'verbatim_in_smallformat'} = {
                       'text' => 'smallformat'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -92,9 +94,11 @@ $result_trees{'verbatim_in_smallformat'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'smallformat'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index 4502a05be2..977c533760 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index 2975b70ae4..e12d4fb222 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_chapter'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_chapter'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_chapter'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_chapter'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_chapter'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_chapter'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_chapter'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_chapter'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_chapter'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_chapter'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_chapter'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_chapter'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_chapter'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_chapter'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_chapter'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_chapter'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_chapter'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_chapter'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_chapter'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_chapter'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_chapter'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_chapter'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_chapter'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_chapter'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_chapter'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_chapter'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_chapter'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_chapter'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_chapter'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_chapter'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index 3e510c9961..af9214da76 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_chapter_no_header'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_chapter_no_header'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_chapter_no_header'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_chapter_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_chapter_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_chapter_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_chapter_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_chapter_no_header'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_chapter_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_chapter_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_chapter_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_chapter_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_chapter_no_header'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_chapter_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_chapter_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_chapter_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_chapter_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_chapter_no_header'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_chapter_no_header'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_chapter_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_chapter_no_header'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_chapter_no_header'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_chapter_no_header'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
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 f94749fb66..5953a25dd0 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_chapter_no_header_vertical'} 
= {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_chapter_no_header_vertical'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index 58dc6c27f7..c5f5f45534 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_chapter_vertical'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_chapter_vertical'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_chapter_vertical'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_chapter_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_chapter_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_chapter_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_chapter_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_chapter_vertical'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_chapter_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_chapter_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_chapter_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_chapter_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_chapter_vertical'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_chapter_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_chapter_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_chapter_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_chapter_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_chapter_vertical'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_chapter_vertical'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_chapter_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_chapter_vertical'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_chapter_vertical'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_chapter_vertical'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index f2e1ff161b..d8253a5561 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_no_header'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_no_header'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_no_header'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_no_header'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_no_header'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_no_header'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_no_header'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_no_header'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_no_header'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_no_header'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_no_header'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_no_header'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_no_header'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_no_header'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_no_header'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_no_header'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_no_header'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_no_header'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_no_header'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_no_header'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_no_header'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_no_header'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_no_header'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_no_header'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_no_header'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_no_header'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index 17578fda8f..05f438f65b 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_no_header_vertical'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_no_header_vertical'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_no_header_vertical'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_no_header_vertical'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_no_header_vertical'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_no_header_vertical'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_no_header_vertical'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_no_header_vertical'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_no_header_vertical'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_no_header_vertical'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index 576c96486c..aa5164cf9a 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_node'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_node'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_node'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_node'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_node'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_node'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_node'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_node'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_node'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_node'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_node'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_node'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_node'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_node'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_node'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_node'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_node'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_node'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_node'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index 0469a63f49..eef2e2e4fa 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_node_no_header'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_node_no_header'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_node_no_header'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_node_no_header'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_node_no_header'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_node_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_node_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_node_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_node_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_node_no_header'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_node_no_header'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_node_no_header'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_node_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_node_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_node_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_node_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_node_no_header'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_node_no_header'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_node_no_header'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_node_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_node_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_node_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_node_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_node_no_header'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_node_no_header'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_node_no_header'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_node_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_node_no_header'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_node_no_header'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_node_no_header'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_node_no_header'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_node_no_header'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_node_no_header'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_node_no_header'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_node_no_header'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_node_no_header'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_node_no_header'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_node_no_header'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_node_no_header'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
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 d1a5391294..446a6b96fb 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_node_no_header_vertical'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_node_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_node_no_header_vertical'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_node_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_node_no_header_vertical'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_node_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_node_no_header_vertical'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_node_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_node_no_header_vertical'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index ec5964970d..fbbcd2b526 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_node_vertical'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_node_vertical'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_node_vertical'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_node_vertical'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_node_vertical'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_node_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_node_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_node_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_node_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_node_vertical'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_node_vertical'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_node_vertical'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_node_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_node_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_node_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_node_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_node_vertical'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_node_vertical'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_node_vertical'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_node_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_node_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_node_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_node_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_node_vertical'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_node_vertical'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_node_vertical'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_node_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_node_vertical'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_node_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_node_vertical'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_node_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_node_vertical'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_node_vertical'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_node_vertical'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_node_vertical'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_node_vertical'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_node_vertical'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_node_vertical'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_node_vertical'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index 204082f0e9..728f723ad3 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_section'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_section'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_section'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_section'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_section'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_section'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_section'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_section'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_section'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_section'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_section'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_section'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_section'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_section'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_section'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_section'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_section'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_section'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_section'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_section'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_section'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_section'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_section'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_section'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_section'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_section'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_section'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_section'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_section'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_section'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_section'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_section'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index 51373cca47..96ffd334a2 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_section_no_header'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_section_no_header'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_section_no_header'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_section_no_header'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_section_no_header'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_section_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_section_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_section_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_section_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_section_no_header'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_section_no_header'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_section_no_header'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_section_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_section_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_section_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_section_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_section_no_header'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_section_no_header'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_section_no_header'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_section_no_header'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_section_no_header'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_section_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_section_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_section_no_header'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_section_no_header'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_section_no_header'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_section_no_header'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_section_no_header'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_section_no_header'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_section_no_header'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_section_no_header'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_section_no_header'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_section_no_header'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_section_no_header'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_section_no_header'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_section_no_header'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_section_no_header'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_section_no_header'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_section_no_header'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
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 13c6c054bc..7a98b7bdac 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_section_no_header_vertical'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_section_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_section_no_header_vertical'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_section_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_section_no_header_vertical'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_section_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_section_no_header_vertical'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_section_no_header_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_section_no_header_vertical'} 
= {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_section_no_header_vertical'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index 584328ba46..fc03a7de16 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_section_vertical'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_section_vertical'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_section_vertical'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_section_vertical'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_section_vertical'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_section_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_section_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_section_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_section_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_section_vertical'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_section_vertical'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_section_vertical'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_section_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_section_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_section_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_section_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_section_vertical'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_section_vertical'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_section_vertical'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_section_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_section_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_section_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_section_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_section_vertical'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_section_vertical'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_section_vertical'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_section_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_section_vertical'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_section_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_section_vertical'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_section_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_section_vertical'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_section_vertical'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_section_vertical'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_section_vertical'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_section_vertical'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_section_vertical'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_section_vertical'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_section_vertical'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index d36b28165c..25a4a9e631 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -39,7 +39,7 @@ $result_trees{'navigation_vertical'} = {
                       'text' => 'navigation.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'navigation_vertical'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'navigation.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'navigation_vertical'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'navigation_vertical'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'navigation_vertical'} = {
               'text' => 'File used for navigation testing'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'navigation_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'navigation_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'navigation_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'navigation_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'navigation_vertical'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +271,9 @@ $result_trees{'navigation_vertical'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'navigation_vertical'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -298,7 +307,7 @@ $result_trees{'navigation_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -364,7 +373,7 @@ $result_trees{'navigation_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -373,9 +382,11 @@ $result_trees{'navigation_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 17,
@@ -395,7 +406,8 @@ $result_trees{'navigation_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'navigation_vertical'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +444,9 @@ $result_trees{'navigation_vertical'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +463,7 @@ $result_trees{'navigation_vertical'} = {
               'text' => 'Section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +666,7 @@ $result_trees{'navigation_vertical'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -718,7 +732,7 @@ $result_trees{'navigation_vertical'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -727,9 +741,11 @@ $result_trees{'navigation_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 51,
@@ -749,7 +765,8 @@ $result_trees{'navigation_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -766,7 +783,7 @@ $result_trees{'navigation_vertical'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -786,7 +803,9 @@ $result_trees{'navigation_vertical'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -803,7 +822,7 @@ $result_trees{'navigation_vertical'} = {
               'text' => 'Sub section in section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -838,7 +857,8 @@ $result_trees{'navigation_vertical'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -996,9 +1016,11 @@ $result_sectioning{'navigation_vertical'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1009,9 +1031,11 @@ $result_sectioning{'navigation_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1022,9 +1046,11 @@ $result_sectioning{'navigation_vertical'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1035,9 +1061,11 @@ $result_sectioning{'navigation_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1080,6 +1108,7 @@ $result_nodes{'navigation_vertical'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1089,6 +1118,7 @@ $result_nodes{'navigation_vertical'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1096,6 +1126,7 @@ $result_nodes{'navigation_vertical'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1107,6 +1138,7 @@ $result_nodes{'navigation_vertical'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1114,6 +1146,7 @@ $result_nodes{'navigation_vertical'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1125,6 +1158,7 @@ $result_nodes{'navigation_vertical'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1132,12 +1166,14 @@ $result_nodes{'navigation_vertical'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1163,24 +1199,28 @@ $result_menus{'navigation_vertical'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 623c296d01..07021f8d84 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -39,7 +39,7 @@ $result_trees{'no_monolithic'} = {
                       'text' => 'no_monolithic.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'no_monolithic'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'no_monolithic.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'no_monolithic'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'no_monolithic'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'no_monolithic'} = {
               'text' => 'Not monolithic'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -175,7 +179,7 @@ $result_trees{'no_monolithic'} = {
                   'text' => 'top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -195,7 +199,9 @@ $result_trees{'no_monolithic'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -213,7 +219,7 @@ $result_trees{'no_monolithic'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -279,7 +285,7 @@ $result_trees{'no_monolithic'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -288,9 +294,11 @@ $result_trees{'no_monolithic'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
                 'line_nr' => 14,
@@ -310,7 +318,8 @@ $result_trees{'no_monolithic'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -327,7 +336,7 @@ $result_trees{'no_monolithic'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -348,7 +357,9 @@ $result_trees{'no_monolithic'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -365,7 +376,7 @@ $result_trees{'no_monolithic'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -436,7 +447,7 @@ $result_trees{'no_monolithic'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -447,7 +458,9 @@ $result_trees{'no_monolithic'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -457,7 +470,8 @@ $result_trees{'no_monolithic'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -546,9 +560,11 @@ $result_sectioning{'no_monolithic'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -560,9 +576,11 @@ $result_sectioning{'no_monolithic'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -591,6 +609,7 @@ $result_nodes{'no_monolithic'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -600,6 +619,7 @@ $result_nodes{'no_monolithic'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -607,6 +627,7 @@ $result_nodes{'no_monolithic'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -614,6 +635,7 @@ $result_nodes{'no_monolithic'} = {
         'isindex' => 1,
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -631,6 +653,7 @@ $result_menus{'no_monolithic'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -638,6 +661,7 @@ $result_menus{'no_monolithic'} = {
         'isindex' => 1,
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl 
b/tp/t/results/macro/arg_body_expansion_order.pl
index a993339bb7..f6ecaa10e7 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -36,7 +36,7 @@ $result_trees{'arg_body_expansion_order'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'arg_body_expansion_order'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -104,7 +106,7 @@ $result_trees{'arg_body_expansion_order'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -113,9 +115,11 @@ $result_trees{'arg_body_expansion_order'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 10,
@@ -141,7 +145,7 @@ $result_trees{'arg_body_expansion_order'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -150,9 +154,11 @@ $result_trees{'arg_body_expansion_order'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -213,7 +219,7 @@ $result_trees{'arg_body_expansion_order'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -222,9 +228,11 @@ $result_trees{'arg_body_expansion_order'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
diff --git a/tp/t/results/macro/arg_not_closed.pl 
b/tp/t/results/macro/arg_not_closed.pl
index 0d1c6644aa..20ebccf906 100644
--- a/tp/t/results/macro/arg_not_closed.pl
+++ b/tp/t/results/macro/arg_not_closed.pl
@@ -35,7 +35,7 @@ $result_trees{'arg_not_closed'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'arg_not_closed'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 2fee667092..c5e98111a9 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -18,7 +18,7 @@ $result_trees{'backslash_in_arg'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -58,7 +58,7 @@ $result_trees{'backslash_in_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -67,9 +67,11 @@ $result_trees{'backslash_in_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -100,7 +102,7 @@ $result_trees{'backslash_in_arg'} = {
                   'text' => '\\\\q'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -120,7 +122,9 @@ $result_trees{'backslash_in_arg'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -138,7 +142,7 @@ $result_trees{'backslash_in_arg'} = {
                   'text' => '\\r'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -158,7 +162,9 @@ $result_trees{'backslash_in_arg'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -176,7 +182,7 @@ $result_trees{'backslash_in_arg'} = {
                   'text' => '\\q'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +202,9 @@ $result_trees{'backslash_in_arg'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -214,7 +222,7 @@ $result_trees{'backslash_in_arg'} = {
                   'text' => '\\r'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -234,7 +242,9 @@ $result_trees{'backslash_in_arg'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -252,7 +262,7 @@ $result_trees{'backslash_in_arg'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -263,7 +273,9 @@ $result_trees{'backslash_in_arg'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -286,7 +298,9 @@ $result_trees{'backslash_in_arg'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -340,7 +354,8 @@ $result_nodes{'backslash_in_arg'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'backslash_in_arg'} = {
@@ -348,7 +363,8 @@ $result_menus{'backslash_in_arg'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'backslash_in_arg'} = [];
diff --git a/tp/t/results/macro/bad_argument.pl 
b/tp/t/results/macro/bad_argument.pl
index 1df0154516..c4df19074f 100644
--- a/tp/t/results/macro/bad_argument.pl
+++ b/tp/t/results/macro/bad_argument.pl
@@ -25,7 +25,7 @@ $result_trees{'bad_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -34,9 +34,11 @@ $result_trees{'bad_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -82,7 +84,7 @@ $result_trees{'bad_argument'} = {
                       'text' => 'rmacro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -91,9 +93,11 @@ $result_trees{'bad_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'rmacro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -143,7 +147,7 @@ $result_trees{'bad_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -152,9 +156,11 @@ $result_trees{'bad_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -194,7 +200,7 @@ $result_trees{'bad_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -203,9 +209,11 @@ $result_trees{'bad_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
diff --git a/tp/t/results/macro/bad_formal_arg.pl 
b/tp/t/results/macro/bad_formal_arg.pl
index c11f50a3ef..082a6558d8 100644
--- a/tp/t/results/macro/bad_formal_arg.pl
+++ b/tp/t/results/macro/bad_formal_arg.pl
@@ -44,7 +44,7 @@ $result_trees{'bad_formal_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -53,9 +53,11 @@ $result_trees{'bad_formal_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -109,7 +111,7 @@ $result_trees{'bad_formal_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -118,9 +120,11 @@ $result_trees{'bad_formal_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -178,7 +182,7 @@ $result_trees{'bad_formal_arg'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -187,9 +191,11 @@ $result_trees{'bad_formal_arg'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 14,
@@ -210,7 +216,7 @@ $result_trees{'bad_formal_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -219,9 +225,11 @@ $result_trees{'bad_formal_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
diff --git a/tp/t/results/macro/bad_macro_name_with_underscore.pl 
b/tp/t/results/macro/bad_macro_name_with_underscore.pl
index f29150e294..efd36b4384 100644
--- a/tp/t/results/macro/bad_macro_name_with_underscore.pl
+++ b/tp/t/results/macro/bad_macro_name_with_underscore.pl
@@ -39,7 +39,7 @@ $result_trees{'bad_macro_name_with_underscore'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'bad_macro_name_with_underscore'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/complete_macro_for_end.pl 
b/tp/t/results/macro/complete_macro_for_end.pl
index e9cdd1398f..dbcf731157 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -31,7 +31,7 @@ $result_trees{'complete_macro_for_end'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'complete_macro_for_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -68,7 +70,7 @@ $result_trees{'complete_macro_for_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -90,9 +92,11 @@ $result_trees{'complete_macro_for_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/macro/complex_argument.pl 
b/tp/t/results/macro/complex_argument.pl
index ff50a28949..19dd054839 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -35,7 +35,7 @@ $result_trees{'complex_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'complex_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -106,7 +108,7 @@ $result_trees{'complex_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -115,9 +117,11 @@ $result_trees{'complex_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -175,7 +179,7 @@ $result_trees{'complex_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -184,9 +188,11 @@ $result_trees{'complex_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -261,7 +267,7 @@ $result_trees{'complex_argument'} = {
                       'text' => '4 1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -269,7 +275,7 @@ $result_trees{'complex_argument'} = {
                 }
               ],
               'cmdname' => 'pagesizes',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -298,7 +304,7 @@ $result_trees{'complex_argument'} = {
                       'text' => 'doubleafter 1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -306,7 +312,7 @@ $result_trees{'complex_argument'} = {
                 }
               ],
               'cmdname' => 'headings',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -333,7 +339,7 @@ $result_trees{'complex_argument'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -355,7 +361,7 @@ $result_trees{'complex_argument'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -364,9 +370,11 @@ $result_trees{'complex_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -383,7 +391,7 @@ $result_trees{'complex_argument'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -405,7 +413,7 @@ $result_trees{'complex_argument'} = {
                       'text' => 'ignore'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -414,9 +422,11 @@ $result_trees{'complex_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ignore'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -456,7 +466,7 @@ $result_trees{'complex_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -465,9 +475,11 @@ $result_trees{'complex_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 38,
diff --git a/tp/t/results/macro/double_macro_definition.pl 
b/tp/t/results/macro/double_macro_definition.pl
index 5c9c1fa2d3..ac1f0d7a48 100644
--- a/tp/t/results/macro/double_macro_definition.pl
+++ b/tp/t/results/macro/double_macro_definition.pl
@@ -26,7 +26,7 @@ $result_trees{'double_macro_definition'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -35,9 +35,11 @@ $result_trees{'double_macro_definition'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -77,7 +79,7 @@ $result_trees{'double_macro_definition'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -86,9 +88,11 @@ $result_trees{'double_macro_definition'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl 
b/tp/t/results/macro/double_recursive_macro_call.pl
index 925b111381..4cb0256d8a 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -40,7 +40,7 @@ $result_trees{'double_recursive_macro_call'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -49,9 +49,11 @@ $result_trees{'double_recursive_macro_call'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -100,7 +102,7 @@ $result_trees{'double_recursive_macro_call'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -109,9 +111,11 @@ $result_trees{'double_recursive_macro_call'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/macro/empty_end.pl b/tp/t/results/macro/empty_end.pl
index 12ab604b6b..d5b41576d2 100644
--- a/tp/t/results/macro/empty_end.pl
+++ b/tp/t/results/macro/empty_end.pl
@@ -40,9 +40,11 @@ $result_trees{'empty_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/empty_macro_argument.pl 
b/tp/t/results/macro/empty_macro_argument.pl
index c82a01c522..b7c68c2812 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -31,7 +31,7 @@ $result_trees{'empty_macro_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'empty_macro_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -105,7 +107,7 @@ $result_trees{'empty_macro_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -114,9 +116,11 @@ $result_trees{'empty_macro_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
diff --git a/tp/t/results/macro/empty_macro_in_text_no_arg.pl 
b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
index a7c4487aa0..1ebdd0756c 100644
--- a/tp/t/results/macro/empty_macro_in_text_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
@@ -26,7 +26,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -35,9 +35,11 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -95,7 +97,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -104,9 +106,11 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/macro/empty_macro_no_arg.pl 
b/tp/t/results/macro/empty_macro_no_arg.pl
index 439c07b148..54adebe6db 100644
--- a/tp/t/results/macro/empty_macro_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_no_arg.pl
@@ -26,7 +26,7 @@ $result_trees{'empty_macro_no_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -35,9 +35,11 @@ $result_trees{'empty_macro_no_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
diff --git a/tp/t/results/macro/expand_two_same.pl 
b/tp/t/results/macro/expand_two_same.pl
index 4beec9456e..31e20d4049 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -40,7 +40,7 @@ $result_trees{'expand_two_same'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -49,9 +49,11 @@ $result_trees{'expand_two_same'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/macro/expansion_order.pl 
b/tp/t/results/macro/expansion_order.pl
index ee45e52c52..11cfaf9ea4 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -35,7 +35,7 @@ $result_trees{'expansion_order'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'expansion_order'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -96,7 +98,7 @@ $result_trees{'expansion_order'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -105,9 +107,11 @@ $result_trees{'expansion_order'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index 10e798f431..5f886704b3 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -39,7 +39,7 @@ $result_trees{'form_feeds'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'form_feeds'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -99,7 +101,7 @@ $result_trees{'form_feeds'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -108,9 +110,11 @@ $result_trees{'form_feeds'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/macro/ifclear_in_macro.pl 
b/tp/t/results/macro/ifclear_in_macro.pl
index 8de3e4eebe..d35ae74dfa 100644
--- a/tp/t/results/macro/ifclear_in_macro.pl
+++ b/tp/t/results/macro/ifclear_in_macro.pl
@@ -45,7 +45,7 @@ $result_trees{'ifclear_in_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -54,9 +54,11 @@ $result_trees{'ifclear_in_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/macro/ifset_and_end_isef_in_macro.pl 
b/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
index 411e4086e9..27b4124b21 100644
--- a/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
+++ b/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
@@ -31,7 +31,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -87,7 +89,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,9 +98,11 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/macro/ifset_in_macro.pl 
b/tp/t/results/macro/ifset_in_macro.pl
index 046ed13c5d..f9bb5e6fc7 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -45,7 +45,7 @@ $result_trees{'ifset_in_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -54,9 +54,11 @@ $result_trees{'ifset_in_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/macro/ifset_in_macro_set.pl 
b/tp/t/results/macro/ifset_in_macro_set.pl
index 07e0c897ef..b7237893b7 100644
--- a/tp/t/results/macro/ifset_in_macro_set.pl
+++ b/tp/t/results/macro/ifset_in_macro_set.pl
@@ -45,7 +45,7 @@ $result_trees{'ifset_in_macro_set'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -54,9 +54,11 @@ $result_trees{'ifset_in_macro_set'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/macro/ignored_macro_definition.pl 
b/tp/t/results/macro/ignored_macro_definition.pl
index d7634dd36f..6a449507de 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -31,7 +31,7 @@ $result_trees{'ignored_macro_definition'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'ignored_macro_definition'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl 
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index b0ee84352b..d4e64a3bf3 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -40,7 +40,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -49,9 +49,11 @@ $result_trees{'implicit_quoting_one_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/macro/implicit_quoting_recursion.pl 
b/tp/t/results/macro/implicit_quoting_recursion.pl
index e7fa5d7c06..924f8a81af 100644
--- a/tp/t/results/macro/implicit_quoting_recursion.pl
+++ b/tp/t/results/macro/implicit_quoting_recursion.pl
@@ -39,7 +39,7 @@ $result_trees{'implicit_quoting_recursion'} = {
                       'text' => 'rmacro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'implicit_quoting_recursion'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'rmacro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/include_after_empty_line_arg.pl 
b/tp/t/results/macro/include_after_empty_line_arg.pl
index 0f133a3dec..965ef41ab9 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -35,7 +35,7 @@ $result_trees{'include_after_empty_line_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'include_after_empty_line_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl 
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index 6d0f0f06c9..f63bd95a64 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -36,7 +36,7 @@ $result_trees{'leading_spaces_no_ignore'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'leading_spaces_no_ignore'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/macro/line_after_recursive_call.pl 
b/tp/t/results/macro/line_after_recursive_call.pl
index fd83b012a3..b9a79a7906 100644
--- a/tp/t/results/macro/line_after_recursive_call.pl
+++ b/tp/t/results/macro/line_after_recursive_call.pl
@@ -41,7 +41,7 @@ $result_trees{'line_after_recursive_call'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -50,9 +50,11 @@ $result_trees{'line_after_recursive_call'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl 
b/tp/t/results/macro/macro_expands_to_empty.pl
index 44988ff0e3..9619d416a9 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -35,7 +35,7 @@ $result_trees{'macro_expands_to_empty'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'macro_expands_to_empty'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/macro_expansion.pl 
b/tp/t/results/macro/macro_expansion.pl
index 8ad2ec942f..4230ced21d 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -59,7 +59,7 @@ $result_trees{'macro_expansion'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -68,9 +68,11 @@ $result_trees{'macro_expansion'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -105,7 +107,7 @@ $result_trees{'macro_expansion'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -127,7 +129,7 @@ $result_trees{'macro_expansion'} = {
                       'text' => 'verbatim.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -136,9 +138,11 @@ $result_trees{'macro_expansion'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim.'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -190,7 +194,7 @@ $result_trees{'macro_expansion'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -212,7 +216,7 @@ $result_trees{'macro_expansion'} = {
                       'text' => 'verbatim.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -221,9 +225,11 @@ $result_trees{'macro_expansion'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim.'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -254,7 +260,7 @@ $result_trees{'macro_expansion'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -276,7 +282,7 @@ $result_trees{'macro_expansion'} = {
                       'text' => 'verbatim my arg.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -285,9 +291,11 @@ $result_trees{'macro_expansion'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim my arg.'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -318,7 +326,7 @@ $result_trees{'macro_expansion'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -340,7 +348,7 @@ $result_trees{'macro_expansion'} = {
                       'text' => 'verbatim.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -349,9 +357,11 @@ $result_trees{'macro_expansion'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim.'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -382,7 +392,7 @@ $result_trees{'macro_expansion'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -404,7 +414,7 @@ $result_trees{'macro_expansion'} = {
                       'text' => 'verbatim.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -413,9 +423,11 @@ $result_trees{'macro_expansion'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim.'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -460,7 +472,7 @@ $result_trees{'macro_expansion'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -497,9 +509,11 @@ $result_trees{'macro_expansion'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim.'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
diff --git a/tp/t/results/macro/macro_for_end.pl 
b/tp/t/results/macro/macro_for_end.pl
index f31701ecfd..d29e599fbd 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_for_end'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_for_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -68,7 +70,7 @@ $result_trees{'macro_for_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -85,7 +87,7 @@ $result_trees{'macro_for_end'} = {
                       'text' => 'cartouche'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -94,9 +96,11 @@ $result_trees{'macro_for_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/macro/macro_for_ignored_line_command.pl 
b/tp/t/results/macro/macro_for_ignored_line_command.pl
index e68288f2ae..f0941a55b4 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_for_ignored_line_command'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_for_ignored_line_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/macro_in_accent.pl 
b/tp/t/results/macro/macro_in_accent.pl
index 5225603701..bf204a0b0a 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_in_accent'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_in_accent'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -87,7 +89,7 @@ $result_trees{'macro_in_accent'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,9 +98,11 @@ $result_trees{'macro_in_accent'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/macro/macro_in_brace_command.pl 
b/tp/t/results/macro/macro_in_brace_command.pl
index 9e02301e35..6efee5dbbd 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_in_brace_command'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_in_brace_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -87,7 +89,7 @@ $result_trees{'macro_in_brace_command'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,9 +98,11 @@ $result_trees{'macro_in_brace_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -135,7 +139,7 @@ $result_trees{'macro_in_brace_command'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -206,7 +210,7 @@ $result_trees{'macro_in_brace_command'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -215,9 +219,11 @@ $result_trees{'macro_in_brace_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -226,7 +232,9 @@ $result_trees{'macro_in_brace_command'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/macro/macro_in_end_argument.pl 
b/tp/t/results/macro/macro_in_end_argument.pl
index 25e771d2c7..1c24f2dc2a 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_in_end_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_in_end_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -68,7 +70,7 @@ $result_trees{'macro_in_end_argument'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -85,7 +87,7 @@ $result_trees{'macro_in_end_argument'} = {
                       'text' => 'cartouche'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -94,9 +96,11 @@ $result_trees{'macro_in_end_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/macro/macro_in_ifset.pl 
b/tp/t/results/macro/macro_in_ifset.pl
index c385263be1..f423bc4fb9 100644
--- a/tp/t/results/macro/macro_in_ifset.pl
+++ b/tp/t/results/macro/macro_in_ifset.pl
@@ -35,7 +35,7 @@ $result_trees{'macro_in_ifset'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'macro_in_ifset'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl 
b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
index 6b226ab3d8..becc4cda21 100644
--- a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
+++ b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
@@ -35,7 +35,7 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -87,7 +89,7 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
                       'text' => 'ifset'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,9 +98,11 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ifset'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 8019395f76..389f7cddea 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_in_index_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_in_index_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -82,7 +84,7 @@ $result_trees{'macro_in_index_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -91,9 +93,11 @@ $result_trees{'macro_in_index_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -133,7 +137,7 @@ $result_trees{'macro_in_index_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -142,9 +146,11 @@ $result_trees{'macro_in_index_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -175,7 +181,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => 'cp fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -187,7 +193,9 @@ $result_trees{'macro_in_index_commands'} = {
             'misc_args' => [
               'cp',
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -204,7 +212,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => 'cp fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -216,7 +224,9 @@ $result_trees{'macro_in_index_commands'} = {
             'misc_args' => [
               'cp',
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -252,7 +262,7 @@ $result_trees{'macro_in_index_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -261,9 +271,11 @@ $result_trees{'macro_in_index_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -300,7 +312,7 @@ $result_trees{'macro_in_index_commands'} = {
                       'text' => 'truc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -311,7 +323,9 @@ $result_trees{'macro_in_index_commands'} = {
               'extra' => {
                 'misc_args' => [
                   'truc'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -354,7 +368,7 @@ $result_trees{'macro_in_index_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -363,9 +377,11 @@ $result_trees{'macro_in_index_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -410,7 +426,7 @@ $result_trees{'macro_in_index_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -419,9 +435,11 @@ $result_trees{'macro_in_index_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -452,7 +470,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => 'codeidx'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -463,7 +481,9 @@ $result_trees{'macro_in_index_commands'} = {
           'extra' => {
             'misc_args' => [
               'codeidx'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -499,7 +519,7 @@ $result_trees{'macro_in_index_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -508,9 +528,11 @@ $result_trees{'macro_in_index_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -544,7 +566,7 @@ $result_trees{'macro_in_index_commands'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -566,7 +588,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => 'index truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -586,7 +608,9 @@ $result_trees{'macro_in_index_commands'} = {
               'index_ignore_chars' => {},
               'index_name' => 'truc',
               'index_type_command' => 'trucindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -684,7 +708,7 @@ $result_trees{'macro_in_index_commands'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -704,7 +728,9 @@ $result_trees{'macro_in_index_commands'} = {
               'index_ignore_chars' => {},
               'index_name' => 'codeidx',
               'index_type_command' => 'codeidxindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -727,7 +753,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => 'truc kindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -747,7 +773,9 @@ $result_trees{'macro_in_index_commands'} = {
               'index_ignore_chars' => {},
               'index_name' => 'ky',
               'index_type_command' => 'kindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -765,7 +793,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => 'pindex codeidx'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -785,7 +813,9 @@ $result_trees{'macro_in_index_commands'} = {
               'index_ignore_chars' => {},
               'index_name' => 'pg',
               'index_type_command' => 'pindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -817,7 +847,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => 'truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -828,7 +858,9 @@ $result_trees{'macro_in_index_commands'} = {
           'extra' => {
             'misc_args' => [
               'truc'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -859,7 +891,7 @@ $result_trees{'macro_in_index_commands'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -870,7 +902,9 @@ $result_trees{'macro_in_index_commands'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -898,7 +932,9 @@ $result_trees{'macro_in_index_commands'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1007,7 +1043,8 @@ $result_nodes{'macro_in_index_commands'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'macro_in_index_commands'} = {
@@ -1015,7 +1052,8 @@ $result_menus{'macro_in_index_commands'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'macro_in_index_commands'} = [
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl 
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index 3e449044cf..e1a995c9f0 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -68,7 +70,7 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
                   'text' => 'badm'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -77,9 +79,11 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'badm'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 4,
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl 
b/tp/t/results/macro/macro_in_macro_arg.pl
index 91d6699746..c7b124157d 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -36,7 +36,7 @@ $result_trees{'macro_in_macro_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'macro_in_macro_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -96,7 +98,7 @@ $result_trees{'macro_in_macro_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -105,9 +107,11 @@ $result_trees{'macro_in_macro_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -165,7 +169,7 @@ $result_trees{'macro_in_macro_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -174,9 +178,11 @@ $result_trees{'macro_in_macro_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
diff --git a/tp/t/results/macro/macro_in_macro_arg_simpler.pl 
b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
index 98eca1c5bd..453b671329 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -100,7 +102,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -109,9 +111,11 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/macro/macro_in_menu.pl 
b/tp/t/results/macro/macro_in_menu.pl
index 6db1b06a3f..b82d0aa862 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -36,7 +36,7 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'macro_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -92,7 +94,7 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -101,9 +103,11 @@ $result_trees{'macro_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -148,7 +152,7 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -157,9 +161,11 @@ $result_trees{'macro_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -204,7 +210,7 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -213,9 +219,11 @@ $result_trees{'macro_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -260,7 +268,7 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -269,9 +277,11 @@ $result_trees{'macro_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -316,7 +326,7 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -325,9 +335,11 @@ $result_trees{'macro_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -353,7 +365,7 @@ $result_trees{'macro_in_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -647,7 +659,7 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -656,9 +668,11 @@ $result_trees{'macro_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 7652a8937a..cec533963c 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -87,7 +89,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,9 +98,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -132,7 +136,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -152,7 +156,9 @@ $result_trees{'macro_in_misc_commands'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -169,7 +175,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'text' => 'top atext'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -186,7 +192,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'Comment like: atext'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -194,7 +200,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -275,7 +281,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -284,9 +290,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -326,7 +334,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -335,9 +343,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -373,7 +383,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'en'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -382,9 +392,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'en'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -413,7 +425,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'en'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -422,9 +434,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'en'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -465,7 +479,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -474,9 +488,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -521,7 +537,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -530,9 +546,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
@@ -563,7 +581,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => '200mm,150mm'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -571,7 +589,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'pagesizes',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -603,7 +621,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'on line following headings atext'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -611,7 +629,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'headings',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -628,7 +646,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'on line following oddfooting atext'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -636,7 +654,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'oddfooting',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -653,7 +671,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'on line following everyheading atext'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -661,7 +679,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'everyheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -697,7 +715,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -706,9 +724,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 45,
@@ -739,7 +759,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => '0.1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -750,7 +770,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '0.1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -786,7 +808,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -795,9 +817,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 51,
@@ -847,7 +871,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -856,9 +880,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 55,
@@ -907,7 +933,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'phoo,//,\\\\'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -920,7 +946,9 @@ $result_trees{'macro_in_misc_commands'} = {
                   'phoo',
                   '//',
                   '\\\\'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -996,7 +1024,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1005,9 +1033,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 64,
@@ -1033,7 +1063,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'phi,:,:'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1046,7 +1076,9 @@ $result_trees{'macro_in_misc_commands'} = {
               'phi',
               ':',
               ':'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1119,7 +1151,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1128,9 +1160,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 71,
@@ -1170,7 +1204,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1179,9 +1213,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 74,
@@ -1244,7 +1280,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'strong,(strong:,:)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1257,7 +1293,9 @@ $result_trees{'macro_in_misc_commands'} = {
               'strong',
               '(strong:',
               ':)'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1362,7 +1400,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1371,9 +1409,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 86,
@@ -1399,7 +1439,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'code'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1410,7 +1450,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'code'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1462,7 +1504,7 @@ $result_trees{'macro_in_misc_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1509,7 +1551,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1518,9 +1560,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 93,
@@ -1561,7 +1605,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1570,9 +1614,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 97,
@@ -1612,7 +1658,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1621,9 +1667,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 100,
@@ -1663,7 +1711,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1672,9 +1720,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 103,
@@ -1714,7 +1764,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1723,9 +1773,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 106,
@@ -1765,7 +1817,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1774,9 +1826,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 109,
@@ -1807,7 +1861,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'asis'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1818,7 +1872,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'asis'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1835,7 +1891,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => '0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1846,7 +1902,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '0'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1863,7 +1921,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'none'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1874,7 +1932,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'none'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1891,7 +1951,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => '4'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1902,7 +1962,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '4'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1919,7 +1981,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'none'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1930,7 +1992,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'none'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1947,7 +2011,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => '6'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1958,7 +2022,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '6'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1994,7 +2060,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2003,9 +2069,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 120,
@@ -2045,7 +2113,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2054,9 +2122,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 123,
@@ -2082,7 +2152,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'end'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2093,7 +2163,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'end'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2110,7 +2182,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'separate'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -2121,7 +2193,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'separate'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2157,7 +2231,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2166,9 +2240,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 129,
@@ -2208,7 +2284,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2217,9 +2293,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 132,
@@ -2245,7 +2323,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2256,7 +2334,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2273,7 +2353,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2284,7 +2364,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2336,7 +2418,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2345,9 +2427,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 139,
@@ -2373,7 +2457,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => '10'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2384,7 +2468,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '10'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2431,7 +2517,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2440,9 +2526,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 144,
@@ -2482,7 +2570,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2491,9 +2579,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 147,
@@ -2519,7 +2609,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'false'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2530,7 +2620,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'false'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2552,7 +2644,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'true'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2563,7 +2655,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'true'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2599,7 +2693,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2608,9 +2702,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 154,
@@ -2650,7 +2746,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2659,9 +2755,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 157,
@@ -2701,7 +2799,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2710,9 +2808,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 160,
@@ -2978,7 +3078,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2987,9 +3087,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 178,
@@ -3070,7 +3172,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3079,9 +3181,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 185,
@@ -3107,7 +3211,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => 'line after exdent'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3115,7 +3219,7 @@ $result_trees{'macro_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'exdent',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3151,7 +3255,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3160,9 +3264,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 190,
@@ -3188,7 +3294,7 @@ $result_trees{'macro_in_misc_commands'} = {
                   'text' => '2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3199,7 +3305,9 @@ $result_trees{'macro_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '2'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3235,7 +3343,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3244,9 +3352,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 195,
@@ -3298,7 +3408,7 @@ $result_trees{'macro_in_misc_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3364,7 +3474,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3373,9 +3483,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 201,
@@ -3395,7 +3507,8 @@ $result_trees{'macro_in_misc_commands'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3412,7 +3525,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'text' => 'node atext'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3432,7 +3545,9 @@ $result_trees{'macro_in_misc_commands'} = {
             'normalized' => 'node-atext'
           }
         ],
-        'normalized' => 'node-atext',
+        'normalized' => 'node-atext'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3449,7 +3564,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3505,7 +3620,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3514,9 +3629,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 210,
@@ -3576,7 +3693,7 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3585,9 +3702,11 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 215,
@@ -3611,7 +3730,8 @@ $result_trees{'macro_in_misc_commands'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3948,9 +4068,11 @@ $result_sectioning{'macro_in_misc_commands'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -3961,9 +4083,11 @@ $result_sectioning{'macro_in_misc_commands'} = {
                   'extra' => {
                     'normalized' => 'node-atext'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -3992,6 +4116,7 @@ $result_nodes{'macro_in_misc_commands'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -4001,6 +4126,7 @@ $result_nodes{'macro_in_misc_commands'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -4008,12 +4134,14 @@ $result_nodes{'macro_in_misc_commands'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-atext'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -4031,12 +4159,14 @@ $result_menus{'macro_in_misc_commands'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node-atext'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/macro/macro_name_with_digit.pl 
b/tp/t/results/macro/macro_name_with_digit.pl
index f6a1dd783a..cebf0423cd 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_name_with_digit'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_name_with_digit'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -91,7 +93,7 @@ $result_trees{'macro_name_with_digit'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -100,9 +102,11 @@ $result_trees{'macro_name_with_digit'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl 
b/tp/t/results/macro/macro_name_with_hyphen.pl
index 1aee44f464..38d170f554 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -39,7 +39,7 @@ $result_trees{'macro_name_with_hyphen'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'macro_name_with_hyphen'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/macro_no_arg_bad_expansion.pl 
b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
index 9d85462cbe..d3b07b3939 100644
--- a/tp/t/results/macro/macro_no_arg_bad_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl 
b/tp/t/results/macro/macro_no_arg_expansion.pl
index 75fabf70a1..679936ec7a 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_no_arg_expansion'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_no_arg_expansion'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/macro_one_arg_end_of_file.pl 
b/tp/t/results/macro/macro_one_arg_end_of_file.pl
index f42ddebbba..ca9bbc3d87 100644
--- a/tp/t/results/macro/macro_one_arg_end_of_file.pl
+++ b/tp/t/results/macro/macro_one_arg_end_of_file.pl
@@ -35,7 +35,7 @@ $result_trees{'macro_one_arg_end_of_file'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'macro_one_arg_end_of_file'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl 
b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
index 377a5fd1dc..cfe5ccaf69 100644
--- a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
+++ b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
@@ -35,7 +35,7 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -72,7 +74,7 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index 9ea3cbd919..b9d74e1725 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -31,7 +31,7 @@ $result_trees{'macro_zero'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'macro_zero'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/nested_macro_call.pl 
b/tp/t/results/macro/nested_macro_call.pl
index b610536b2f..cfdff1920d 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -31,7 +31,7 @@ $result_trees{'nested_macro_call'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'nested_macro_call'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -92,7 +94,7 @@ $result_trees{'nested_macro_call'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -101,9 +103,11 @@ $result_trees{'nested_macro_call'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/macro/no_macrobody.pl 
b/tp/t/results/macro/no_macrobody.pl
index 3d5be4ceb7..4f27e08700 100644
--- a/tp/t/results/macro/no_macrobody.pl
+++ b/tp/t/results/macro/no_macrobody.pl
@@ -30,7 +30,7 @@ $result_trees{'no_macrobody'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -39,9 +39,11 @@ $result_trees{'no_macrobody'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
diff --git a/tp/t/results/macro/paragraph_and_macro.pl 
b/tp/t/results/macro/paragraph_and_macro.pl
index fa079f3aa4..cb5a87439f 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -26,7 +26,7 @@ $result_trees{'paragraph_and_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -35,9 +35,11 @@ $result_trees{'paragraph_and_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -82,7 +84,7 @@ $result_trees{'paragraph_and_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -91,9 +93,11 @@ $result_trees{'paragraph_and_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -138,7 +142,7 @@ $result_trees{'paragraph_and_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -147,9 +151,11 @@ $result_trees{'paragraph_and_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
diff --git a/tp/t/results/macro/protect_comma_macro_line.pl 
b/tp/t/results/macro/protect_comma_macro_line.pl
index 860c86ec3c..7a9a60a4c4 100644
--- a/tp/t/results/macro/protect_comma_macro_line.pl
+++ b/tp/t/results/macro/protect_comma_macro_line.pl
@@ -50,7 +50,7 @@ $result_trees{'protect_comma_macro_line'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,9 +59,11 @@ $result_trees{'protect_comma_macro_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/macro/protect_in_body.pl 
b/tp/t/results/macro/protect_in_body.pl
index 880f0385f9..11b0eefed1 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -39,7 +39,7 @@ $result_trees{'protect_in_body'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'protect_in_body'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/protect_in_body_line_arg.pl 
b/tp/t/results/macro/protect_in_body_line_arg.pl
index dd9736d833..7732d62d81 100644
--- a/tp/t/results/macro/protect_in_body_line_arg.pl
+++ b/tp/t/results/macro/protect_in_body_line_arg.pl
@@ -39,7 +39,7 @@ $result_trees{'protect_in_body_line_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'protect_in_body_line_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/protect_in_body_one_arg.pl 
b/tp/t/results/macro/protect_in_body_one_arg.pl
index 9c6e9b985e..682a29a410 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -39,7 +39,7 @@ $result_trees{'protect_in_body_one_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'protect_in_body_one_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/recursive_call_in_argument.pl 
b/tp/t/results/macro/recursive_call_in_argument.pl
index 798154b9ea..3adf718b18 100644
--- a/tp/t/results/macro/recursive_call_in_argument.pl
+++ b/tp/t/results/macro/recursive_call_in_argument.pl
@@ -35,7 +35,7 @@ $result_trees{'recursive_call_in_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'recursive_call_in_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl 
b/tp/t/results/macro/recursive_call_in_macro.pl
index 7102a07d57..b4ad300454 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -35,7 +35,7 @@ $result_trees{'recursive_call_in_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'recursive_call_in_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl 
b/tp/t/results/macro/redefine_texinfo_macro.pl
index 39039370b9..127fd9c047 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -35,7 +35,7 @@ $result_trees{'redefine_texinfo_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'redefine_texinfo_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl 
b/tp/t/results/macro/simple_imbricated_macro.pl
index e1cb369ed4..8a8137ca4c 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -39,7 +39,7 @@ $result_trees{'simple_imbricated_macro'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -48,9 +48,11 @@ $result_trees{'simple_imbricated_macro'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -71,7 +73,7 @@ $result_trees{'simple_imbricated_macro'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -80,9 +82,11 @@ $result_trees{'simple_imbricated_macro'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -133,7 +137,7 @@ $result_trees{'simple_imbricated_macro'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -142,9 +146,11 @@ $result_trees{'simple_imbricated_macro'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 8,
diff --git a/tp/t/results/macro/space_macro_after_end.pl 
b/tp/t/results/macro/space_macro_after_end.pl
index b960d31349..7c52631cea 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -31,7 +31,7 @@ $result_trees{'space_macro_after_end'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'space_macro_after_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -68,7 +70,7 @@ $result_trees{'space_macro_after_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -94,7 +96,7 @@ $result_trees{'space_macro_after_end'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '   '
                   },
                   'type' => 'line_arg'
@@ -102,9 +104,11 @@ $result_trees{'space_macro_after_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/macro/space_macro_after_end_verbatim.pl 
b/tp/t/results/macro/space_macro_after_end_verbatim.pl
index be0854d733..d46393864a 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -31,7 +31,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'space_macro_after_end_verbatim'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -68,7 +70,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -90,7 +92,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -98,9 +100,11 @@ $result_trees{'space_macro_after_end_verbatim'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/macro/text_before_after.pl 
b/tp/t/results/macro/text_before_after.pl
index 50299badc2..68ec48471d 100644
--- a/tp/t/results/macro/text_before_after.pl
+++ b/tp/t/results/macro/text_before_after.pl
@@ -36,7 +36,7 @@ $result_trees{'text_before_after'} = {
                           'text' => 'macro after'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -45,9 +45,11 @@ $result_trees{'text_before_after'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro after'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
diff --git a/tp/t/results/macro/too_much_args.pl 
b/tp/t/results/macro/too_much_args.pl
index d3da5b243c..4496f3b1d1 100644
--- a/tp/t/results/macro/too_much_args.pl
+++ b/tp/t/results/macro/too_much_args.pl
@@ -44,7 +44,7 @@ $result_trees{'too_much_args'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -53,9 +53,11 @@ $result_trees{'too_much_args'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/macro/two_macros_on_a_line.pl 
b/tp/t/results/macro/two_macros_on_a_line.pl
index 9f3c53d04c..4e6da213fa 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -31,7 +31,7 @@ $result_trees{'two_macros_on_a_line'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'two_macros_on_a_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -101,7 +103,7 @@ $result_trees{'two_macros_on_a_line'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -110,9 +112,11 @@ $result_trees{'two_macros_on_a_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
diff --git a/tp/t/results/macro/unknown_macro_on_line_command.pl 
b/tp/t/results/macro/unknown_macro_on_line_command.pl
index 04344fbdfb..1539fb6c4a 100644
--- a/tp/t/results/macro/unknown_macro_on_line_command.pl
+++ b/tp/t/results/macro/unknown_macro_on_line_command.pl
@@ -22,9 +22,11 @@ $result_trees{'unknown_macro_on_line_command'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'file'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/macro/zero_argument.pl 
b/tp/t/results/macro/zero_argument.pl
index 162fe23336..5b291bdeb2 100644
--- a/tp/t/results/macro/zero_argument.pl
+++ b/tp/t/results/macro/zero_argument.pl
@@ -31,7 +31,7 @@ $result_trees{'zero_argument'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'zero_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -92,9 +94,11 @@ $result_trees{'zero_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/menu/bad_beginning.pl 
b/tp/t/results/menu/bad_beginning.pl
index 513b3b03e4..28eb6c30e9 100644
--- a/tp/t/results/menu/bad_beginning.pl
+++ b/tp/t/results/menu/bad_beginning.pl
@@ -12,7 +12,7 @@ $result_trees{'bad_beginning'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -81,9 +81,11 @@ $result_trees{'bad_beginning'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl 
b/tp/t/results/menu/block_commands_in_menu_description.pl
index fedf994e02..765235cd34 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -18,7 +18,7 @@ $result_trees{'block_commands_in_menu_description'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'block_commands_in_menu_description'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'block_commands_in_menu_description'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'block_commands_in_menu_description'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -125,7 +127,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                               'type' => 'command_as_argument_inserted'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -188,7 +190,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                                   'text' => 'itemize'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -197,9 +199,11 @@ $result_trees{'block_commands_in_menu_description'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'itemize'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 10,
@@ -230,7 +234,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                               'type' => 'command_as_argument'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -266,7 +270,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                                           'text' => 'table item'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -274,7 +278,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                                     }
                                   ],
                                   'cmdname' => 'item',
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'source_info' => {
@@ -321,7 +325,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                                   'text' => 'table'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -330,9 +334,11 @@ $result_trees{'block_commands_in_menu_description'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'table'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 17,
@@ -341,7 +347,9 @@ $result_trees{'block_commands_in_menu_description'} = {
                         }
                       ],
                       'extra' => {
-                        'command_as_argument' => {},
+                        'command_as_argument' => {}
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -355,7 +363,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -391,7 +399,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                                       'text' => 'html'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -400,9 +408,11 @@ $result_trees{'block_commands_in_menu_description'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'html'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 22,
@@ -422,7 +432,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -444,7 +454,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                                   'text' => 'verbatim'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -453,9 +463,11 @@ $result_trees{'block_commands_in_menu_description'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'verbatim'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 25,
@@ -496,7 +508,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -505,9 +517,11 @@ $result_trees{'block_commands_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -522,7 +536,8 @@ $result_trees{'block_commands_in_menu_description'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -596,9 +611,11 @@ $result_sectioning{'block_commands_in_menu_description'} = 
{
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -616,6 +633,7 @@ $result_nodes{'block_commands_in_menu_description'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -625,6 +643,7 @@ $result_nodes{'block_commands_in_menu_description'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -645,6 +664,7 @@ $result_menus{'block_commands_in_menu_description'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index f213722c7f..2c6bfd4a15 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -18,7 +18,7 @@ $result_trees{'comment_on_menu_line'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -115,7 +115,7 @@ $result_trees{'comment_on_menu_line'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -124,9 +124,11 @@ $result_trees{'comment_on_menu_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -134,7 +136,7 @@ $result_trees{'comment_on_menu_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
@@ -161,7 +163,9 @@ $result_trees{'comment_on_menu_line'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -178,7 +182,7 @@ $result_trees{'comment_on_menu_line'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -186,7 +190,8 @@ $result_trees{'comment_on_menu_line'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -203,7 +208,7 @@ $result_trees{'comment_on_menu_line'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -223,7 +228,9 @@ $result_trees{'comment_on_menu_line'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -271,9 +278,11 @@ $result_sectioning{'comment_on_menu_line'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -292,6 +301,7 @@ $result_nodes{'comment_on_menu_line'} = {
     'associated_section' => {
       'cmdname' => 'chapter',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'section_number' => 1
       }
@@ -299,17 +309,19 @@ $result_nodes{'comment_on_menu_line'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {}
+        'info' => {}
       }
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -327,12 +339,14 @@ $result_menus{'comment_on_menu_line'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/menu/dash_in_menu.pl 
b/tp/t/results/menu/dash_in_menu.pl
index ee945310d1..b6739bce86 100644
--- a/tp/t/results/menu/dash_in_menu.pl
+++ b/tp/t/results/menu/dash_in_menu.pl
@@ -17,7 +17,7 @@ $result_trees{'dash_in_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -127,7 +127,7 @@ $result_trees{'dash_in_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -136,9 +136,11 @@ $result_trees{'dash_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/menu/detailmenu.pl b/tp/t/results/menu/detailmenu.pl
index f472cac863..dc9d3de9fc 100644
--- a/tp/t/results/menu/detailmenu.pl
+++ b/tp/t/results/menu/detailmenu.pl
@@ -17,7 +17,7 @@ $result_trees{'detailmenu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -93,7 +93,7 @@ $result_trees{'detailmenu'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -159,7 +159,7 @@ $result_trees{'detailmenu'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -168,9 +168,11 @@ $result_trees{'detailmenu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -192,7 +194,7 @@ $result_trees{'detailmenu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -201,9 +203,11 @@ $result_trees{'detailmenu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/menu/detailmenu_in_description.pl 
b/tp/t/results/menu/detailmenu_in_description.pl
index 21aece924b..f72c6ff062 100644
--- a/tp/t/results/menu/detailmenu_in_description.pl
+++ b/tp/t/results/menu/detailmenu_in_description.pl
@@ -17,7 +17,7 @@ $result_trees{'detailmenu_in_description'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -78,7 +78,7 @@ $result_trees{'detailmenu_in_description'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -144,7 +144,7 @@ $result_trees{'detailmenu_in_description'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -153,9 +153,11 @@ $result_trees{'detailmenu_in_description'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
@@ -177,7 +179,7 @@ $result_trees{'detailmenu_in_description'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -186,9 +188,11 @@ $result_trees{'detailmenu_in_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index b9c4b9f06a..35a64eafe1 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -18,7 +18,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'detailmenu_on_subnodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -197,7 +199,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -263,7 +265,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -272,9 +274,11 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 10,
@@ -306,7 +310,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -440,7 +444,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -449,9 +453,11 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 17,
@@ -473,7 +479,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -482,9 +488,11 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -504,7 +512,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -521,7 +530,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -541,7 +550,9 @@ $result_trees{'detailmenu_on_subnodes'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -558,7 +569,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -575,7 +586,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -641,7 +652,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -650,9 +661,11 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -672,7 +685,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -689,7 +703,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -709,7 +723,9 @@ $result_trees{'detailmenu_on_subnodes'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -726,7 +742,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -741,7 +757,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -758,7 +775,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -778,7 +795,9 @@ $result_trees{'detailmenu_on_subnodes'} = {
             'normalized' => 'chapter-2'
           }
         ],
-        'normalized' => 'chapter-2',
+        'normalized' => 'chapter-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -795,7 +814,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -812,7 +831,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -927,7 +946,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -936,9 +955,11 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -958,7 +979,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -975,7 +997,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'section chap 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -995,7 +1017,9 @@ $result_trees{'detailmenu_on_subnodes'} = {
             'normalized' => 'section-chap-2'
           }
         ],
-        'normalized' => 'section-chap-2',
+        'normalized' => 'section-chap-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1012,7 +1036,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'section chap 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1027,7 +1051,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1044,7 +1069,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'unnumberedsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1064,7 +1089,9 @@ $result_trees{'detailmenu_on_subnodes'} = {
             'normalized' => 'unnumberedsec'
           }
         ],
-        'normalized' => 'unnumberedsec',
+        'normalized' => 'unnumberedsec'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1081,7 +1108,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
               'text' => 'unnumberedsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1089,7 +1116,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
         }
       ],
       'cmdname' => 'unnumberedsec',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1220,9 +1248,11 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1233,9 +1263,11 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1246,9 +1278,11 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -1271,9 +1305,11 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                   'extra' => {
                     'normalized' => 'chapter-2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1284,9 +1320,11 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                         'extra' => {
                           'normalized' => 'section-chap-2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.1',
@@ -1301,9 +1339,11 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_prev' => {},
@@ -1347,6 +1387,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1356,6 +1397,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1363,6 +1405,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1374,6 +1417,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1381,12 +1425,14 @@ $result_nodes{'detailmenu_on_subnodes'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
             },
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -1397,6 +1443,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
@@ -1408,6 +1455,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
             ],
             'normalized' => 'chapter-2'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1415,12 +1463,14 @@ $result_nodes{'detailmenu_on_subnodes'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '2.1'
                   }
                 },
                 'normalized' => 'section-chap-2'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -1428,10 +1478,12 @@ $result_nodes{'detailmenu_on_subnodes'} = {
                     'associated_section' => {
                       'cmdname' => 'unnumberedsec',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {}
                     },
                     'normalized' => 'unnumberedsec'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -1466,18 +1518,21 @@ $result_menus{'detailmenu_on_subnodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
@@ -1490,18 +1545,21 @@ $result_menus{'detailmenu_on_subnodes'} = {
           'extra' => {
             'normalized' => 'chapter-2'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'section-chap-2'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'unnumberedsec'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 2ee0cd654e..785fab24b4 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -18,7 +18,7 @@ $result_trees{'detailmenu_unknown_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'detailmenu_unknown_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -47,7 +47,7 @@ $result_trees{'detailmenu_unknown_node'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -113,7 +113,7 @@ $result_trees{'detailmenu_unknown_node'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -122,9 +122,11 @@ $result_trees{'detailmenu_unknown_node'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
@@ -146,7 +148,7 @@ $result_trees{'detailmenu_unknown_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -155,9 +157,11 @@ $result_trees{'detailmenu_unknown_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -184,7 +188,9 @@ $result_trees{'detailmenu_unknown_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -224,14 +230,16 @@ $result_nodes{'detailmenu_unknown_node'} = {
       }
     ],
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'detailmenu_unknown_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'detailmenu_unknown_node'} = [
diff --git a/tp/t/results/menu/direntry_dircategory_after_first_node.pl 
b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
index 917d1154bc..82436ac892 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -18,7 +18,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
               'text' => 'direntry direcategory after first node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -77,7 +79,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
                   'text' => 'Cat'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -85,7 +87,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
             }
           ],
           'cmdname' => 'dircategory',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -97,7 +99,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -181,7 +183,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
                       'text' => 'direntry'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -190,9 +192,11 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -207,7 +211,8 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -251,9 +256,11 @@ 
$result_sectioning{'direntry_dircategory_after_first_node'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -271,17 +278,20 @@ $result_nodes{'direntry_dircategory_after_first_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'direntry_dircategory_after_first_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'direntry_dircategory_after_first_node'} = [
diff --git a/tp/t/results/menu/empty_menu_description.pl 
b/tp/t/results/menu/empty_menu_description.pl
index 75d147e3b9..fe8260370b 100644
--- a/tp/t/results/menu/empty_menu_description.pl
+++ b/tp/t/results/menu/empty_menu_description.pl
@@ -18,7 +18,7 @@ $result_trees{'empty_menu_description'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'empty_menu_description'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -132,7 +132,7 @@ $result_trees{'empty_menu_description'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -141,9 +141,11 @@ $result_trees{'empty_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -170,7 +172,9 @@ $result_trees{'empty_menu_description'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -214,6 +218,7 @@ $result_nodes{'empty_menu_description'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -235,6 +240,7 @@ $result_menus{'empty_menu_description'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/menu/empty_menu_entry_name.pl 
b/tp/t/results/menu/empty_menu_entry_name.pl
index 88e6107230..76c861e7a8 100644
--- a/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/tp/t/results/menu/empty_menu_entry_name.pl
@@ -18,7 +18,7 @@ $result_trees{'empty_menu_entry_name'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'empty_menu_entry_name'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -171,7 +171,7 @@ $result_trees{'empty_menu_entry_name'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -180,9 +180,11 @@ $result_trees{'empty_menu_entry_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -214,7 +216,9 @@ $result_trees{'empty_menu_entry_name'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -231,7 +235,7 @@ $result_trees{'empty_menu_entry_name'} = {
               'text' => 'aaa'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -251,7 +255,9 @@ $result_trees{'empty_menu_entry_name'} = {
             'normalized' => 'aaa'
           }
         ],
-        'normalized' => 'aaa',
+        'normalized' => 'aaa'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -301,6 +307,7 @@ $result_nodes{'empty_menu_entry_name'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -321,6 +328,7 @@ $result_menus{'empty_menu_entry_name'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index 51be75b5c7..c05dc9675c 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -18,7 +18,7 @@ $result_trees{'entry_after_detailmenu'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'entry_after_detailmenu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -47,7 +47,7 @@ $result_trees{'entry_after_detailmenu'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -113,7 +113,7 @@ $result_trees{'entry_after_detailmenu'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -122,9 +122,11 @@ $result_trees{'entry_after_detailmenu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
@@ -229,7 +231,7 @@ $result_trees{'entry_after_detailmenu'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -295,7 +297,7 @@ $result_trees{'entry_after_detailmenu'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -304,9 +306,11 @@ $result_trees{'entry_after_detailmenu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 14,
@@ -377,7 +381,7 @@ $result_trees{'entry_after_detailmenu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -386,9 +390,11 @@ $result_trees{'entry_after_detailmenu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -420,7 +426,9 @@ $result_trees{'entry_after_detailmenu'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -437,7 +445,7 @@ $result_trees{'entry_after_detailmenu'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -457,7 +465,9 @@ $result_trees{'entry_after_detailmenu'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -474,7 +484,7 @@ $result_trees{'entry_after_detailmenu'} = {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -494,7 +504,9 @@ $result_trees{'entry_after_detailmenu'} = {
             'normalized' => 'second'
           }
         ],
-        'normalized' => 'second',
+        'normalized' => 'second'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -565,18 +577,21 @@ $result_nodes{'entry_after_detailmenu'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -600,18 +615,21 @@ $result_menus{'entry_after_detailmenu'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/menu/example_in_menu_comment.pl 
b/tp/t/results/menu/example_in_menu_comment.pl
index 542ec46422..f4aed7bfe8 100644
--- a/tp/t/results/menu/example_in_menu_comment.pl
+++ b/tp/t/results/menu/example_in_menu_comment.pl
@@ -12,7 +12,7 @@ $result_trees{'example_in_menu_comment'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -85,7 +85,7 @@ $result_trees{'example_in_menu_comment'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -120,7 +120,7 @@ $result_trees{'example_in_menu_comment'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -129,9 +129,11 @@ $result_trees{'example_in_menu_comment'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 8,
@@ -175,7 +177,7 @@ $result_trees{'example_in_menu_comment'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -184,9 +186,11 @@ $result_trees{'example_in_menu_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 14eb1833d9..0eddbe403c 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -18,7 +18,7 @@ $result_trees{'example_in_menu_description'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'example_in_menu_description'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'example_in_menu_description'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'example_in_menu_description'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -119,7 +121,7 @@ $result_trees{'example_in_menu_description'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -154,7 +156,7 @@ $result_trees{'example_in_menu_description'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -163,9 +165,11 @@ $result_trees{'example_in_menu_description'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 10,
@@ -221,7 +225,7 @@ $result_trees{'example_in_menu_description'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -230,9 +234,11 @@ $result_trees{'example_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -247,7 +253,8 @@ $result_trees{'example_in_menu_description'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -300,9 +307,11 @@ $result_sectioning{'example_in_menu_description'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -320,6 +329,7 @@ $result_nodes{'example_in_menu_description'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -329,6 +339,7 @@ $result_nodes{'example_in_menu_description'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -349,6 +360,7 @@ $result_menus{'example_in_menu_description'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index 8110617eed..e5bbb662cc 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -18,7 +18,7 @@ $result_trees{'formats_in_menu'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'formats_in_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -93,7 +93,7 @@ $result_trees{'formats_in_menu'} = {
                               'type' => 'command_as_argument'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -114,7 +114,7 @@ $result_trees{'formats_in_menu'} = {
                                           'text' => 'item'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -122,7 +122,7 @@ $result_trees{'formats_in_menu'} = {
                                     }
                                   ],
                                   'cmdname' => 'item',
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'source_info' => {
@@ -159,7 +159,7 @@ $result_trees{'formats_in_menu'} = {
                                   'text' => 'table'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -168,9 +168,11 @@ $result_trees{'formats_in_menu'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'table'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 8,
@@ -179,7 +181,9 @@ $result_trees{'formats_in_menu'} = {
                         }
                       ],
                       'extra' => {
-                        'command_as_argument' => {},
+                        'command_as_argument' => {}
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -260,7 +264,7 @@ $result_trees{'formats_in_menu'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -287,7 +291,7 @@ $result_trees{'formats_in_menu'} = {
                                   'text' => 'verbatim'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -296,9 +300,11 @@ $result_trees{'formats_in_menu'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'verbatim'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 14,
@@ -369,7 +375,7 @@ $result_trees{'formats_in_menu'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -400,7 +406,7 @@ $result_trees{'formats_in_menu'} = {
                                       'text' => 'html'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -409,9 +415,11 @@ $result_trees{'formats_in_menu'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'html'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 19,
@@ -542,7 +550,7 @@ $result_trees{'formats_in_menu'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -572,7 +580,7 @@ $result_trees{'formats_in_menu'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -581,9 +589,11 @@ $result_trees{'formats_in_menu'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 27,
@@ -618,7 +628,7 @@ $result_trees{'formats_in_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -627,9 +637,11 @@ $result_trees{'formats_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -656,7 +668,9 @@ $result_trees{'formats_in_menu'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -740,6 +754,7 @@ $result_nodes{'formats_in_menu'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -760,6 +775,7 @@ $result_menus{'formats_in_menu'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index 2a742e020d..12a490c366 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -18,7 +18,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'inlineraw_in_menu_description'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -138,7 +140,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
                                   'text' => 'end inlineraw'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'type' => 'brace_command_arg'
@@ -204,7 +206,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -213,9 +215,11 @@ $result_trees{'inlineraw_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -230,7 +234,8 @@ $result_trees{'inlineraw_in_menu_description'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -279,9 +284,11 @@ $result_sectioning{'inlineraw_in_menu_description'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -299,6 +306,7 @@ $result_nodes{'inlineraw_in_menu_description'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -308,6 +316,7 @@ $result_nodes{'inlineraw_in_menu_description'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -328,6 +337,7 @@ $result_menus{'inlineraw_in_menu_description'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index 5b9ecf4d24..b4acacb769 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -18,7 +18,7 @@ $result_trees{'invalid_info_menu_entry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'invalid_info_menu_entry'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -484,7 +484,7 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -493,9 +493,11 @@ $result_trees{'invalid_info_menu_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -522,7 +524,9 @@ $result_trees{'invalid_info_menu_entry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -586,6 +590,7 @@ $result_nodes{'invalid_info_menu_entry'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -607,6 +612,7 @@ $result_menus{'invalid_info_menu_entry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/menu/menu_entry_name.pl 
b/tp/t/results/menu/menu_entry_name.pl
index c36756a874..d7b01fbcc4 100644
--- a/tp/t/results/menu/menu_entry_name.pl
+++ b/tp/t/results/menu/menu_entry_name.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_entry_name'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -768,7 +768,7 @@ $result_trees{'menu_entry_name'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -777,9 +777,11 @@ $result_trees{'menu_entry_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
diff --git a/tp/t/results/menu/menu_entry_name_comment.pl 
b/tp/t/results/menu/menu_entry_name_comment.pl
index b6b9136814..0cb1bf2efc 100644
--- a/tp/t/results/menu/menu_entry_name_comment.pl
+++ b/tp/t/results/menu/menu_entry_name_comment.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_entry_name_comment'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -459,7 +459,7 @@ $result_trees{'menu_entry_name_comment'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -468,9 +468,11 @@ $result_trees{'menu_entry_name_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/menu/menu_entry_no_entry.pl 
b/tp/t/results/menu/menu_entry_no_entry.pl
index df68b31166..40a7a58b2a 100644
--- a/tp/t/results/menu/menu_entry_no_entry.pl
+++ b/tp/t/results/menu/menu_entry_no_entry.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_entry_no_entry'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -150,7 +150,7 @@ $result_trees{'menu_entry_no_entry'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -159,9 +159,11 @@ $result_trees{'menu_entry_no_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/menu/menu_entry_no_entry_location.pl 
b/tp/t/results/menu/menu_entry_no_entry_location.pl
index d25d00b9b6..f9e7a1920f 100644
--- a/tp/t/results/menu/menu_entry_no_entry_location.pl
+++ b/tp/t/results/menu/menu_entry_no_entry_location.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_entry_no_entry_location'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -207,7 +207,7 @@ $result_trees{'menu_entry_no_entry_location'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -216,9 +216,11 @@ $result_trees{'menu_entry_no_entry_location'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
diff --git a/tp/t/results/menu/menu_entry_node.pl 
b/tp/t/results/menu/menu_entry_node.pl
index 8593560c3f..166d3dd4e8 100644
--- a/tp/t/results/menu/menu_entry_node.pl
+++ b/tp/t/results/menu/menu_entry_node.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_entry_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -281,7 +281,7 @@ $result_trees{'menu_entry_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -290,9 +290,11 @@ $result_trees{'menu_entry_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/menu/menu_entry_node_comments.pl 
b/tp/t/results/menu/menu_entry_node_comments.pl
index f2c50858ff..723ae17557 100644
--- a/tp/t/results/menu/menu_entry_node_comments.pl
+++ b/tp/t/results/menu/menu_entry_node_comments.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_entry_node_comments'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -332,7 +332,7 @@ $result_trees{'menu_entry_node_comments'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -341,9 +341,11 @@ $result_trees{'menu_entry_node_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index 1765372d87..07a3746ff1 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -18,7 +18,7 @@ $result_trees{'menu_in_deffn'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -119,7 +119,7 @@ $result_trees{'menu_in_deffn'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -190,7 +190,7 @@ $result_trees{'menu_in_deffn'} = {
                               'text' => 'menu'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -199,9 +199,11 @@ $result_trees{'menu_in_deffn'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 6,
@@ -226,7 +228,7 @@ $result_trees{'menu_in_deffn'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -235,9 +237,11 @@ $result_trees{'menu_in_deffn'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -245,7 +249,7 @@ $result_trees{'menu_in_deffn'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -267,7 +271,9 @@ $result_trees{'menu_in_deffn'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -309,14 +315,16 @@ $result_nodes{'menu_in_deffn'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'menu_in_deffn'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'menu_in_deffn'} = [
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index 8aa5c50e7f..46aa8a57ab 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -18,7 +18,7 @@ $result_trees{'menu_in_example'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'menu_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -47,7 +47,7 @@ $result_trees{'menu_in_example'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -94,7 +94,7 @@ $result_trees{'menu_in_example'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -120,7 +120,7 @@ $result_trees{'menu_in_example'} = {
                                       'text' => 'cartouche'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -129,9 +129,11 @@ $result_trees{'menu_in_example'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'cartouche'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 8,
@@ -179,7 +181,7 @@ $result_trees{'menu_in_example'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -205,7 +207,7 @@ $result_trees{'menu_in_example'} = {
                                   'text' => 'cartouche'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -214,9 +216,11 @@ $result_trees{'menu_in_example'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'cartouche'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 12,
@@ -392,7 +396,7 @@ $result_trees{'menu_in_example'} = {
                           'text' => 'menu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -401,9 +405,11 @@ $result_trees{'menu_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 16,
@@ -425,7 +431,7 @@ $result_trees{'menu_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -434,9 +440,11 @@ $result_trees{'menu_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -463,7 +471,9 @@ $result_trees{'menu_in_example'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -521,14 +531,16 @@ $result_nodes{'menu_in_example'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'menu_in_example'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'menu_in_example'} = [
diff --git a/tp/t/results/menu/menu_no_closed_after_empty_line.pl 
b/tp/t/results/menu/menu_no_closed_after_empty_line.pl
index f099d65a3e..dfcc95ab5b 100644
--- a/tp/t/results/menu/menu_no_closed_after_empty_line.pl
+++ b/tp/t/results/menu/menu_no_closed_after_empty_line.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_no_closed_after_empty_line'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/menu/menu_no_closed_entry_beginning.pl 
b/tp/t/results/menu/menu_no_closed_entry_beginning.pl
index 9ce680ffe9..20439b6155 100644
--- a/tp/t/results/menu/menu_no_closed_entry_beginning.pl
+++ b/tp/t/results/menu/menu_no_closed_entry_beginning.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_no_closed_entry_beginning'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/menu/menu_no_closed_in_description.pl 
b/tp/t/results/menu/menu_no_closed_in_description.pl
index b4db97219c..1819ba9391 100644
--- a/tp/t/results/menu/menu_no_closed_in_description.pl
+++ b/tp/t/results/menu/menu_no_closed_in_description.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_no_closed_in_description'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/menu/menu_no_closed_in_entry.pl 
b/tp/t/results/menu/menu_no_closed_in_entry.pl
index 21c5ae7def..fac11d278e 100644
--- a/tp/t/results/menu/menu_no_closed_in_entry.pl
+++ b/tp/t/results/menu/menu_no_closed_in_entry.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_no_closed_in_entry'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/menu/menu_no_closed_star.pl 
b/tp/t/results/menu/menu_no_closed_star.pl
index 1da237a4b7..7a52e7215f 100644
--- a/tp/t/results/menu/menu_no_closed_star.pl
+++ b/tp/t/results/menu/menu_no_closed_star.pl
@@ -12,7 +12,7 @@ $result_trees{'menu_no_closed_star'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/menu/menu_node_unterminated.pl 
b/tp/t/results/menu/menu_node_unterminated.pl
index b5421f8fea..3159fb82cf 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -18,7 +18,7 @@ $result_trees{'menu_node_unterminated'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'menu_node_unterminated'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -105,7 +105,7 @@ $result_trees{'menu_node_unterminated'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -114,9 +114,11 @@ $result_trees{'menu_node_unterminated'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -143,7 +145,9 @@ $result_trees{'menu_node_unterminated'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -183,14 +187,16 @@ $result_nodes{'menu_node_unterminated'} = {
       }
     ],
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'menu_node_unterminated'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'menu_node_unterminated'} = [
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index 53a35616c9..f231892a3b 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -18,7 +18,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'menu_pointing_to_anchor'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +122,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -186,7 +188,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -195,9 +197,11 @@ $result_trees{'menu_pointing_to_anchor'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -212,7 +216,8 @@ $result_trees{'menu_pointing_to_anchor'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -263,9 +268,11 @@ $result_sectioning{'menu_pointing_to_anchor'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -283,6 +290,7 @@ $result_nodes{'menu_pointing_to_anchor'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -292,6 +300,7 @@ $result_nodes{'menu_pointing_to_anchor'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'anchor',
@@ -313,6 +322,7 @@ $result_menus{'menu_pointing_to_anchor'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'anchor',
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index 40390ebb70..41ff865e34 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -18,7 +18,7 @@ $result_trees{'menu_title_before_entries'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'menu_title_before_entries'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -115,7 +115,7 @@ $result_trees{'menu_title_before_entries'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -124,9 +124,11 @@ $result_trees{'menu_title_before_entries'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -158,7 +160,9 @@ $result_trees{'menu_title_before_entries'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -175,7 +179,7 @@ $result_trees{'menu_title_before_entries'} = {
               'text' => 'subnode'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -195,7 +199,9 @@ $result_trees{'menu_title_before_entries'} = {
             'normalized' => 'subnode'
           }
         ],
-        'normalized' => 'subnode',
+        'normalized' => 'subnode'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -241,12 +247,14 @@ $result_nodes{'menu_title_before_entries'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'subnode'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -264,12 +272,14 @@ $result_menus{'menu_title_before_entries'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'subnode'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl 
b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
index b1cda6054e..0c3b37b27a 100644
--- a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
@@ -18,7 +18,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -373,7 +375,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -382,9 +384,11 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -404,7 +408,8 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -421,7 +426,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -441,7 +446,9 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -458,7 +465,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -475,7 +482,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -541,7 +548,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -550,9 +557,11 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -572,7 +581,8 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -589,7 +599,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -609,7 +619,9 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -626,7 +638,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -641,7 +653,8 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -658,7 +671,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -678,7 +691,9 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
             'normalized' => 'chapter-2'
           }
         ],
-        'normalized' => 'chapter-2',
+        'normalized' => 'chapter-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -695,7 +710,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -712,7 +727,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -827,7 +842,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -836,9 +851,11 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -858,7 +875,8 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -875,7 +893,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'section chap 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -895,7 +913,9 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
             'normalized' => 'section-chap-2'
           }
         ],
-        'normalized' => 'section-chap-2',
+        'normalized' => 'section-chap-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -912,7 +932,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'section chap 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -927,7 +947,8 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -944,7 +965,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'unnumberedsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -964,7 +985,9 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
             'normalized' => 'unnumberedsec'
           }
         ],
-        'normalized' => 'unnumberedsec',
+        'normalized' => 'unnumberedsec'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -981,7 +1004,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               'text' => 'unnumberedsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -989,7 +1012,8 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
         }
       ],
       'cmdname' => 'unnumberedsec',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1116,9 +1140,11 @@ $result_sectioning{'missing_detailmenu_on_subnodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1129,9 +1155,11 @@ $result_sectioning{'missing_detailmenu_on_subnodes'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1142,9 +1170,11 @@ $result_sectioning{'missing_detailmenu_on_subnodes'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -1167,9 +1197,11 @@ $result_sectioning{'missing_detailmenu_on_subnodes'} = {
                   'extra' => {
                     'normalized' => 'chapter-2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1180,9 +1212,11 @@ $result_sectioning{'missing_detailmenu_on_subnodes'} = {
                         'extra' => {
                           'normalized' => 'section-chap-2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.1',
@@ -1197,9 +1231,11 @@ $result_sectioning{'missing_detailmenu_on_subnodes'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_prev' => {},
@@ -1243,6 +1279,7 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1252,6 +1289,7 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1259,6 +1297,7 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1270,6 +1309,7 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1277,12 +1317,14 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
             },
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1290,12 +1332,14 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '2.1'
                   }
                 },
                 'normalized' => 'section-chap-2'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -1303,10 +1347,12 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
                     'associated_section' => {
                       'cmdname' => 'unnumberedsec',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {}
                     },
                     'normalized' => 'unnumberedsec'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {
@@ -1315,6 +1361,7 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_number' => 2
                           }
@@ -1326,6 +1373,7 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
                         ],
                         'normalized' => 'chapter-2'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {},
                         'node_next' => {},
@@ -1370,30 +1418,35 @@ $result_menus{'missing_detailmenu_on_subnodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'section-chap-2'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'unnumberedsec'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {
@@ -1401,6 +1454,7 @@ $result_menus{'missing_detailmenu_on_subnodes'} = {
                       'extra' => {
                         'normalized' => 'chapter-2'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {},
                         'menu_next' => {},
diff --git a/tp/t/results/menu/multiple_menus.pl 
b/tp/t/results/menu/multiple_menus.pl
index 4f6ec67fc1..80dc05ecd1 100644
--- a/tp/t/results/menu/multiple_menus.pl
+++ b/tp/t/results/menu/multiple_menus.pl
@@ -18,7 +18,7 @@ $result_trees{'multiple_menus'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'multiple_menus'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -113,7 +113,7 @@ $result_trees{'multiple_menus'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -122,9 +122,11 @@ $result_trees{'multiple_menus'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -146,7 +148,7 @@ $result_trees{'multiple_menus'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -224,7 +226,7 @@ $result_trees{'multiple_menus'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -233,9 +235,11 @@ $result_trees{'multiple_menus'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -262,7 +266,9 @@ $result_trees{'multiple_menus'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -314,6 +320,7 @@ $result_nodes{'multiple_menus'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -335,6 +342,7 @@ $result_menus{'multiple_menus'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/menu/no_colon_in_menu.pl 
b/tp/t/results/menu/no_colon_in_menu.pl
index 18e617d135..44396b97eb 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -18,7 +18,7 @@ $result_trees{'no_colon_in_menu'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'no_colon_in_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -66,7 +66,7 @@ $result_trees{'no_colon_in_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -75,9 +75,11 @@ $result_trees{'no_colon_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -104,7 +106,9 @@ $result_trees{'no_colon_in_menu'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -140,14 +144,16 @@ $result_nodes{'no_colon_in_menu'} = {
       }
     ],
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'no_colon_in_menu'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'no_colon_in_menu'} = [];
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index 96d6a50623..d26345f72b 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -25,7 +25,7 @@ $result_trees{'reference_to_external_manual'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -42,7 +42,7 @@ $result_trees{'reference_to_external_manual'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -113,7 +113,7 @@ $result_trees{'reference_to_external_manual'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -122,9 +122,11 @@ $result_trees{'reference_to_external_manual'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -151,7 +153,9 @@ $result_trees{'reference_to_external_manual'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -192,6 +196,7 @@ $result_nodes{'reference_to_external_manual'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -212,6 +217,7 @@ $result_menus{'reference_to_external_manual'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index e6773fd50c..abed91af5f 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -25,7 +25,7 @@ $result_trees{'sc_in_menu'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -42,7 +42,7 @@ $result_trees{'sc_in_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -203,7 +203,7 @@ $result_trees{'sc_in_menu'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -319,7 +319,7 @@ $result_trees{'sc_in_menu'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -328,9 +328,11 @@ $result_trees{'sc_in_menu'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 13,
@@ -355,7 +357,7 @@ $result_trees{'sc_in_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -364,9 +366,11 @@ $result_trees{'sc_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -398,7 +402,9 @@ $result_trees{'sc_in_menu'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -430,7 +436,7 @@ $result_trees{'sc_in_menu'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -447,7 +453,7 @@ $result_trees{'sc_in_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -459,7 +465,7 @@ $result_trees{'sc_in_menu'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -635,7 +641,7 @@ $result_trees{'sc_in_menu'} = {
                           'text' => 'menu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -644,9 +650,11 @@ $result_trees{'sc_in_menu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 23,
@@ -668,7 +676,7 @@ $result_trees{'sc_in_menu'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -677,9 +685,11 @@ $result_trees{'sc_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -711,7 +721,9 @@ $result_trees{'sc_in_menu'} = {
             'normalized' => 'NODE'
           }
         ],
-        'normalized' => 'NODE',
+        'normalized' => 'NODE'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -790,12 +802,14 @@ $result_nodes{'sc_in_menu'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'NODE'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -813,12 +827,14 @@ $result_menus{'sc_in_menu'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'NODE'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/menu/simple.pl b/tp/t/results/menu/simple.pl
index c722845894..6c9a916c51 100644
--- a/tp/t/results/menu/simple.pl
+++ b/tp/t/results/menu/simple.pl
@@ -31,7 +31,7 @@ $result_trees{'simple'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -365,7 +365,7 @@ $result_trees{'simple'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -374,9 +374,11 @@ $result_trees{'simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
diff --git a/tp/t/results/menu/simple_no_menu.pl 
b/tp/t/results/menu/simple_no_menu.pl
index 2462caf2b8..123bf2c6ba 100644
--- a/tp/t/results/menu/simple_no_menu.pl
+++ b/tp/t/results/menu/simple_no_menu.pl
@@ -31,7 +31,7 @@ $result_trees{'simple_no_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -365,7 +365,7 @@ $result_trees{'simple_no_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -374,9 +374,11 @@ $result_trees{'simple_no_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
diff --git a/tp/t/results/menu/space_and_commands_in_menu_node.pl 
b/tp/t/results/menu/space_and_commands_in_menu_node.pl
index bf4800f7b9..c46c19cf4f 100644
--- a/tp/t/results/menu/space_and_commands_in_menu_node.pl
+++ b/tp/t/results/menu/space_and_commands_in_menu_node.pl
@@ -18,7 +18,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'space_and_commands_in_menu_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -625,7 +627,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -634,9 +636,11 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -656,7 +660,8 @@ $result_trees{'space_and_commands_in_menu_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -679,7 +684,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               'text' => ' b'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -703,7 +708,9 @@ $result_trees{'space_and_commands_in_menu_node'} = {
             'normalized' => 'chap-b'
           }
         ],
-        'normalized' => 'chap-b',
+        'normalized' => 'chap-b'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -720,7 +727,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -728,7 +735,8 @@ $result_trees{'space_and_commands_in_menu_node'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -832,9 +840,11 @@ $result_sectioning{'space_and_commands_in_menu_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -845,9 +855,11 @@ $result_sectioning{'space_and_commands_in_menu_node'} = {
                   'extra' => {
                     'normalized' => 'chap-b'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -876,6 +888,7 @@ $result_nodes{'space_and_commands_in_menu_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -885,6 +898,7 @@ $result_nodes{'space_and_commands_in_menu_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -892,12 +906,14 @@ $result_nodes{'space_and_commands_in_menu_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap-b'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {},
         'node_prev' => {},
@@ -917,12 +933,14 @@ $result_menus{'space_and_commands_in_menu_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chap-b'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {},
         'menu_prev' => {},
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index 7e53cff262..0c79b205de 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -18,7 +18,7 @@ $result_trees{'submenu_in_example'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'submenu_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -66,7 +66,7 @@ $result_trees{'submenu_in_example'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -97,7 +97,7 @@ $result_trees{'submenu_in_example'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -114,7 +114,7 @@ $result_trees{'submenu_in_example'} = {
                               'text' => 'menu'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -123,9 +123,11 @@ $result_trees{'submenu_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 11,
@@ -157,7 +159,7 @@ $result_trees{'submenu_in_example'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -188,7 +190,7 @@ $result_trees{'submenu_in_example'} = {
                               'text' => 'menu'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -197,9 +199,11 @@ $result_trees{'submenu_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 15,
@@ -231,7 +235,7 @@ $result_trees{'submenu_in_example'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -245,7 +249,7 @@ $result_trees{'submenu_in_example'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -271,7 +275,7 @@ $result_trees{'submenu_in_example'} = {
                                       'text' => 'quotation'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -280,9 +284,11 @@ $result_trees{'submenu_in_example'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'quotation'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 20,
@@ -307,7 +313,7 @@ $result_trees{'submenu_in_example'} = {
                               'text' => 'menu'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -316,9 +322,11 @@ $result_trees{'submenu_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 21,
@@ -352,7 +360,7 @@ $result_trees{'submenu_in_example'} = {
                               'text' => 'subheading in menu'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -360,7 +368,7 @@ $result_trees{'submenu_in_example'} = {
                         }
                       ],
                       'cmdname' => 'subheading',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -382,7 +390,7 @@ $result_trees{'submenu_in_example'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -425,7 +433,7 @@ $result_trees{'submenu_in_example'} = {
                                   'text' => 'enumerate'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -434,9 +442,11 @@ $result_trees{'submenu_in_example'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'enumerate'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 27,
@@ -474,7 +484,7 @@ $result_trees{'submenu_in_example'} = {
                           'text' => 'menu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -483,9 +493,11 @@ $result_trees{'submenu_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 29,
@@ -507,7 +519,7 @@ $result_trees{'submenu_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -516,9 +528,11 @@ $result_trees{'submenu_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -545,7 +559,9 @@ $result_trees{'submenu_in_example'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -615,14 +631,16 @@ $result_nodes{'submenu_in_example'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'submenu_in_example'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'submenu_in_example'} = [
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index 77f538862c..1c96a4ee68 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -18,7 +18,7 @@ $result_trees{'verb_in_menu_description'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'verb_in_menu_description'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'verb_in_menu_description'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'verb_in_menu_description'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -190,7 +192,7 @@ $result_trees{'verb_in_menu_description'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -199,9 +201,11 @@ $result_trees{'verb_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -216,7 +220,8 @@ $result_trees{'verb_in_menu_description'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -267,9 +272,11 @@ $result_sectioning{'verb_in_menu_description'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -287,6 +294,7 @@ $result_nodes{'verb_in_menu_description'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -296,6 +304,7 @@ $result_nodes{'verb_in_menu_description'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -316,6 +325,7 @@ $result_menus{'verb_in_menu_description'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/misc_commands/also_not_line.pl 
b/tp/t/results/misc_commands/also_not_line.pl
index 1f7718066a..daa8ba166e 100644
--- a/tp/t/results/misc_commands/also_not_line.pl
+++ b/tp/t/results/misc_commands/also_not_line.pl
@@ -245,7 +245,7 @@ $result_trees{'also_not_line'} = {
                   'text' => 'special'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -253,7 +253,7 @@ $result_trees{'also_not_line'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -316,7 +316,7 @@ $result_trees{'also_not_line'} = {
                   'text' => 'line after exdent'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -324,7 +324,7 @@ $result_trees{'also_not_line'} = {
             }
           ],
           'cmdname' => 'exdent',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
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 2d7db811cd..a5fbfc31a7 100644
--- a/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
+++ b/tp/t/results/misc_commands/author_outside_titlepage_quotation.pl
@@ -17,7 +17,7 @@ $result_trees{'author_outside_titlepage_quotation'} = {
                   'text' => 'Some One'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -25,7 +25,7 @@ $result_trees{'author_outside_titlepage_quotation'} = {
             }
           ],
           'cmdname' => 'author',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/bad_documentlanguage.pl 
b/tp/t/results/misc_commands/bad_documentlanguage.pl
index ec6dc3e8de..58281a440a 100644
--- a/tp/t/results/misc_commands/bad_documentlanguage.pl
+++ b/tp/t/results/misc_commands/bad_documentlanguage.pl
@@ -27,7 +27,7 @@ $result_trees{'bad_documentlanguage'} = {
                       'text' => 'en'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -36,9 +36,11 @@ $result_trees{'bad_documentlanguage'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'en'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -68,7 +70,7 @@ $result_trees{'bad_documentlanguage'} = {
                           'text' => 'en'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '  
 '
                       },
@@ -77,9 +79,11 @@ $result_trees{'bad_documentlanguage'} = {
                   ],
                   'cmdname' => 'documentlanguage',
                   'extra' => {
-                    'spaces_before_argument' => '  ',
                     'text_arg' => 'en'
                   },
+                  'info' => {
+                    'spaces_before_argument' => '  '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -92,9 +96,11 @@ $result_trees{'bad_documentlanguage'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => '  ',
             'text_arg' => 'en '
           },
+          'info' => {
+            'spaces_before_argument' => '  '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 4,
@@ -114,7 +120,7 @@ $result_trees{'bad_documentlanguage'} = {
                   'text' => 'en  after documentlanguage'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -123,9 +129,11 @@ $result_trees{'bad_documentlanguage'} = {
           ],
           'cmdname' => 'documentlanguage',
           'extra' => {
-            'spaces_before_argument' => '  ',
             'text_arg' => 'en  after documentlanguage'
           },
+          'info' => {
+            'spaces_before_argument' => '  '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 6,
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 87bf5a4d49..d24e957f49 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -58,7 +58,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -67,9 +67,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 8,
@@ -194,7 +196,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -203,9 +205,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 28,
@@ -231,7 +235,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -499,7 +503,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -535,7 +539,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -544,9 +548,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 31,
@@ -563,7 +569,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -583,7 +589,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -859,7 +865,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -895,7 +901,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -904,9 +910,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 31,
@@ -928,7 +936,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'text' => 'off'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -939,7 +947,9 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'extra' => {
                     'misc_args' => [
                       'off'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -956,7 +966,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'text' => 'off'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -967,7 +977,9 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'extra' => {
                     'misc_args' => [
                       'off'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1235,7 +1247,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1244,9 +1256,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = 
{
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 32,
@@ -1263,7 +1277,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1304,7 +1318,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1313,9 +1327,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = 
{
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 36,
@@ -1353,7 +1369,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -1373,7 +1389,9 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1390,7 +1408,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               'text' => 'test quotes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1405,7 +1423,8 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1422,7 +1441,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1442,7 +1461,9 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1459,7 +1480,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1732,7 +1753,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1768,7 +1789,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1777,9 +1798,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 45,
@@ -1796,7 +1819,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1816,7 +1839,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2092,7 +2115,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2128,7 +2151,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2137,9 +2160,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 45,
@@ -2161,7 +2186,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2172,7 +2197,9 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2189,7 +2216,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2200,7 +2227,9 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2468,7 +2497,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2736,7 +2765,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2772,7 +2801,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2781,9 +2810,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = 
{
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 48,
@@ -2802,7 +2833,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2822,7 +2853,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -3096,7 +3127,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3132,7 +3163,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -3141,9 +3172,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = 
{
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 48,
@@ -3167,7 +3200,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'text' => 'off'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -3178,7 +3211,9 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'extra' => {
                     'misc_args' => [
                       'off'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -3195,7 +3230,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                           'text' => 'off'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -3206,7 +3241,9 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   'extra' => {
                     'misc_args' => [
                       'off'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -3472,7 +3509,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3481,9 +3518,11 @@ $result_trees{'codequoteundirected_codequotebacktick'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 49,
@@ -3503,7 +3542,8 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3775,9 +3815,11 @@ 
$result_sectioning{'codequoteundirected_codequotebacktick'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -3788,9 +3830,11 @@ 
$result_sectioning{'codequoteundirected_codequotebacktick'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -3819,10 +3863,12 @@ $result_nodes{'codequoteundirected_codequotebacktick'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -3830,12 +3876,14 @@ $result_nodes{'codequoteundirected_codequotebacktick'} 
= {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -3851,6 +3899,7 @@ $result_menus{'codequoteundirected_codequotebacktick'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/misc_commands/command_in_heading_footing.pl 
b/tp/t/results/misc_commands/command_in_heading_footing.pl
index 197b9227c0..531e2b31ee 100644
--- a/tp/t/results/misc_commands/command_in_heading_footing.pl
+++ b/tp/t/results/misc_commands/command_in_heading_footing.pl
@@ -26,7 +26,7 @@ $result_trees{'command_in_heading_footing'} = {
                   'cmdname' => 'thischapternum'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -34,7 +34,7 @@ $result_trees{'command_in_heading_footing'} = {
             }
           ],
           'cmdname' => 'everyheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/command_line_in_paragraph.pl 
b/tp/t/results/misc_commands/command_line_in_paragraph.pl
index 98d09462ce..18cd1e6739 100644
--- a/tp/t/results/misc_commands/command_line_in_paragraph.pl
+++ b/tp/t/results/misc_commands/command_line_in_paragraph.pl
@@ -23,7 +23,7 @@ $result_trees{'command_line_in_paragraph'} = {
                       'text' => 'en'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '  
 '
                   },
@@ -32,9 +32,11 @@ $result_trees{'command_line_in_paragraph'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'en'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
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 f2ea9c8dab..9890492404 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
@@ -32,7 +32,9 @@ $result_trees{'command_not_closed_in_documentencoding'} = {
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'missing_argument' => 1,
+            'missing_argument' => 1
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
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 f461e46d03..6d6a858fa2 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
@@ -42,7 +42,8 @@ $result_trees{'comment_space_command_on_line'} = {
             }
           ],
           'cmdname' => 'settitle',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -83,7 +84,9 @@ $result_trees{'comment_space_command_on_line'} = {
 '
                 ]
               }
-            },
+            }
+          },
+          'info' => {
             'spaces_after_argument' => '  '
           },
           'type' => 'line_arg'
@@ -102,7 +105,9 @@ $result_trees{'comment_space_command_on_line'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -138,7 +143,9 @@ $result_trees{'comment_space_command_on_line'} = {
 '
                 ]
               }
-            },
+            }
+          },
+          'info' => {
             'spaces_after_argument' => ' '
           },
           'type' => 'line_arg'
@@ -152,7 +159,8 @@ $result_trees{'comment_space_command_on_line'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -185,7 +193,9 @@ $result_trees{'comment_space_command_on_line'} = {
 '
                 ]
               }
-            },
+            }
+          },
+          'info' => {
             'spaces_after_argument' => ' '
           },
           'type' => 'line_arg'
@@ -205,7 +215,9 @@ $result_trees{'comment_space_command_on_line'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -241,7 +253,9 @@ $result_trees{'comment_space_command_on_line'} = {
 '
                 ]
               }
-            },
+            }
+          },
+          'info' => {
             'spaces_after_argument' => ' '
           },
           'type' => 'line_arg'
@@ -278,7 +292,9 @@ $result_trees{'comment_space_command_on_line'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -288,7 +304,9 @@ $result_trees{'comment_space_command_on_line'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -335,7 +353,9 @@ $result_trees{'comment_space_command_on_line'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -376,7 +396,9 @@ $result_trees{'comment_space_command_on_line'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -395,7 +417,9 @@ $result_trees{'comment_space_command_on_line'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -437,14 +461,17 @@ $result_trees{'comment_space_command_on_line'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => '    '
               },
               'type' => 'line_arg'
             }
           ],
           'cmdname' => 'heading',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -482,7 +509,9 @@ $result_trees{'comment_space_command_on_line'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -492,7 +521,9 @@ $result_trees{'comment_space_command_on_line'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -522,7 +553,7 @@ $result_trees{'comment_space_command_on_line'} = {
                   'text' => 'label'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -565,7 +596,9 @@ $result_trees{'comment_space_command_on_line'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -573,9 +606,11 @@ $result_trees{'comment_space_command_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -589,7 +624,6 @@ $result_trees{'comment_space_command_on_line'} = {
               {}
             ],
             'normalized' => 'label',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -597,6 +631,9 @@ $result_trees{'comment_space_command_on_line'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 19,
@@ -642,7 +679,6 @@ $result_trees{'comment_space_command_on_line'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {},
@@ -651,6 +687,9 @@ $result_trees{'comment_space_command_on_line'} = {
               'normalized' => 'Text @ '
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 23,
@@ -663,7 +702,8 @@ $result_trees{'comment_space_command_on_line'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -758,9 +798,11 @@ $result_sectioning{'comment_space_command_on_line'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -772,9 +814,11 @@ $result_sectioning{'comment_space_command_on_line'} = {
                     'isindex' => 1,
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -803,10 +847,12 @@ $result_nodes{'comment_space_command_on_line'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -814,6 +860,7 @@ $result_nodes{'comment_space_command_on_line'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -821,6 +868,7 @@ $result_nodes{'comment_space_command_on_line'} = {
         'isindex' => 1,
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -836,6 +884,7 @@ $result_menus{'comment_space_command_on_line'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
@@ -850,6 +899,7 @@ $result_floats{'comment_space_command_on_line'} = {
         'float_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -864,6 +914,7 @@ $result_floats{'comment_space_command_on_line'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
diff --git a/tp/t/results/misc_commands/defindex_too_much_args.pl 
b/tp/t/results/misc_commands/defindex_too_much_args.pl
index 054dd9ad84..63af1d85a2 100644
--- a/tp/t/results/misc_commands/defindex_too_much_args.pl
+++ b/tp/t/results/misc_commands/defindex_too_much_args.pl
@@ -21,7 +21,7 @@ $result_trees{'defindex_too_much_args'} = {
             }
           ],
           'cmdname' => 'defindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/definfoenclose.pl 
b/tp/t/results/misc_commands/definfoenclose.pl
index 7da8e491ec..593e136e72 100644
--- a/tp/t/results/misc_commands/definfoenclose.pl
+++ b/tp/t/results/misc_commands/definfoenclose.pl
@@ -27,7 +27,7 @@ $result_trees{'definfoenclose'} = {
                       'text' => 'phoo,//,\\'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,7 +40,9 @@ $result_trees{'definfoenclose'} = {
                   'phoo',
                   '//',
                   '\\'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -107,7 +109,7 @@ $result_trees{'definfoenclose'} = {
                       'text' => 'phi,:,:'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -120,7 +122,9 @@ $result_trees{'definfoenclose'} = {
                   'phi',
                   ':',
                   ':'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -214,7 +218,7 @@ $result_trees{'definfoenclose'} = {
                   'text' => 'strong,(strong:,:)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -227,7 +231,9 @@ $result_trees{'definfoenclose'} = {
               'strong',
               '(strong:',
               ':)'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/definfoenclose_nestings.pl 
b/tp/t/results/misc_commands/definfoenclose_nestings.pl
index 0c45e366ae..de316b26d1 100644
--- a/tp/t/results/misc_commands/definfoenclose_nestings.pl
+++ b/tp/t/results/misc_commands/definfoenclose_nestings.pl
@@ -17,7 +17,7 @@ $result_trees{'definfoenclose_nestings'} = {
                   'text' => 'phoo,//,\\'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -30,7 +30,9 @@ $result_trees{'definfoenclose_nestings'} = {
               'phoo',
               '//',
               '\\'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -185,7 +187,7 @@ $result_trees{'definfoenclose_nestings'} = {
                   'text' => 'in center in phoo'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -193,7 +195,7 @@ $result_trees{'definfoenclose_nestings'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl 
b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
index 750b01fd24..35f52ae85c 100644
--- a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
+++ b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
@@ -22,7 +22,7 @@ $result_trees{'definfoenclose_with_empty_arg'} = {
                   'text' => 'headword, , :'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -35,7 +35,9 @@ $result_trees{'definfoenclose_with_empty_arg'} = {
               'headword',
               '',
               ':'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/double_exdent.pl 
b/tp/t/results/misc_commands/double_exdent.pl
index fb52530d7a..7626e9198a 100644
--- a/tp/t/results/misc_commands/double_exdent.pl
+++ b/tp/t/results/misc_commands/double_exdent.pl
@@ -12,7 +12,7 @@ $result_trees{'double_exdent'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,7 @@ $result_trees{'double_exdent'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -63,7 +63,7 @@ $result_trees{'double_exdent'} = {
                                   'text' => 'double  exdented nested other 
line'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -71,7 +71,7 @@ $result_trees{'double_exdent'} = {
                             }
                           ],
                           'cmdname' => 'exdent',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -85,7 +85,7 @@ $result_trees{'double_exdent'} = {
                     }
                   ],
                   'cmdname' => 'exdent',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -102,7 +102,7 @@ $result_trees{'double_exdent'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -111,9 +111,11 @@ $result_trees{'double_exdent'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
@@ -135,7 +137,7 @@ $result_trees{'double_exdent'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -144,9 +146,11 @@ $result_trees{'double_exdent'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/misc_commands/empty_center.pl 
b/tp/t/results/misc_commands/empty_center.pl
index daea268c9d..c8d977ba9f 100644
--- a/tp/t/results/misc_commands/empty_center.pl
+++ b/tp/t/results/misc_commands/empty_center.pl
@@ -12,7 +12,7 @@ $result_trees{'empty_center'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
diff --git a/tp/t/results/misc_commands/empty_center_with_arg.pl 
b/tp/t/results/misc_commands/empty_center_with_arg.pl
index a87255ab47..da6935980c 100644
--- a/tp/t/results/misc_commands/empty_center_with_arg.pl
+++ b/tp/t/results/misc_commands/empty_center_with_arg.pl
@@ -27,7 +27,7 @@ $result_trees{'empty_center_with_arg'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -35,7 +35,7 @@ $result_trees{'empty_center_with_arg'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/empty_documentencoding.pl 
b/tp/t/results/misc_commands/empty_documentencoding.pl
index 71566d0791..dc979a5978 100644
--- a/tp/t/results/misc_commands/empty_documentencoding.pl
+++ b/tp/t/results/misc_commands/empty_documentencoding.pl
@@ -12,7 +12,7 @@ $result_trees{'empty_documentencoding'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '   
 '
               },
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl 
b/tp/t/results/misc_commands/footnote_in_center.pl
index 3bbde773df..3cf8b0f09a 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -41,7 +41,7 @@ $result_trees{'footnote_in_center'} = {
                         {
                           'args' => [
                             {
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -64,7 +64,7 @@ $result_trees{'footnote_in_center'} = {
                                       'type' => 'command_as_argument'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -85,7 +85,7 @@ $result_trees{'footnote_in_center'} = {
                                                   'text' => 'item'
                                                 }
                                               ],
-                                              'extra' => {
+                                              'info' => {
                                                 'spaces_after_argument' => '
 '
                                               },
@@ -93,7 +93,7 @@ $result_trees{'footnote_in_center'} = {
                                             }
                                           ],
                                           'cmdname' => 'item',
-                                          'extra' => {
+                                          'info' => {
                                             'spaces_before_argument' => ' '
                                           },
                                           'source_info' => {
@@ -130,7 +130,7 @@ $result_trees{'footnote_in_center'} = {
                                           'text' => 'table'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => ' 
 '
                                       },
@@ -139,9 +139,11 @@ $result_trees{'footnote_in_center'} = {
                                   ],
                                   'cmdname' => 'end',
                                   'extra' => {
-                                    'spaces_before_argument' => ' ',
                                     'text_arg' => 'table'
                                   },
+                                  'info' => {
+                                    'spaces_before_argument' => ' '
+                                  },
                                   'source_info' => {
                                     'file_name' => '',
                                     'line_nr' => 8,
@@ -150,7 +152,9 @@ $result_trees{'footnote_in_center'} = {
                                 }
                               ],
                               'extra' => {
-                                'command_as_argument' => {},
+                                'command_as_argument' => {}
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -167,7 +171,7 @@ $result_trees{'footnote_in_center'} = {
                                       'text' => 'example'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -176,9 +180,11 @@ $result_trees{'footnote_in_center'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'example'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 9,
@@ -207,7 +213,7 @@ $result_trees{'footnote_in_center'} = {
                   'text' => ' and text after the footnote.'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -215,7 +221,7 @@ $result_trees{'footnote_in_center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/heading_command_in_commands.pl 
b/tp/t/results/misc_commands/heading_command_in_commands.pl
index c69b712177..ee60f51d37 100644
--- a/tp/t/results/misc_commands/heading_command_in_commands.pl
+++ b/tp/t/results/misc_commands/heading_command_in_commands.pl
@@ -32,7 +32,7 @@ $result_trees{'heading_command_in_commands'} = {
                               'text' => 'in code'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -40,7 +40,7 @@ $result_trees{'heading_command_in_commands'} = {
                         }
                       ],
                       'cmdname' => 'everyheading',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -75,7 +75,7 @@ $result_trees{'heading_command_in_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -94,7 +94,7 @@ $result_trees{'heading_command_in_commands'} = {
                           'text' => 'in example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -102,7 +102,7 @@ $result_trees{'heading_command_in_commands'} = {
                     }
                   ],
                   'cmdname' => 'everyheading',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -122,7 +122,7 @@ $result_trees{'heading_command_in_commands'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -131,9 +131,11 @@ $result_trees{'heading_command_in_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -155,7 +157,7 @@ $result_trees{'heading_command_in_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -172,7 +174,7 @@ $result_trees{'heading_command_in_commands'} = {
                       'text' => 'in quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -180,7 +182,7 @@ $result_trees{'heading_command_in_commands'} = {
                 }
               ],
               'cmdname' => 'everyheading',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -197,7 +199,7 @@ $result_trees{'heading_command_in_commands'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -206,9 +208,11 @@ $result_trees{'heading_command_in_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
diff --git a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl 
b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
index e55c08162c..eb616b629d 100644
--- a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
+++ b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
@@ -17,7 +17,7 @@ $result_trees{'incorrect_allowcodebreaks_argument'} = {
                   'text' => '_arg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -25,7 +25,8 @@ $result_trees{'incorrect_allowcodebreaks_argument'} = {
             }
           ],
           'cmdname' => 'allowcodebreaks',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/indent_in_quotation.pl 
b/tp/t/results/misc_commands/indent_in_quotation.pl
index 30bc748788..9764df9a45 100644
--- a/tp/t/results/misc_commands/indent_in_quotation.pl
+++ b/tp/t/results/misc_commands/indent_in_quotation.pl
@@ -12,7 +12,7 @@ $result_trees{'indent_in_quotation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -54,7 +54,7 @@ $result_trees{'indent_in_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -63,9 +63,11 @@ $result_trees{'indent_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/misc_commands/index_entries.pl 
b/tp/t/results/misc_commands/index_entries.pl
index 8276539a71..4ff6c8acbf 100644
--- a/tp/t/results/misc_commands/index_entries.pl
+++ b/tp/t/results/misc_commands/index_entries.pl
@@ -17,7 +17,7 @@ $result_trees{'index_entries'} = {
                   'text' => 'cindex entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -36,7 +36,9 @@ $result_trees{'index_entries'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -59,7 +61,7 @@ $result_trees{'index_entries'} = {
                   'text' => 'truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -70,7 +72,9 @@ $result_trees{'index_entries'} = {
           'extra' => {
             'misc_args' => [
               'truc'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -92,7 +96,7 @@ $result_trees{'index_entries'} = {
                   'text' => 'index truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -111,7 +115,9 @@ $result_trees{'index_entries'} = {
               'index_ignore_chars' => {},
               'index_name' => 'truc',
               'index_type_command' => 'trucindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/invalid_documentencoding.pl 
b/tp/t/results/misc_commands/invalid_documentencoding.pl
index 8147d1aafa..c6da2b77ec 100644
--- a/tp/t/results/misc_commands/invalid_documentencoding.pl
+++ b/tp/t/results/misc_commands/invalid_documentencoding.pl
@@ -46,7 +46,7 @@ $result_trees{'invalid_documentencoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -55,9 +55,11 @@ $result_trees{'invalid_documentencoding'} = {
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'us-ascii'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
@@ -95,7 +97,7 @@ $result_trees{'invalid_documentencoding'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -104,9 +106,11 @@ $result_trees{'invalid_documentencoding'} = {
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'latin1'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 4,
@@ -121,7 +125,7 @@ $result_trees{'invalid_documentencoding'} = {
                   'text' => 'YS-ASCII'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -130,9 +134,11 @@ $result_trees{'invalid_documentencoding'} = {
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'YS-ASCII'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 5,
@@ -155,7 +161,7 @@ $result_trees{'invalid_documentencoding'} = {
                       'text' => 'bad encoding name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -164,9 +170,11 @@ $result_trees{'invalid_documentencoding'} = {
               ],
               'cmdname' => 'documentencoding',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'bad encoding name'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -181,7 +189,7 @@ $result_trees{'invalid_documentencoding'} = {
                       'text' => '1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -190,9 +198,11 @@ $result_trees{'invalid_documentencoding'} = {
               ],
               'cmdname' => 'documentencoding',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => '1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -207,7 +217,7 @@ $result_trees{'invalid_documentencoding'} = {
                       'text' => '%'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -216,9 +226,11 @@ $result_trees{'invalid_documentencoding'} = {
               ],
               'cmdname' => 'documentencoding',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => '%'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -233,7 +245,7 @@ $result_trees{'invalid_documentencoding'} = {
                       'cmdname' => '@'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -242,9 +254,11 @@ $result_trees{'invalid_documentencoding'} = {
               ],
               'cmdname' => 'documentencoding',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => '@'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -272,7 +286,7 @@ $result_trees{'invalid_documentencoding'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -281,9 +295,11 @@ $result_trees{'invalid_documentencoding'} = {
               ],
               'cmdname' => 'documentencoding',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'AAA'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -316,7 +332,7 @@ $result_trees{'invalid_documentencoding'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -325,9 +341,11 @@ $result_trees{'invalid_documentencoding'} = {
               ],
               'cmdname' => 'documentencoding',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'BBB'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
diff --git a/tp/t/results/misc_commands/invalid_kbdinputstyle.pl 
b/tp/t/results/misc_commands/invalid_kbdinputstyle.pl
index e3714f6eb7..ab124b6401 100644
--- a/tp/t/results/misc_commands/invalid_kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/invalid_kbdinputstyle.pl
@@ -22,7 +22,7 @@ $result_trees{'invalid_kbdinputstyle'} = {
                       'text' => 'wrong arg on line following kbdinputstyle'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,7 @@ $result_trees{'invalid_kbdinputstyle'} = {
                 }
               ],
               'cmdname' => 'kbdinputstyle',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index 2845c3fd9e..e30f306866 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -86,7 +86,7 @@ $result_trees{'kbdinputstyle'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -95,9 +95,11 @@ $result_trees{'kbdinputstyle'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -145,7 +147,7 @@ $result_trees{'kbdinputstyle'} = {
                   'text' => 'code'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -156,7 +158,9 @@ $result_trees{'kbdinputstyle'} = {
           'extra' => {
             'misc_args' => [
               'code'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -361,7 +365,7 @@ $result_trees{'kbdinputstyle'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -555,7 +559,7 @@ $result_trees{'kbdinputstyle'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -564,9 +568,11 @@ $result_trees{'kbdinputstyle'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -610,7 +616,7 @@ $result_trees{'kbdinputstyle'} = {
                   'text' => 'example'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -621,7 +627,9 @@ $result_trees{'kbdinputstyle'} = {
           'extra' => {
             'misc_args' => [
               'example'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -826,7 +834,7 @@ $result_trees{'kbdinputstyle'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1011,7 +1019,7 @@ $result_trees{'kbdinputstyle'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1020,9 +1028,11 @@ $result_trees{'kbdinputstyle'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -1066,7 +1076,7 @@ $result_trees{'kbdinputstyle'} = {
                   'text' => 'distinct'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1077,7 +1087,9 @@ $result_trees{'kbdinputstyle'} = {
           'extra' => {
             'misc_args' => [
               'distinct'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1273,7 +1285,7 @@ $result_trees{'kbdinputstyle'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1458,7 +1470,7 @@ $result_trees{'kbdinputstyle'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1467,9 +1479,11 @@ $result_trees{'kbdinputstyle'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 1e35908f12..5347032447 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -111,7 +111,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -120,9 +120,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -170,7 +172,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'text' => 'code'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -181,7 +183,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
           'extra' => {
             'misc_args' => [
               'code'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -212,7 +216,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -233,7 +237,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                               'text' => 'i--tem out of example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -241,7 +245,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -264,7 +268,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -273,9 +277,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -285,7 +291,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'command_as_argument_kbd_code' => 1,
+            'command_as_argument_kbd_code' => 1
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -321,7 +329,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -342,7 +350,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                               'text' => 'braced i--tem out of example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -350,7 +358,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -373,7 +381,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -382,9 +390,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -394,7 +404,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'command_as_argument_kbd_code' => 1,
+            'command_as_argument_kbd_code' => 1
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -420,7 +432,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -446,7 +458,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -467,7 +479,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                                   'text' => 'i--tem in example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -475,7 +487,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -498,7 +510,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -507,9 +519,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 25,
@@ -519,7 +533,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'command_as_argument_kbd_code' => 1,
+                'command_as_argument_kbd_code' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -550,7 +566,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -571,7 +587,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                                   'text' => 'braced i--tem in example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -579,7 +595,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -602,7 +618,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -611,9 +627,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 25,
@@ -623,7 +641,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'command_as_argument_kbd_code' => 1,
+                'command_as_argument_kbd_code' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -640,7 +660,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -649,9 +669,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -695,7 +717,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'text' => 'example'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -706,7 +728,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
           'extra' => {
             'misc_args' => [
               'example'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -737,7 +761,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -758,7 +782,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                               'text' => 'i--tem out of example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -766,7 +790,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -789,7 +813,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -798,9 +822,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -810,7 +836,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'command_as_argument_kbd_code' => 1,
+            'command_as_argument_kbd_code' => 1
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -846,7 +874,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -867,7 +895,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                               'text' => 'braced i--tem out of example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -875,7 +903,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -898,7 +926,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -907,9 +935,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -919,7 +949,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'command_as_argument_kbd_code' => 1,
+            'command_as_argument_kbd_code' => 1
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -945,7 +977,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -968,7 +1000,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -989,7 +1021,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                                   'text' => 'i--tem in example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -997,7 +1029,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -1020,7 +1052,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1029,9 +1061,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 31,
@@ -1040,7 +1074,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1068,7 +1104,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1089,7 +1125,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                                   'text' => 'braced i--tem in example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1097,7 +1133,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -1120,7 +1156,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1129,9 +1165,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 31,
@@ -1140,7 +1178,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1157,7 +1197,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1166,9 +1206,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -1212,7 +1254,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'text' => 'distinct'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1223,7 +1265,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
           'extra' => {
             'misc_args' => [
               'distinct'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1251,7 +1295,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1272,7 +1316,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                               'text' => 'i--tem out of example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1280,7 +1324,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1303,7 +1347,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1312,9 +1356,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -1323,7 +1369,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1356,7 +1404,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1377,7 +1425,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                               'text' => 'braced i--tem out of example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1385,7 +1433,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1408,7 +1456,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1417,9 +1465,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -1428,7 +1478,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1454,7 +1506,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1477,7 +1529,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1498,7 +1550,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                                   'text' => 'i--tem in example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1506,7 +1558,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -1529,7 +1581,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1538,9 +1590,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 37,
@@ -1549,7 +1603,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1577,7 +1633,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1598,7 +1654,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                                   'text' => 'braced i--tem in example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1606,7 +1662,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -1629,7 +1685,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1638,9 +1694,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 37,
@@ -1649,7 +1707,9 @@ $result_trees{'kbdinputstyle_in_table'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1666,7 +1726,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1675,9 +1735,11 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
diff --git a/tp/t/results/misc_commands/many_lines.pl 
b/tp/t/results/misc_commands/many_lines.pl
index 4e6cb5be1b..e07a49994a 100644
--- a/tp/t/results/misc_commands/many_lines.pl
+++ b/tp/t/results/misc_commands/many_lines.pl
@@ -28,7 +28,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'pagesizes arg'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -36,7 +36,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'pagesizes',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -92,7 +92,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'on line following headings'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -100,7 +100,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'headings',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -120,7 +120,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'on line following oddfooting'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -128,7 +128,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'oddfooting',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -148,7 +148,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'on line following everyheading'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -156,7 +156,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'everyheading',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -176,7 +176,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'on line following everyfooting'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -184,7 +184,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'everyfooting',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -204,7 +204,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'on line following evenheading'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -212,7 +212,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'evenheading',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -232,7 +232,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'on line following evenfooting'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -240,7 +240,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'evenfooting',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -260,7 +260,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'on line following'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -268,7 +268,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'oddheading',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -291,7 +291,7 @@ $result_trees{'many_lines'} = {
                   'text' => '0.1 on line following'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -299,7 +299,7 @@ $result_trees{'many_lines'} = {
             }
           ],
           'cmdname' => 'need',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -324,7 +324,7 @@ $result_trees{'many_lines'} = {
                   'text' => '0.1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -335,7 +335,9 @@ $result_trees{'many_lines'} = {
           'extra' => {
             'misc_args' => [
               '0.1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -357,7 +359,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'on line following setchapternewpage'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -365,7 +367,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'setchapternewpage',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -411,7 +413,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'code something'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -419,7 +421,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'kbdinputstyle',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -493,7 +495,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'asis'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -504,7 +506,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   'asis'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -524,7 +528,7 @@ $result_trees{'many_lines'} = {
                       'text' => '0'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -535,7 +539,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   '0'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -555,7 +561,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'none'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -566,7 +572,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   'none'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -586,7 +594,7 @@ $result_trees{'many_lines'} = {
                       'text' => '4'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -597,7 +605,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   '4'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -617,7 +627,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'none'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -628,7 +638,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   'none'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -648,7 +660,7 @@ $result_trees{'many_lines'} = {
                       'text' => '6 on line following exampleindent'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -656,7 +668,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'exampleindent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -676,7 +688,7 @@ $result_trees{'many_lines'} = {
                       'text' => '6'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -687,7 +699,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   '6'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -707,7 +721,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'end'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -718,7 +732,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   'end'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -738,7 +754,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'separate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -749,7 +765,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   'separate'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -769,7 +787,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'US-ascii encoding name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -778,9 +796,11 @@ $result_trees{'many_lines'} = {
               ],
               'cmdname' => 'documentencoding',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'US-ascii encoding name'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -795,7 +815,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -806,9 +826,11 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -826,7 +848,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'on'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -837,7 +859,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   'on'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -857,7 +881,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'off'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -868,7 +892,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   'off'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -888,7 +914,7 @@ $result_trees{'many_lines'} = {
                       'text' => '10'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -899,7 +925,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   '10'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -919,7 +947,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'bottom on line following everyheadingmarks'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -927,7 +955,7 @@ $result_trees{'many_lines'} = {
                 }
               ],
               'cmdname' => 'everyheadingmarks',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -944,7 +972,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'false'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -955,7 +983,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   'false'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -972,7 +1002,7 @@ $result_trees{'many_lines'} = {
                       'text' => 'true'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -983,7 +1013,9 @@ $result_trees{'many_lines'} = {
               'extra' => {
                 'misc_args' => [
                   'true'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
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 9ee33347a8..d2b4fbb422 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
@@ -18,7 +18,7 @@ $result_trees{'no_empty_line_between_headings'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'no_empty_line_between_headings'} = {
                   'text' => 'Subheading'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,8 @@ $result_trees{'no_empty_line_between_headings'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -53,7 +54,8 @@ $result_trees{'no_empty_line_between_headings'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -70,7 +72,7 @@ $result_trees{'no_empty_line_between_headings'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -78,7 +80,8 @@ $result_trees{'no_empty_line_between_headings'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -95,7 +98,7 @@ $result_trees{'no_empty_line_between_headings'} = {
               'text' => 'Section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -103,7 +106,8 @@ $result_trees{'no_empty_line_between_headings'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -139,16 +143,19 @@ $result_sectioning{'no_empty_line_between_headings'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
diff --git a/tp/t/results/misc_commands/noindent_after_smallexample.pl 
b/tp/t/results/misc_commands/noindent_after_smallexample.pl
index 3c5855522c..cea1e7f2be 100644
--- a/tp/t/results/misc_commands/noindent_after_smallexample.pl
+++ b/tp/t/results/misc_commands/noindent_after_smallexample.pl
@@ -21,7 +21,7 @@ $result_trees{'noindent_after_smallexample'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -51,7 +51,7 @@ $result_trees{'noindent_after_smallexample'} = {
                       'text' => 'smallexample'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -60,9 +60,11 @@ $result_trees{'noindent_after_smallexample'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'smallexample'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index be47b97505..a2f4e6d0c9 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -24,7 +24,7 @@ $result_trees{'ref_in_center'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'ref_in_center'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'ref_in_center'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'ref_in_center'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'ref_in_center'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +116,9 @@ $result_trees{'ref_in_center'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -130,7 +135,7 @@ $result_trees{'ref_in_center'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -176,7 +181,7 @@ $result_trees{'ref_in_center'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -184,7 +189,7 @@ $result_trees{'ref_in_center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -213,7 +218,7 @@ $result_trees{'ref_in_center'} = {
                       'type' => 'brace_command_arg'
                     },
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -240,7 +245,7 @@ $result_trees{'ref_in_center'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -259,7 +264,8 @@ $result_trees{'ref_in_center'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -314,9 +320,11 @@ $result_sectioning{'ref_in_center'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -327,9 +335,11 @@ $result_sectioning{'ref_in_center'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -358,10 +368,12 @@ $result_nodes{'ref_in_center'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -369,12 +381,14 @@ $result_nodes{'ref_in_center'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -390,6 +404,7 @@ $result_menus{'ref_in_center'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/misc_commands/setfilename.pl 
b/tp/t/results/misc_commands/setfilename.pl
index 5ce1b5e56b..6268c36b3c 100644
--- a/tp/t/results/misc_commands/setfilename.pl
+++ b/tp/t/results/misc_commands/setfilename.pl
@@ -42,9 +42,11 @@ $result_trees{'setfilename'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'file_comment'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -59,7 +61,7 @@ $result_trees{'setfilename'} = {
                       'text' => 'file_and_spaces'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '   
 '
                   },
@@ -68,9 +70,11 @@ $result_trees{'setfilename'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'file_and_spaces'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -101,7 +105,9 @@ $result_trees{'setfilename'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -109,9 +115,11 @@ $result_trees{'setfilename'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'file_space_comment'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -151,7 +159,7 @@ $result_trees{'setfilename'} = {
                       'cmdname' => ' '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -160,7 +168,9 @@ $result_trees{'setfilename'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'missing_argument' => 1,
+                'missing_argument' => 1
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/misc_commands/simple.pl 
b/tp/t/results/misc_commands/simple.pl
index 50e52a60e5..935108f541 100644
--- a/tp/t/results/misc_commands/simple.pl
+++ b/tp/t/results/misc_commands/simple.pl
@@ -24,7 +24,9 @@ $result_trees{'simple'} = {
           'extra' => {
             'misc_args' => [
               'idx'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/sp.pl b/tp/t/results/misc_commands/sp.pl
index b7beb231fc..783e1ad892 100644
--- a/tp/t/results/misc_commands/sp.pl
+++ b/tp/t/results/misc_commands/sp.pl
@@ -30,7 +30,7 @@ $result_trees{'sp'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -41,7 +41,9 @@ $result_trees{'sp'} = {
           'extra' => {
             'misc_args' => [
               '1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -58,7 +60,7 @@ $result_trees{'sp'} = {
                   'text' => '2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -69,7 +71,9 @@ $result_trees{'sp'} = {
           'extra' => {
             'misc_args' => [
               '2'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -94,7 +98,7 @@ $result_trees{'sp'} = {
                   'text' => '1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -105,7 +109,9 @@ $result_trees{'sp'} = {
           'extra' => {
             'misc_args' => [
               '1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -131,7 +137,7 @@ $result_trees{'sp'} = {
                   'text' => '2 a number after sp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -139,7 +145,7 @@ $result_trees{'sp'} = {
             }
           ],
           'cmdname' => 'sp',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/synindex_too_much_args.pl 
b/tp/t/results/misc_commands/synindex_too_much_args.pl
index 85905192f5..907cd04d9a 100644
--- a/tp/t/results/misc_commands/synindex_too_much_args.pl
+++ b/tp/t/results/misc_commands/synindex_too_much_args.pl
@@ -17,7 +17,7 @@ $result_trees{'synindex_too_much_args'} = {
                   'text' => 'cp fn    truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -25,7 +25,7 @@ $result_trees{'synindex_too_much_args'} = {
             }
           ],
           'cmdname' => 'syncodeindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 91fcb39661..797e2504c0 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -24,7 +24,7 @@ $result_trees{'test_allowcodebreaks'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -89,7 +89,7 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -98,9 +98,11 @@ $result_trees{'test_allowcodebreaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -160,7 +162,7 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -169,9 +171,11 @@ $result_trees{'test_allowcodebreaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -515,7 +519,7 @@ $result_trees{'test_allowcodebreaks'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -559,7 +563,7 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -568,9 +572,11 @@ $result_trees{'test_allowcodebreaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -597,7 +603,7 @@ $result_trees{'test_allowcodebreaks'} = {
                   'text' => 'false'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -608,7 +614,9 @@ $result_trees{'test_allowcodebreaks'} = {
           'extra' => {
             'misc_args' => [
               'false'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -938,7 +946,7 @@ $result_trees{'test_allowcodebreaks'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -982,7 +990,7 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -991,9 +999,11 @@ $result_trees{'test_allowcodebreaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -1352,7 +1362,7 @@ $result_trees{'test_allowcodebreaks'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1411,7 +1421,7 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1420,9 +1430,11 @@ $result_trees{'test_allowcodebreaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -1449,7 +1461,7 @@ $result_trees{'test_allowcodebreaks'} = {
                   'text' => 'true'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1460,7 +1472,9 @@ $result_trees{'test_allowcodebreaks'} = {
           'extra' => {
             'misc_args' => [
               'true'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1790,7 +1804,7 @@ $result_trees{'test_allowcodebreaks'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1834,7 +1848,7 @@ $result_trees{'test_allowcodebreaks'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1843,9 +1857,11 @@ $result_trees{'test_allowcodebreaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 39,
@@ -1872,7 +1888,9 @@ $result_trees{'test_allowcodebreaks'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2011,14 +2029,16 @@ $result_nodes{'test_allowcodebreaks'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'test_allowcodebreaks'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'test_allowcodebreaks'} = [];
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 d180a066a2..96aff4c76a 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -22,7 +22,7 @@ $result_trees{'text_before_line_command'} = {
                       'text' => 'the title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,7 +30,7 @@ $result_trees{'text_before_line_command'} = {
                 }
               ],
               'cmdname' => 'title',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -66,7 +66,7 @@ $result_trees{'text_before_line_command'} = {
               'text' => 'LD Version Scripts'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +96,9 @@ $result_trees{'text_before_line_command'} = {
             'normalized' => 'LD-Version-Scripts'
           }
         ],
-        'normalized' => 'LD-Version-Scripts',
+        'normalized' => 'LD-Version-Scripts'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +115,7 @@ $result_trees{'text_before_line_command'} = {
               'text' => 'LD Version Scripts'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -158,7 +160,7 @@ $result_trees{'text_before_line_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -180,7 +182,7 @@ $result_trees{'text_before_line_command'} = {
                           'text' => 'quotation author'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -189,7 +191,9 @@ $result_trees{'text_before_line_command'} = {
                   ],
                   'cmdname' => 'author',
                   'extra' => {
-                    'quotation' => {},
+                    'quotation' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -213,7 +217,7 @@ $result_trees{'text_before_line_command'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -222,9 +226,11 @@ $result_trees{'text_before_line_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -244,7 +250,8 @@ $result_trees{'text_before_line_command'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -295,9 +302,11 @@ $result_sectioning{'text_before_line_command'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'LD-Version-Scripts'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -316,19 +325,22 @@ $result_nodes{'text_before_line_command'} = {
     'associated_section' => {
       'cmdname' => 'chapter',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'section_number' => 1
       }
     },
     'normalized' => 'LD-Version-Scripts'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'text_before_line_command'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'LD-Version-Scripts'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'text_before_line_command'} = [
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index fc89ed6d18..b0e6de1cab 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -34,7 +34,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'formatting.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'formatting.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 2,
@@ -123,7 +125,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => ' test'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -131,7 +133,7 @@ $result_trees{'formatting_fr'} = {
                 }
               ],
               'cmdname' => 'dircategory',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -143,7 +145,7 @@ $result_trees{'formatting_fr'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -413,7 +415,7 @@ $result_trees{'formatting_fr'} = {
                           'text' => 'direntry'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -422,9 +424,11 @@ $result_trees{'formatting_fr'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'direntry'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'formatting.texi',
                     'line_nr' => 9,
@@ -452,7 +456,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -473,7 +477,9 @@ $result_trees{'formatting_fr'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -490,7 +496,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'Top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -507,7 +513,7 @@ $result_trees{'formatting_fr'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -659,7 +665,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -668,9 +674,11 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 19,
@@ -697,7 +705,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'coverage_macro.texi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -706,9 +714,11 @@ $result_trees{'formatting_fr'} = {
           ],
           'cmdname' => 'include',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'coverage_macro.texi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => 'formatting.texi',
             'line_nr' => 21,
@@ -723,7 +733,7 @@ $result_trees{'formatting_fr'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -753,7 +763,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -762,9 +772,11 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 26,
@@ -786,7 +798,7 @@ $result_trees{'formatting_fr'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -803,7 +815,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'title --a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -811,7 +823,8 @@ $result_trees{'formatting_fr'} = {
                 }
               ],
               'cmdname' => 'title',
-              'extra' => {
+              'extra' => {},
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -828,7 +841,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'formatting subtitle --a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -836,7 +849,7 @@ $result_trees{'formatting_fr'} = {
                 }
               ],
               'cmdname' => 'subtitle',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -853,7 +866,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'subtitle 2 --a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -861,7 +874,7 @@ $result_trees{'formatting_fr'} = {
                 }
               ],
               'cmdname' => 'subtitle',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -917,7 +930,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -926,9 +939,11 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'author',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'titlepage' => {}
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 32,
@@ -943,7 +958,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'author2 --a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -952,9 +967,11 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'author',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'titlepage' => {}
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 33,
@@ -1011,7 +1028,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'titlepage'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1020,9 +1037,11 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'titlepage'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 39,
@@ -1100,7 +1119,7 @@ $result_trees{'formatting_fr'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1126,7 +1145,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1135,9 +1154,11 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 50,
@@ -1164,7 +1185,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 't--ruc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1184,7 +1205,9 @@ $result_trees{'formatting_fr'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1202,7 +1225,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'T--ruc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1222,7 +1245,9 @@ $result_trees{'formatting_fr'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1240,7 +1265,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => '.'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1260,7 +1285,9 @@ $result_trees{'formatting_fr'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1278,7 +1305,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => '?'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1298,7 +1325,9 @@ $result_trees{'formatting_fr'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1316,7 +1345,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1336,7 +1365,9 @@ $result_trees{'formatting_fr'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1354,7 +1385,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 't--ruc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1374,7 +1405,9 @@ $result_trees{'formatting_fr'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1392,7 +1425,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'T--ruc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1412,7 +1445,9 @@ $result_trees{'formatting_fr'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1430,7 +1465,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => '.'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1450,7 +1485,9 @@ $result_trees{'formatting_fr'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1468,7 +1505,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => '?'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1488,7 +1525,9 @@ $result_trees{'formatting_fr'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1506,7 +1545,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1526,7 +1565,9 @@ $result_trees{'formatting_fr'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1563,7 +1604,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1574,7 +1615,9 @@ $result_trees{'formatting_fr'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1605,7 +1648,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1616,7 +1659,9 @@ $result_trees{'formatting_fr'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1647,7 +1692,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'vr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1658,7 +1703,9 @@ $result_trees{'formatting_fr'} = {
           'extra' => {
             'misc_args' => [
               'vr'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1689,7 +1736,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'ky'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1700,7 +1747,9 @@ $result_trees{'formatting_fr'} = {
           'extra' => {
             'misc_args' => [
               'ky'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1731,7 +1780,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'pg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1742,7 +1791,9 @@ $result_trees{'formatting_fr'} = {
           'extra' => {
             'misc_args' => [
               'pg'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1773,7 +1824,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'tp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1784,7 +1835,9 @@ $result_trees{'formatting_fr'} = {
           'extra' => {
             'misc_args' => [
               'tp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1809,7 +1862,8 @@ $result_trees{'formatting_fr'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1826,7 +1880,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1846,7 +1900,9 @@ $result_trees{'formatting_fr'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1863,7 +1919,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1917,7 +1973,7 @@ $result_trees{'formatting_fr'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1929,7 +1985,7 @@ $result_trees{'formatting_fr'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -2063,7 +2119,7 @@ $result_trees{'formatting_fr'} = {
                           'text' => 'menu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2072,9 +2128,11 @@ $result_trees{'formatting_fr'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'formatting.texi',
                     'line_nr' => 96,
@@ -2096,7 +2154,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'format'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2105,9 +2163,11 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'format'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 97,
@@ -2127,7 +2187,8 @@ $result_trees{'formatting_fr'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2160,7 +2221,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'ion'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2184,7 +2245,9 @@ $result_trees{'formatting_fr'} = {
             'normalized' => 's_002d_002dect_002cion'
           }
         ],
-        'normalized' => 's_002d_002dect_002cion',
+        'normalized' => 's_002d_002dect_002cion'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2201,7 +2264,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'A section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2218,7 +2281,7 @@ $result_trees{'formatting_fr'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2294,7 +2357,7 @@ $result_trees{'formatting_fr'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2428,7 +2491,7 @@ $result_trees{'formatting_fr'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2437,9 +2500,11 @@ $result_trees{'formatting_fr'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'formatting.texi',
                     'line_nr' => 110,
@@ -2461,7 +2526,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2470,9 +2535,11 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 111,
@@ -2492,7 +2559,8 @@ $result_trees{'formatting_fr'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2509,7 +2577,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2529,7 +2597,9 @@ $result_trees{'formatting_fr'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2546,7 +2616,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2563,7 +2633,7 @@ $result_trees{'formatting_fr'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2678,7 +2748,7 @@ $result_trees{'formatting_fr'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2687,9 +2757,11 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 119,
@@ -2743,7 +2815,8 @@ $result_trees{'formatting_fr'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2760,7 +2833,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'subsubsection ``simple-double--'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2780,7 +2853,9 @@ $result_trees{'formatting_fr'} = {
             'normalized' => 
'subsubsection-_0060_0060simple_002ddouble_002d_002d'
           }
         ],
-        'normalized' => 'subsubsection-_0060_0060simple_002ddouble_002d_002d',
+        'normalized' => 'subsubsection-_0060_0060simple_002ddouble_002d_002d'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2797,7 +2872,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'subsubsection ``simple-double--'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2812,7 +2887,8 @@ $result_trees{'formatting_fr'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2829,7 +2905,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'subsubsection three---four----\'\''
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2849,7 +2925,9 @@ $result_trees{'formatting_fr'} = {
             'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027'
           }
         ],
-        'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027',
+        'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2866,7 +2944,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'three---four----\'\''
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2881,7 +2959,8 @@ $result_trees{'formatting_fr'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2898,7 +2977,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'chapter2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2919,7 +2998,9 @@ $result_trees{'formatting_fr'} = {
             'normalized' => 'chapter2'
           }
         ],
-        'normalized' => 'chapter2',
+        'normalized' => 'chapter2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2936,7 +3017,7 @@ $result_trees{'formatting_fr'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2958,7 +3039,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2969,7 +3050,9 @@ $result_trees{'formatting_fr'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2986,7 +3069,7 @@ $result_trees{'formatting_fr'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2997,7 +3080,9 @@ $result_trees{'formatting_fr'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3042,7 +3127,8 @@ $result_trees{'formatting_fr'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3384,9 +3470,11 @@ $result_sectioning{'formatting_fr'} = {
               'isindex' => 1,
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -3397,9 +3485,11 @@ $result_sectioning{'formatting_fr'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -3410,9 +3500,11 @@ $result_sectioning{'formatting_fr'} = {
                         'extra' => {
                           'normalized' => 's_002d_002dect_002cion'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -3423,9 +3515,11 @@ $result_sectioning{'formatting_fr'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
@@ -3436,9 +3530,11 @@ $result_sectioning{'formatting_fr'} = {
                                     'extra' => {
                                       'normalized' => 
'subsubsection-_0060_0060simple_002ddouble_002d_002d'
                                     },
+                                    'info' => {},
                                     'structure' => {}
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.1',
@@ -3453,9 +3549,11 @@ $result_sectioning{'formatting_fr'} = {
                                     'extra' => {
                                       'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027'
                                     },
+                                    'info' => {},
                                     'structure' => {}
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.2',
@@ -3492,9 +3590,11 @@ $result_sectioning{'formatting_fr'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -3532,6 +3632,7 @@ $result_nodes{'formatting_fr'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
@@ -3542,6 +3643,7 @@ $result_nodes{'formatting_fr'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -3549,12 +3651,14 @@ $result_nodes{'formatting_fr'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -3562,11 +3666,13 @@ $result_nodes{'formatting_fr'} = {
             'associated_section' => {
               'cmdname' => 'centerchap',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             },
             'isindex' => 1,
             'normalized' => 'chapter2'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -3591,12 +3697,14 @@ $result_menus{'formatting_fr'} = {
     'isindex' => 1,
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
@@ -3604,6 +3712,7 @@ $result_menus{'formatting_fr'} = {
             'isindex' => 1,
             'normalized' => 'chapter2'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index 7a7d4bb5ea..bbd70a2006 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -34,7 +34,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'formatting.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'formatting.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 2,
@@ -123,7 +125,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => ' test'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -131,7 +133,7 @@ $result_trees{'texi_formatting'} = {
                 }
               ],
               'cmdname' => 'dircategory',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -143,7 +145,7 @@ $result_trees{'texi_formatting'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -413,7 +415,7 @@ $result_trees{'texi_formatting'} = {
                           'text' => 'direntry'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -422,9 +424,11 @@ $result_trees{'texi_formatting'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'direntry'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'formatting.texi',
                     'line_nr' => 9,
@@ -452,7 +456,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -473,7 +477,9 @@ $result_trees{'texi_formatting'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -490,7 +496,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'Top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -507,7 +513,7 @@ $result_trees{'texi_formatting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -659,7 +665,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -668,9 +674,11 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 19,
@@ -697,7 +705,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'coverage_macro.texi'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -706,9 +714,11 @@ $result_trees{'texi_formatting'} = {
           ],
           'cmdname' => 'include',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'coverage_macro.texi'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => 'formatting.texi',
             'line_nr' => 21,
@@ -723,7 +733,7 @@ $result_trees{'texi_formatting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -753,7 +763,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -762,9 +772,11 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 26,
@@ -786,7 +798,7 @@ $result_trees{'texi_formatting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -803,7 +815,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'title --a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -811,7 +823,8 @@ $result_trees{'texi_formatting'} = {
                 }
               ],
               'cmdname' => 'title',
-              'extra' => {
+              'extra' => {},
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -828,7 +841,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'formatting subtitle --a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -836,7 +849,7 @@ $result_trees{'texi_formatting'} = {
                 }
               ],
               'cmdname' => 'subtitle',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -853,7 +866,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'subtitle 2 --a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -861,7 +874,7 @@ $result_trees{'texi_formatting'} = {
                 }
               ],
               'cmdname' => 'subtitle',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -917,7 +930,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -926,9 +939,11 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'author',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'titlepage' => {}
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 32,
@@ -943,7 +958,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'author2 --a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -952,9 +967,11 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'author',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'titlepage' => {}
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 33,
@@ -1011,7 +1028,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'titlepage'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1020,9 +1037,11 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'titlepage'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 39,
@@ -1100,7 +1119,7 @@ $result_trees{'texi_formatting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1126,7 +1145,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1135,9 +1154,11 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 50,
@@ -1164,7 +1185,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 't--ruc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1184,7 +1205,9 @@ $result_trees{'texi_formatting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1202,7 +1225,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'T--ruc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1222,7 +1245,9 @@ $result_trees{'texi_formatting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1240,7 +1265,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => '.'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1260,7 +1285,9 @@ $result_trees{'texi_formatting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1278,7 +1305,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => '?'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1298,7 +1325,9 @@ $result_trees{'texi_formatting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1316,7 +1345,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1336,7 +1365,9 @@ $result_trees{'texi_formatting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1354,7 +1385,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 't--ruc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1374,7 +1405,9 @@ $result_trees{'texi_formatting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1392,7 +1425,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'T--ruc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1412,7 +1445,9 @@ $result_trees{'texi_formatting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1430,7 +1465,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => '.'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1450,7 +1485,9 @@ $result_trees{'texi_formatting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1468,7 +1505,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => '?'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1488,7 +1525,9 @@ $result_trees{'texi_formatting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1506,7 +1545,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1526,7 +1565,9 @@ $result_trees{'texi_formatting'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1563,7 +1604,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1574,7 +1615,9 @@ $result_trees{'texi_formatting'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1605,7 +1648,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1616,7 +1659,9 @@ $result_trees{'texi_formatting'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1647,7 +1692,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'vr'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1658,7 +1703,9 @@ $result_trees{'texi_formatting'} = {
           'extra' => {
             'misc_args' => [
               'vr'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1689,7 +1736,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'ky'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1700,7 +1747,9 @@ $result_trees{'texi_formatting'} = {
           'extra' => {
             'misc_args' => [
               'ky'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1731,7 +1780,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'pg'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1742,7 +1791,9 @@ $result_trees{'texi_formatting'} = {
           'extra' => {
             'misc_args' => [
               'pg'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1773,7 +1824,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'tp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1784,7 +1835,9 @@ $result_trees{'texi_formatting'} = {
           'extra' => {
             'misc_args' => [
               'tp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1809,7 +1862,8 @@ $result_trees{'texi_formatting'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1826,7 +1880,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1846,7 +1900,9 @@ $result_trees{'texi_formatting'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1863,7 +1919,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1917,7 +1973,7 @@ $result_trees{'texi_formatting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1929,7 +1985,7 @@ $result_trees{'texi_formatting'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -2063,7 +2119,7 @@ $result_trees{'texi_formatting'} = {
                           'text' => 'menu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2072,9 +2128,11 @@ $result_trees{'texi_formatting'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'formatting.texi',
                     'line_nr' => 96,
@@ -2096,7 +2154,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'format'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2105,9 +2163,11 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'format'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 97,
@@ -2127,7 +2187,8 @@ $result_trees{'texi_formatting'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2160,7 +2221,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'ion'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2184,7 +2245,9 @@ $result_trees{'texi_formatting'} = {
             'normalized' => 's_002d_002dect_002cion'
           }
         ],
-        'normalized' => 's_002d_002dect_002cion',
+        'normalized' => 's_002d_002dect_002cion'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2201,7 +2264,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'A section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2218,7 +2281,7 @@ $result_trees{'texi_formatting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2294,7 +2357,7 @@ $result_trees{'texi_formatting'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2428,7 +2491,7 @@ $result_trees{'texi_formatting'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2437,9 +2500,11 @@ $result_trees{'texi_formatting'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => 'formatting.texi',
                     'line_nr' => 110,
@@ -2461,7 +2526,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2470,9 +2535,11 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 111,
@@ -2492,7 +2559,8 @@ $result_trees{'texi_formatting'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2509,7 +2577,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2529,7 +2597,9 @@ $result_trees{'texi_formatting'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2546,7 +2616,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2563,7 +2633,7 @@ $result_trees{'texi_formatting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2678,7 +2748,7 @@ $result_trees{'texi_formatting'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2687,9 +2757,11 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'formatting.texi',
                 'line_nr' => 119,
@@ -2743,7 +2815,8 @@ $result_trees{'texi_formatting'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2760,7 +2833,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'subsubsection ``simple-double--'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2780,7 +2853,9 @@ $result_trees{'texi_formatting'} = {
             'normalized' => 
'subsubsection-_0060_0060simple_002ddouble_002d_002d'
           }
         ],
-        'normalized' => 'subsubsection-_0060_0060simple_002ddouble_002d_002d',
+        'normalized' => 'subsubsection-_0060_0060simple_002ddouble_002d_002d'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2797,7 +2872,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'subsubsection ``simple-double--'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2812,7 +2887,8 @@ $result_trees{'texi_formatting'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2829,7 +2905,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'subsubsection three---four----\'\''
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2849,7 +2925,9 @@ $result_trees{'texi_formatting'} = {
             'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027'
           }
         ],
-        'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027',
+        'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2866,7 +2944,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'three---four----\'\''
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2881,7 +2959,8 @@ $result_trees{'texi_formatting'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2898,7 +2977,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'chapter2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2919,7 +2998,9 @@ $result_trees{'texi_formatting'} = {
             'normalized' => 'chapter2'
           }
         ],
-        'normalized' => 'chapter2',
+        'normalized' => 'chapter2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2936,7 +3017,7 @@ $result_trees{'texi_formatting'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2958,7 +3039,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2969,7 +3050,9 @@ $result_trees{'texi_formatting'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2986,7 +3069,7 @@ $result_trees{'texi_formatting'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2997,7 +3080,9 @@ $result_trees{'texi_formatting'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -3042,7 +3127,8 @@ $result_trees{'texi_formatting'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3384,9 +3470,11 @@ $result_sectioning{'texi_formatting'} = {
               'isindex' => 1,
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -3397,9 +3485,11 @@ $result_sectioning{'texi_formatting'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -3410,9 +3500,11 @@ $result_sectioning{'texi_formatting'} = {
                         'extra' => {
                           'normalized' => 's_002d_002dect_002cion'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -3423,9 +3515,11 @@ $result_sectioning{'texi_formatting'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
@@ -3436,9 +3530,11 @@ $result_sectioning{'texi_formatting'} = {
                                     'extra' => {
                                       'normalized' => 
'subsubsection-_0060_0060simple_002ddouble_002d_002d'
                                     },
+                                    'info' => {},
                                     'structure' => {}
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.1',
@@ -3453,9 +3549,11 @@ $result_sectioning{'texi_formatting'} = {
                                     'extra' => {
                                       'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027'
                                     },
+                                    'info' => {},
                                     'structure' => {}
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.2',
@@ -3492,9 +3590,11 @@ $result_sectioning{'texi_formatting'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -3532,6 +3632,7 @@ $result_nodes{'texi_formatting'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
@@ -3542,6 +3643,7 @@ $result_nodes{'texi_formatting'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -3549,12 +3651,14 @@ $result_nodes{'texi_formatting'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -3562,11 +3666,13 @@ $result_nodes{'texi_formatting'} = {
             'associated_section' => {
               'cmdname' => 'centerchap',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             },
             'isindex' => 1,
             'normalized' => 'chapter2'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -3591,12 +3697,14 @@ $result_menus{'texi_formatting'} = {
     'isindex' => 1,
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
@@ -3604,6 +3712,7 @@ $result_menus{'texi_formatting'} = {
             'isindex' => 1,
             'normalized' => 'chapter2'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/moreindices/double_index_entry.pl 
b/tp/t/results/moreindices/double_index_entry.pl
index 11ed83df34..3471f85b5d 100644
--- a/tp/t/results/moreindices/double_index_entry.pl
+++ b/tp/t/results/moreindices/double_index_entry.pl
@@ -34,7 +34,7 @@ $result_trees{'double_index_entry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -56,7 +56,7 @@ $result_trees{'double_index_entry'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -76,7 +76,9 @@ $result_trees{'double_index_entry'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -113,7 +115,7 @@ $result_trees{'double_index_entry'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -133,7 +135,9 @@ $result_trees{'double_index_entry'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -151,7 +155,7 @@ $result_trees{'double_index_entry'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -217,7 +221,7 @@ $result_trees{'double_index_entry'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -226,9 +230,11 @@ $result_trees{'double_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'double_index_entry.texi',
                 'line_nr' => 12,
@@ -260,7 +266,9 @@ $result_trees{'double_index_entry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -291,7 +299,7 @@ $result_trees{'double_index_entry'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -313,7 +321,7 @@ $result_trees{'double_index_entry'} = {
                   'text' => 'aaa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -333,7 +341,9 @@ $result_trees{'double_index_entry'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -356,7 +366,7 @@ $result_trees{'double_index_entry'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -367,7 +377,9 @@ $result_trees{'double_index_entry'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -403,7 +415,9 @@ $result_trees{'double_index_entry'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'other-node',
+        'normalized' => 'other-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -479,6 +493,7 @@ $result_nodes{'double_index_entry'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -486,6 +501,7 @@ $result_nodes{'double_index_entry'} = {
         'isindex' => 1,
         'normalized' => 'other-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -503,6 +519,7 @@ $result_menus{'double_index_entry'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -510,6 +527,7 @@ $result_menus{'double_index_entry'} = {
         'isindex' => 1,
         'normalized' => 'other-node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/moreindices/index_no_node.pl 
b/tp/t/results/moreindices/index_no_node.pl
index 02b804c92a..23d859e178 100644
--- a/tp/t/results/moreindices/index_no_node.pl
+++ b/tp/t/results/moreindices/index_no_node.pl
@@ -39,7 +39,7 @@ $result_trees{'index_no_node'} = {
                       'text' => 'index_no_node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'index_no_node'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'index_no_node'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'index_no_node.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -92,7 +94,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -119,7 +123,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -130,7 +134,9 @@ $result_trees{'index_no_node'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -160,7 +166,7 @@ $result_trees{'index_no_node'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -177,7 +183,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'bidule'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -185,7 +191,7 @@ $result_trees{'index_no_node'} = {
             }
           ],
           'cmdname' => 'printindex',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -207,7 +213,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'unnumbered'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -226,7 +232,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -250,7 +258,7 @@ $result_trees{'index_no_node'} = {
                       'text' => 'unnumbered after text'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -269,7 +277,9 @@ $result_trees{'index_no_node'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -295,7 +305,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -306,7 +316,9 @@ $result_trees{'index_no_node'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -321,7 +333,8 @@ $result_trees{'index_no_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -338,7 +351,7 @@ $result_trees{'index_no_node'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -360,7 +373,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'top section'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -379,7 +392,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -397,7 +412,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'top section'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -416,7 +431,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -434,7 +451,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'top section'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -453,7 +470,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -471,7 +490,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'top section'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -490,7 +509,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -508,7 +529,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'top section'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -527,7 +548,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -545,7 +568,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'top section'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -564,7 +587,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -596,7 +621,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -607,7 +632,9 @@ $result_trees{'index_no_node'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -629,7 +656,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'top section1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -648,7 +675,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -669,7 +698,8 @@ $result_trees{'index_no_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -686,7 +716,7 @@ $result_trees{'index_no_node'} = {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -708,7 +738,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -719,7 +749,9 @@ $result_trees{'index_no_node'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -736,7 +768,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'second'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -755,7 +787,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -779,7 +813,7 @@ $result_trees{'index_no_node'} = {
                       'text' => 'second'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -798,7 +832,9 @@ $result_trees{'index_no_node'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -824,7 +860,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -835,7 +871,9 @@ $result_trees{'index_no_node'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -845,7 +883,8 @@ $result_trees{'index_no_node'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -862,7 +901,7 @@ $result_trees{'index_no_node'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -879,7 +918,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'chapter'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -898,7 +937,9 @@ $result_trees{'index_no_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -921,7 +962,7 @@ $result_trees{'index_no_node'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -932,7 +973,9 @@ $result_trees{'index_no_node'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -955,7 +998,7 @@ $result_trees{'index_no_node'} = {
                       'text' => 'Chapter2'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -974,7 +1017,9 @@ $result_trees{'index_no_node'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -993,7 +1038,8 @@ $result_trees{'index_no_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1010,7 +1056,7 @@ $result_trees{'index_no_node'} = {
               'text' => 'Chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1039,7 +1085,8 @@ $result_trees{'index_no_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1201,6 +1248,7 @@ $result_sectioning{'index_no_node'} = {
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_up' => {}
@@ -1209,11 +1257,13 @@ $result_sectioning{'index_no_node'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_up' => {}
@@ -1229,6 +1279,7 @@ $result_sectioning{'index_no_node'} = {
       {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -1241,6 +1292,7 @@ $result_sectioning{'index_no_node'} = {
       {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 2,
diff --git a/tp/t/results/moreindices/index_split.pl 
b/tp/t/results/moreindices/index_split.pl
index 8f8e819d88..e72e2bc30f 100644
--- a/tp/t/results/moreindices/index_split.pl
+++ b/tp/t/results/moreindices/index_split.pl
@@ -39,7 +39,7 @@ $result_trees{'index_split'} = {
                       'text' => 'index_split'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'index_split'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'index_split'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -97,7 +99,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -114,7 +118,7 @@ $result_trees{'index_split'} = {
               'text' => 'split indices'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -131,7 +135,7 @@ $result_trees{'index_split'} = {
                   'text' => 'entry a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -151,7 +155,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -174,7 +180,7 @@ $result_trees{'index_split'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -185,7 +191,9 @@ $result_trees{'index_split'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -207,7 +215,7 @@ $result_trees{'index_split'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -218,7 +226,9 @@ $result_trees{'index_split'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -254,7 +264,7 @@ $result_trees{'index_split'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -265,7 +275,9 @@ $result_trees{'index_split'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -282,7 +294,7 @@ $result_trees{'index_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -446,7 +458,7 @@ $result_trees{'index_split'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -455,9 +467,11 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 21,
@@ -477,7 +491,8 @@ $result_trees{'index_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -494,7 +509,7 @@ $result_trees{'index_split'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -522,7 +537,7 @@ $result_trees{'index_split'} = {
                       'text' => 'entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -542,7 +557,9 @@ $result_trees{'index_split'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -560,7 +577,7 @@ $result_trees{'index_split'} = {
                       'text' => '! entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -580,7 +597,9 @@ $result_trees{'index_split'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -598,7 +617,7 @@ $result_trees{'index_split'} = {
                       'text' => 'fun in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -618,7 +637,9 @@ $result_trees{'index_split'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'findex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -636,7 +657,7 @@ $result_trees{'index_split'} = {
                       'text' => 'entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -656,7 +677,9 @@ $result_trees{'index_split'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -682,7 +705,7 @@ $result_trees{'index_split'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -693,7 +716,9 @@ $result_trees{'index_split'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -715,7 +740,7 @@ $result_trees{'index_split'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -726,7 +751,9 @@ $result_trees{'index_split'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -748,7 +775,7 @@ $result_trees{'index_split'} = {
                   'text' => 'entry after printindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -768,7 +795,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -797,7 +826,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -814,7 +845,7 @@ $result_trees{'index_split'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -831,7 +862,7 @@ $result_trees{'index_split'} = {
                   'text' => 'a function'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -851,7 +882,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -869,7 +902,7 @@ $result_trees{'index_split'} = {
                   'text' => 'a concept in first'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -889,7 +922,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -907,7 +942,7 @@ $result_trees{'index_split'} = {
                   'text' => 'somewhere'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -927,7 +962,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -945,7 +982,7 @@ $result_trees{'index_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1256,7 +1293,7 @@ $result_trees{'index_split'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1265,9 +1302,11 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 49,
@@ -1287,7 +1326,8 @@ $result_trees{'index_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1304,7 +1344,7 @@ $result_trees{'index_split'} = {
               'text' => 'section 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1325,7 +1365,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'section-1'
           }
         ],
-        'normalized' => 'section-1',
+        'normalized' => 'section-1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1342,7 +1384,7 @@ $result_trees{'index_split'} = {
               'text' => 'Section 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1364,7 +1406,7 @@ $result_trees{'index_split'} = {
                   'text' => 'something'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1384,7 +1426,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1402,7 +1446,7 @@ $result_trees{'index_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -1517,7 +1561,7 @@ $result_trees{'index_split'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1526,9 +1570,11 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 59,
@@ -1564,7 +1610,7 @@ $result_trees{'index_split'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1575,7 +1621,9 @@ $result_trees{'index_split'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1597,7 +1645,7 @@ $result_trees{'index_split'} = {
                   'text' => 'another'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1617,7 +1665,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1633,7 +1683,8 @@ $result_trees{'index_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1650,7 +1701,7 @@ $result_trees{'index_split'} = {
               'text' => 'subsection 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1670,7 +1721,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'subsection-1'
           }
         ],
-        'normalized' => 'subsection-1',
+        'normalized' => 'subsection-1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1687,7 +1740,7 @@ $result_trees{'index_split'} = {
               'text' => 'Subsection 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1716,7 +1769,8 @@ $result_trees{'index_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1733,7 +1787,7 @@ $result_trees{'index_split'} = {
               'text' => 'subsection 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1754,7 +1808,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'subsection-2'
           }
         ],
-        'normalized' => 'subsection-2',
+        'normalized' => 'subsection-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1771,7 +1827,7 @@ $result_trees{'index_split'} = {
               'text' => 'Subsection 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1807,7 +1863,7 @@ $result_trees{'index_split'} = {
                   'text' => 'subsection 2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1827,7 +1883,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1850,7 +1908,7 @@ $result_trees{'index_split'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1861,7 +1919,9 @@ $result_trees{'index_split'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1883,7 +1943,7 @@ $result_trees{'index_split'} = {
                   'text' => 'printindex subsection 2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1903,7 +1963,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1919,7 +1981,8 @@ $result_trees{'index_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1936,7 +1999,7 @@ $result_trees{'index_split'} = {
               'text' => 'section 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1956,7 +2019,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'section-2'
           }
         ],
-        'normalized' => 'section-2',
+        'normalized' => 'section-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1973,7 +2038,7 @@ $result_trees{'index_split'} = {
               'text' => 'Section 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2002,7 +2067,8 @@ $result_trees{'index_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2019,7 +2085,7 @@ $result_trees{'index_split'} = {
               'text' => 'section 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2040,7 +2106,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'section-3'
           }
         ],
-        'normalized' => 'section-3',
+        'normalized' => 'section-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2057,7 +2125,7 @@ $result_trees{'index_split'} = {
               'text' => 'Section 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2079,7 +2147,7 @@ $result_trees{'index_split'} = {
                   'text' => 'section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2099,7 +2167,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2122,7 +2192,7 @@ $result_trees{'index_split'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2133,7 +2203,9 @@ $result_trees{'index_split'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2148,7 +2220,8 @@ $result_trees{'index_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2184,7 +2257,7 @@ $result_trees{'index_split'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2206,7 +2279,7 @@ $result_trees{'index_split'} = {
                   'text' => 'node in section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2226,7 +2299,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2276,7 +2351,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'node-in-section-3',
+        'normalized' => 'node-in-section-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2307,7 +2384,7 @@ $result_trees{'index_split'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2329,7 +2406,7 @@ $result_trees{'index_split'} = {
                   'text' => 'node 2 in section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2349,7 +2426,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2381,7 +2460,7 @@ $result_trees{'index_split'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2392,7 +2471,9 @@ $result_trees{'index_split'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2414,7 +2495,7 @@ $result_trees{'index_split'} = {
                   'text' => 'between printindex node in section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2434,7 +2515,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2457,7 +2540,7 @@ $result_trees{'index_split'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2468,7 +2551,9 @@ $result_trees{'index_split'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2490,7 +2575,7 @@ $result_trees{'index_split'} = {
                   'text' => 'after second printindex node in section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2510,7 +2595,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2547,7 +2634,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'node-2-in-section-3',
+        'normalized' => 'node-2-in-section-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2578,7 +2667,7 @@ $result_trees{'index_split'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2600,7 +2689,7 @@ $result_trees{'index_split'} = {
                   'text' => 'node 3 in section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2620,7 +2709,9 @@ $result_trees{'index_split'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2656,7 +2747,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'node-3-in-section-3',
+        'normalized' => 'node-3-in-section-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2673,7 +2766,7 @@ $result_trees{'index_split'} = {
               'text' => 'second chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2693,7 +2786,9 @@ $result_trees{'index_split'} = {
             'normalized' => 'second-chapter'
           }
         ],
-        'normalized' => 'second-chapter',
+        'normalized' => 'second-chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2710,7 +2805,7 @@ $result_trees{'index_split'} = {
               'text' => 'Second chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2739,7 +2834,8 @@ $result_trees{'index_split'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3103,9 +3199,11 @@ $result_sectioning{'index_split'} = {
               'isindex' => 1,
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -3117,9 +3215,11 @@ $result_sectioning{'index_split'} = {
                     'isindex' => 1,
                     'normalized' => 'first'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -3131,9 +3231,11 @@ $result_sectioning{'index_split'} = {
                           'isindex' => 1,
                           'normalized' => 'section-1'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -3144,9 +3246,11 @@ $result_sectioning{'index_split'} = {
                               'extra' => {
                                 'normalized' => 'subsection-1'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -3162,9 +3266,11 @@ $result_sectioning{'index_split'} = {
                                 'isindex' => 1,
                                 'normalized' => 'subsection-2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.2',
@@ -3186,9 +3292,11 @@ $result_sectioning{'index_split'} = {
                         'extra' => {
                           'normalized' => 'section-2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.2',
@@ -3205,9 +3313,11 @@ $result_sectioning{'index_split'} = {
                           'isindex' => 1,
                           'normalized' => 'section-3'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.3',
@@ -3231,9 +3341,11 @@ $result_sectioning{'index_split'} = {
                   'extra' => {
                     'normalized' => 'second-chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -3275,6 +3387,7 @@ $result_nodes{'index_split'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
@@ -3285,6 +3398,7 @@ $result_nodes{'index_split'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {},
     'node_next' => {
@@ -3293,6 +3407,7 @@ $result_nodes{'index_split'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -3305,6 +3420,7 @@ $result_nodes{'index_split'} = {
         ],
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -3312,6 +3428,7 @@ $result_nodes{'index_split'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -3324,6 +3441,7 @@ $result_nodes{'index_split'} = {
             ],
             'normalized' => 'section-1'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -3331,12 +3449,14 @@ $result_nodes{'index_split'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection-1'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -3344,6 +3464,7 @@ $result_nodes{'index_split'} = {
                     'associated_section' => {
                       'cmdname' => 'subsection',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => '1.1.2'
                       }
@@ -3351,6 +3472,7 @@ $result_nodes{'index_split'} = {
                     'isindex' => 1,
                     'normalized' => 'subsection-2'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -3365,12 +3487,14 @@ $result_nodes{'index_split'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.2'
                   }
                 },
                 'normalized' => 'section-2'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -3378,6 +3502,7 @@ $result_nodes{'index_split'} = {
                     'associated_section' => {
                       'cmdname' => 'section',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => '1.3'
                       }
@@ -3385,12 +3510,14 @@ $result_nodes{'index_split'} = {
                     'isindex' => 1,
                     'normalized' => 'section-3'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'node-in-section-3'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_prev' => {},
                         'node_up' => {}
@@ -3413,12 +3540,14 @@ $result_nodes{'index_split'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'second-chapter'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -3452,6 +3581,7 @@ $result_menus{'index_split'} = {
     'isindex' => 1,
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {},
     'menu_next' => {
@@ -3460,6 +3590,7 @@ $result_menus{'index_split'} = {
         'isindex' => 1,
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -3467,12 +3598,14 @@ $result_menus{'index_split'} = {
             'isindex' => 1,
             'normalized' => 'section-1'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection-1'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
@@ -3480,6 +3613,7 @@ $result_menus{'index_split'} = {
                     'isindex' => 1,
                     'normalized' => 'subsection-2'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
@@ -3499,6 +3633,7 @@ $result_menus{'index_split'} = {
               'extra' => {
                 'normalized' => 'section-2'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
@@ -3506,12 +3641,14 @@ $result_menus{'index_split'} = {
                     'isindex' => 1,
                     'normalized' => 'section-3'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'node-in-section-3'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
@@ -3519,12 +3656,14 @@ $result_menus{'index_split'} = {
                             'isindex' => 1,
                             'normalized' => 'node-2-in-section-3'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 'node-3-in-section-3'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_prev' => {},
                                 'menu_up' => {},
@@ -3572,6 +3711,7 @@ $result_menus{'index_split'} = {
           'extra' => {
             'normalized' => 'second-chapter'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/moreindices/index_split_nodes.pl 
b/tp/t/results/moreindices/index_split_nodes.pl
index d9181f1971..c208d63ffd 100644
--- a/tp/t/results/moreindices/index_split_nodes.pl
+++ b/tp/t/results/moreindices/index_split_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'index_split_nodes'} = {
                       'text' => 'index_split'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'index_split_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'index_split'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -97,7 +99,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -114,7 +118,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'split indices'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -131,7 +135,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'entry a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -151,7 +155,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -174,7 +180,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -185,7 +191,9 @@ $result_trees{'index_split_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -207,7 +215,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -218,7 +226,9 @@ $result_trees{'index_split_nodes'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -254,7 +264,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -265,7 +275,9 @@ $result_trees{'index_split_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -282,7 +294,7 @@ $result_trees{'index_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -446,7 +458,7 @@ $result_trees{'index_split_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -455,9 +467,11 @@ $result_trees{'index_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 21,
@@ -477,7 +491,8 @@ $result_trees{'index_split_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -494,7 +509,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -522,7 +537,7 @@ $result_trees{'index_split_nodes'} = {
                       'text' => 'entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -542,7 +557,9 @@ $result_trees{'index_split_nodes'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -560,7 +577,7 @@ $result_trees{'index_split_nodes'} = {
                       'text' => '! entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -580,7 +597,9 @@ $result_trees{'index_split_nodes'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -598,7 +617,7 @@ $result_trees{'index_split_nodes'} = {
                       'text' => 'fun in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -618,7 +637,9 @@ $result_trees{'index_split_nodes'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'findex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -636,7 +657,7 @@ $result_trees{'index_split_nodes'} = {
                       'text' => 'entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -656,7 +677,9 @@ $result_trees{'index_split_nodes'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -682,7 +705,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -693,7 +716,9 @@ $result_trees{'index_split_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -715,7 +740,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -726,7 +751,9 @@ $result_trees{'index_split_nodes'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -748,7 +775,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'entry after printindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -768,7 +795,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -797,7 +826,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -814,7 +845,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -831,7 +862,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'a function'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -851,7 +882,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -869,7 +902,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'a concept in first'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -889,7 +922,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -907,7 +942,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'somewhere'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -927,7 +962,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -945,7 +982,7 @@ $result_trees{'index_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1256,7 +1293,7 @@ $result_trees{'index_split_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1265,9 +1302,11 @@ $result_trees{'index_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 49,
@@ -1287,7 +1326,8 @@ $result_trees{'index_split_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1304,7 +1344,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'section 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1325,7 +1365,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'section-1'
           }
         ],
-        'normalized' => 'section-1',
+        'normalized' => 'section-1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1342,7 +1384,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'Section 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1364,7 +1406,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'something'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1384,7 +1426,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1402,7 +1446,7 @@ $result_trees{'index_split_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -1517,7 +1561,7 @@ $result_trees{'index_split_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1526,9 +1570,11 @@ $result_trees{'index_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 59,
@@ -1564,7 +1610,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1575,7 +1621,9 @@ $result_trees{'index_split_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1597,7 +1645,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'another'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1617,7 +1665,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1633,7 +1683,8 @@ $result_trees{'index_split_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1650,7 +1701,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'subsection 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1670,7 +1721,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'subsection-1'
           }
         ],
-        'normalized' => 'subsection-1',
+        'normalized' => 'subsection-1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1687,7 +1740,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'Subsection 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1716,7 +1769,8 @@ $result_trees{'index_split_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1733,7 +1787,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'subsection 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1754,7 +1808,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'subsection-2'
           }
         ],
-        'normalized' => 'subsection-2',
+        'normalized' => 'subsection-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1771,7 +1827,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'Subsection 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1807,7 +1863,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'subsection 2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1827,7 +1883,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1850,7 +1908,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1861,7 +1919,9 @@ $result_trees{'index_split_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1883,7 +1943,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'printindex subsection 2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1903,7 +1963,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1919,7 +1981,8 @@ $result_trees{'index_split_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1936,7 +1999,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'section 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1956,7 +2019,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'section-2'
           }
         ],
-        'normalized' => 'section-2',
+        'normalized' => 'section-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1973,7 +2038,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'Section 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2002,7 +2067,8 @@ $result_trees{'index_split_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2019,7 +2085,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'section 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2040,7 +2106,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'section-3'
           }
         ],
-        'normalized' => 'section-3',
+        'normalized' => 'section-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2057,7 +2125,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'Section 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2079,7 +2147,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2099,7 +2167,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2122,7 +2192,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2133,7 +2203,9 @@ $result_trees{'index_split_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2148,7 +2220,8 @@ $result_trees{'index_split_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2184,7 +2257,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2206,7 +2279,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'node in section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2226,7 +2299,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2276,7 +2351,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'node-in-section-3',
+        'normalized' => 'node-in-section-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2307,7 +2384,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2329,7 +2406,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'node 2 in section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2349,7 +2426,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2381,7 +2460,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2392,7 +2471,9 @@ $result_trees{'index_split_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2414,7 +2495,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'between printindex node in section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2434,7 +2515,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2457,7 +2540,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2468,7 +2551,9 @@ $result_trees{'index_split_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2490,7 +2575,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'after second printindex node in section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2510,7 +2595,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2547,7 +2634,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'node-2-in-section-3',
+        'normalized' => 'node-2-in-section-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2578,7 +2667,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2600,7 +2689,7 @@ $result_trees{'index_split_nodes'} = {
                   'text' => 'node 3 in section 3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2620,7 +2709,9 @@ $result_trees{'index_split_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2656,7 +2747,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'node-3-in-section-3',
+        'normalized' => 'node-3-in-section-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2673,7 +2766,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'second chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2693,7 +2786,9 @@ $result_trees{'index_split_nodes'} = {
             'normalized' => 'second-chapter'
           }
         ],
-        'normalized' => 'second-chapter',
+        'normalized' => 'second-chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2710,7 +2805,7 @@ $result_trees{'index_split_nodes'} = {
               'text' => 'Second chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2739,7 +2834,8 @@ $result_trees{'index_split_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3103,9 +3199,11 @@ $result_sectioning{'index_split_nodes'} = {
               'isindex' => 1,
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -3117,9 +3215,11 @@ $result_sectioning{'index_split_nodes'} = {
                     'isindex' => 1,
                     'normalized' => 'first'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -3131,9 +3231,11 @@ $result_sectioning{'index_split_nodes'} = {
                           'isindex' => 1,
                           'normalized' => 'section-1'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -3144,9 +3246,11 @@ $result_sectioning{'index_split_nodes'} = {
                               'extra' => {
                                 'normalized' => 'subsection-1'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -3162,9 +3266,11 @@ $result_sectioning{'index_split_nodes'} = {
                                 'isindex' => 1,
                                 'normalized' => 'subsection-2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.2',
@@ -3186,9 +3292,11 @@ $result_sectioning{'index_split_nodes'} = {
                         'extra' => {
                           'normalized' => 'section-2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.2',
@@ -3205,9 +3313,11 @@ $result_sectioning{'index_split_nodes'} = {
                           'isindex' => 1,
                           'normalized' => 'section-3'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.3',
@@ -3231,9 +3341,11 @@ $result_sectioning{'index_split_nodes'} = {
                   'extra' => {
                     'normalized' => 'second-chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -3275,6 +3387,7 @@ $result_nodes{'index_split_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
@@ -3285,6 +3398,7 @@ $result_nodes{'index_split_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {},
     'node_next' => {
@@ -3293,6 +3407,7 @@ $result_nodes{'index_split_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -3305,6 +3420,7 @@ $result_nodes{'index_split_nodes'} = {
         ],
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -3312,6 +3428,7 @@ $result_nodes{'index_split_nodes'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -3324,6 +3441,7 @@ $result_nodes{'index_split_nodes'} = {
             ],
             'normalized' => 'section-1'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -3331,12 +3449,14 @@ $result_nodes{'index_split_nodes'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection-1'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -3344,6 +3464,7 @@ $result_nodes{'index_split_nodes'} = {
                     'associated_section' => {
                       'cmdname' => 'subsection',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => '1.1.2'
                       }
@@ -3351,6 +3472,7 @@ $result_nodes{'index_split_nodes'} = {
                     'isindex' => 1,
                     'normalized' => 'subsection-2'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -3365,12 +3487,14 @@ $result_nodes{'index_split_nodes'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.2'
                   }
                 },
                 'normalized' => 'section-2'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -3378,6 +3502,7 @@ $result_nodes{'index_split_nodes'} = {
                     'associated_section' => {
                       'cmdname' => 'section',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => '1.3'
                       }
@@ -3385,12 +3510,14 @@ $result_nodes{'index_split_nodes'} = {
                     'isindex' => 1,
                     'normalized' => 'section-3'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'node-in-section-3'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_prev' => {},
                         'node_up' => {}
@@ -3413,12 +3540,14 @@ $result_nodes{'index_split_nodes'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'second-chapter'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -3452,6 +3581,7 @@ $result_menus{'index_split_nodes'} = {
     'isindex' => 1,
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {},
     'menu_next' => {
@@ -3460,6 +3590,7 @@ $result_menus{'index_split_nodes'} = {
         'isindex' => 1,
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -3467,12 +3598,14 @@ $result_menus{'index_split_nodes'} = {
             'isindex' => 1,
             'normalized' => 'section-1'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection-1'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
@@ -3480,6 +3613,7 @@ $result_menus{'index_split_nodes'} = {
                     'isindex' => 1,
                     'normalized' => 'subsection-2'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
@@ -3499,6 +3633,7 @@ $result_menus{'index_split_nodes'} = {
               'extra' => {
                 'normalized' => 'section-2'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
@@ -3506,12 +3641,14 @@ $result_menus{'index_split_nodes'} = {
                     'isindex' => 1,
                     'normalized' => 'section-3'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'node-in-section-3'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
@@ -3519,12 +3656,14 @@ $result_menus{'index_split_nodes'} = {
                             'isindex' => 1,
                             'normalized' => 'node-2-in-section-3'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 'node-3-in-section-3'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_prev' => {},
                                 'menu_up' => {},
@@ -3572,6 +3711,7 @@ $result_menus{'index_split_nodes'} = {
           'extra' => {
             'normalized' => 'second-chapter'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/moreindices/nodes_before_top.pl 
b/tp/t/results/moreindices/nodes_before_top.pl
index f4305ef46f..eb707eb637 100644
--- a/tp/t/results/moreindices/nodes_before_top.pl
+++ b/tp/t/results/moreindices/nodes_before_top.pl
@@ -39,7 +39,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'index_nodes'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'index_nodes'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 3,
@@ -89,13 +91,13 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -112,7 +114,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -129,7 +131,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'first before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -149,7 +151,9 @@ $result_trees{'nodes_before_top'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -167,7 +171,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -178,7 +182,9 @@ $result_trees{'nodes_before_top'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -199,7 +205,7 @@ $result_trees{'nodes_before_top'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -265,7 +271,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -274,9 +280,11 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 12,
@@ -321,7 +329,9 @@ $result_trees{'nodes_before_top'} = {
             ]
           }
         ],
-        'normalized' => 'first-before-top',
+        'normalized' => 'first-before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -352,7 +362,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'first before top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -374,7 +384,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'node in menu before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -394,7 +404,9 @@ $result_trees{'nodes_before_top'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -423,7 +435,9 @@ $result_trees{'nodes_before_top'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -454,7 +468,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'printindex node in menu before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -474,7 +488,9 @@ $result_trees{'nodes_before_top'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -516,7 +532,9 @@ $result_trees{'nodes_before_top'} = {
             'normalized' => 'first-before-top'
           }
         ],
-        'normalized' => 'node-in-menu-before-top',
+        'normalized' => 'node-in-menu-before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -536,7 +554,7 @@ $result_trees{'nodes_before_top'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -547,7 +565,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'first before top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -564,7 +582,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'entry a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -584,7 +602,9 @@ $result_trees{'nodes_before_top'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -607,7 +627,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -618,7 +638,9 @@ $result_trees{'nodes_before_top'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -640,7 +662,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -651,7 +673,9 @@ $result_trees{'nodes_before_top'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -687,7 +711,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -698,7 +722,9 @@ $result_trees{'nodes_before_top'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -715,7 +741,7 @@ $result_trees{'nodes_before_top'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -781,7 +807,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -790,9 +816,11 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 36,
@@ -832,7 +860,9 @@ $result_trees{'nodes_before_top'} = {
             'normalized' => 'first-before-top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -868,7 +898,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -892,7 +922,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => '! entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -912,7 +942,9 @@ $result_trees{'nodes_before_top'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -930,7 +962,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'fun in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -950,7 +982,9 @@ $result_trees{'nodes_before_top'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'findex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -968,7 +1002,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -988,7 +1022,9 @@ $result_trees{'nodes_before_top'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1014,7 +1050,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1025,7 +1061,9 @@ $result_trees{'nodes_before_top'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1042,7 +1080,7 @@ $result_trees{'nodes_before_top'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1108,7 +1146,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1117,9 +1155,11 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 48,
@@ -1165,7 +1205,9 @@ $result_trees{'nodes_before_top'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1196,7 +1238,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1208,7 +1250,7 @@ $result_trees{'nodes_before_top'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1323,7 +1365,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1332,9 +1374,11 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 54,
@@ -1361,7 +1405,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1372,7 +1416,9 @@ $result_trees{'nodes_before_top'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1408,7 +1454,9 @@ $result_trees{'nodes_before_top'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'second',
+        'normalized' => 'second'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1428,7 +1476,7 @@ $result_trees{'nodes_before_top'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1439,7 +1487,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'a node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1450,7 +1498,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -1473,7 +1521,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'something'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1493,7 +1541,9 @@ $result_trees{'nodes_before_top'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1511,7 +1561,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'somewhere'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1531,7 +1581,9 @@ $result_trees{'nodes_before_top'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1549,7 +1601,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'another'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1569,7 +1621,9 @@ $result_trees{'nodes_before_top'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1610,7 +1664,9 @@ $result_trees{'nodes_before_top'} = {
             'normalized' => 'second'
           }
         ],
-        'normalized' => 'another',
+        'normalized' => 'another'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1635,13 +1691,13 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'another'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1652,7 +1708,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1669,7 +1725,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'entry after printindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1689,7 +1745,9 @@ $result_trees{'nodes_before_top'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1712,7 +1770,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1723,7 +1781,9 @@ $result_trees{'nodes_before_top'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1745,7 +1805,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'a function'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1765,7 +1825,9 @@ $result_trees{'nodes_before_top'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1783,7 +1845,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'a concept a node'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1803,7 +1865,9 @@ $result_trees{'nodes_before_top'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1826,7 +1890,7 @@ $result_trees{'nodes_before_top'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1837,7 +1901,9 @@ $result_trees{'nodes_before_top'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1878,7 +1944,9 @@ $result_trees{'nodes_before_top'} = {
             'normalized' => 'second'
           }
         ],
-        'normalized' => 'a-node',
+        'normalized' => 'a-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2111,6 +2179,7 @@ $result_nodes{'nodes_before_top'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2123,6 +2192,7 @@ $result_nodes{'nodes_before_top'} = {
         ],
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2135,6 +2205,7 @@ $result_nodes{'nodes_before_top'} = {
             ],
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -2142,12 +2213,14 @@ $result_nodes{'nodes_before_top'} = {
                 'isindex' => 1,
                 'normalized' => 'a-node'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'another'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2174,6 +2247,7 @@ $result_nodes{'nodes_before_top'} = {
         ],
         'normalized' => 'first-before-top'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2181,6 +2255,7 @@ $result_nodes{'nodes_before_top'} = {
             'isindex' => 1,
             'normalized' => 'node-in-menu-before-top'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -2214,6 +2289,7 @@ $result_menus{'nodes_before_top'} = {
     'isindex' => 1,
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2221,6 +2297,7 @@ $result_menus{'nodes_before_top'} = {
         'isindex' => 1,
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2228,6 +2305,7 @@ $result_menus{'nodes_before_top'} = {
             'isindex' => 1,
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -2235,12 +2313,14 @@ $result_menus{'nodes_before_top'} = {
                 'isindex' => 1,
                 'normalized' => 'a-node'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'another'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git 
a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl 
b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
index 96cf2e6c22..264d0ab762 100644
--- a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
+++ b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
@@ -39,7 +39,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
                       'text' => 'more_before_top_section'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'more_before_top_section'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 3,
@@ -89,13 +91,13 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -112,7 +114,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -129,7 +131,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'first before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -149,7 +151,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -181,7 +185,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -192,7 +196,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -218,7 +224,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -229,7 +235,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -250,7 +258,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -316,7 +324,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -325,9 +333,11 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 16,
@@ -372,7 +382,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
             ]
           }
         ],
-        'normalized' => 'first-before-top',
+        'normalized' => 'first-before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -403,7 +415,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               'text' => 'first before top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -425,7 +437,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'node in menu before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -445,7 +457,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -472,7 +486,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -483,7 +497,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -514,7 +530,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'printindex node in menu before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -534,7 +550,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -576,7 +594,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
             'normalized' => 'first-before-top'
           }
         ],
-        'normalized' => 'node-in-menu-before-top',
+        'normalized' => 'node-in-menu-before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -596,7 +616,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -607,7 +627,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               'text' => 'first before top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -624,7 +644,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'entry a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -644,7 +664,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -671,7 +693,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -682,7 +704,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -704,7 +728,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -715,7 +739,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -751,7 +777,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -762,7 +788,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -797,7 +825,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
             'normalized' => 'first-before-top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -814,7 +844,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -831,7 +861,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
                   'text' => 'top section'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -851,7 +881,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -883,7 +915,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1047,7 +1079,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1056,9 +1088,11 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 48,
@@ -1078,7 +1112,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1114,7 +1149,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -1138,7 +1173,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                       'text' => '! entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1158,7 +1193,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1176,7 +1213,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                       'text' => 'fun in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1196,7 +1233,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'findex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1214,7 +1253,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                       'text' => 'entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1234,7 +1273,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1260,7 +1301,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1271,7 +1312,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1288,7 +1331,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1354,7 +1397,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1363,9 +1406,11 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 60,
@@ -1411,7 +1456,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1442,7 +1489,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1454,7 +1501,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1569,7 +1616,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1578,9 +1625,11 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 66,
@@ -1607,7 +1656,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1618,7 +1667,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1654,7 +1705,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'second',
+        'normalized' => 'second'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1674,7 +1727,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1685,7 +1738,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'text' => 'a node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1696,7 +1749,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -1719,7 +1772,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'something'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1739,7 +1792,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1757,7 +1812,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'somewhere'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1777,7 +1832,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1795,7 +1852,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'another'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1815,7 +1872,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1856,7 +1915,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
             'normalized' => 'second'
           }
         ],
-        'normalized' => 'another',
+        'normalized' => 'another'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1881,13 +1942,13 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
               'text' => 'another'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1898,7 +1959,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1915,7 +1976,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'entry after printindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1935,7 +1996,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1958,7 +2021,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1969,7 +2032,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1991,7 +2056,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'a function'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2011,7 +2076,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2029,7 +2096,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'a concept a node'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2049,7 +2116,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2072,7 +2141,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2083,7 +2152,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2124,7 +2195,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
             'normalized' => 'second'
           }
         ],
-        'normalized' => 'a-node',
+        'normalized' => 'a-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2160,7 +2233,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2194,7 +2267,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2211,7 +2286,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'text' => 'A chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2233,7 +2308,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2244,7 +2319,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2259,7 +2336,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2287,7 +2365,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -2298,7 +2376,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2320,7 +2398,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
                   'text' => 'node in chapter'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2340,7 +2418,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2381,7 +2461,9 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'node-in-chapter',
+        'normalized' => 'node-in-chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2673,9 +2755,11 @@ 
$result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
               'isindex' => 1,
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -2687,9 +2771,11 @@ 
$result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2718,6 +2804,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'isindex' => 1,
@@ -2728,6 +2815,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2740,6 +2828,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
         ],
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2752,6 +2841,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
             ],
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -2759,12 +2849,14 @@ 
$result_nodes{'nodes_before_top_and_sections_monolithic'} = {
                 'isindex' => 1,
                 'normalized' => 'a-node'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'another'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2791,6 +2883,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
         ],
         'normalized' => 'first-before-top'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2798,6 +2891,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
             'isindex' => 1,
             'normalized' => 'node-in-menu-before-top'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -2831,6 +2925,7 @@ $result_menus{'nodes_before_top_and_sections_monolithic'} 
= {
     'isindex' => 1,
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2838,6 +2933,7 @@ $result_menus{'nodes_before_top_and_sections_monolithic'} 
= {
         'isindex' => 1,
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2845,6 +2941,7 @@ $result_menus{'nodes_before_top_and_sections_monolithic'} 
= {
             'isindex' => 1,
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -2852,12 +2949,14 @@ 
$result_menus{'nodes_before_top_and_sections_monolithic'} = {
                 'isindex' => 1,
                 'normalized' => 'a-node'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'another'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
@@ -2884,12 +2983,14 @@ 
$result_menus{'nodes_before_top_and_sections_monolithic'} = {
             'isindex' => 1,
             'normalized' => 'chapter'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'node-in-chapter'
               },
+              'info' => {},
               'structure' => {
                 'menu_prev' => {},
                 'menu_up' => {},
diff --git a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl 
b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
index 2bdc18c86c..0f9e0e3fba 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                       'text' => 'index_nodes'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'index_nodes'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 3,
@@ -89,13 +91,13 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -112,7 +114,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -129,7 +131,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'first before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -149,7 +151,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -167,7 +171,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -178,7 +182,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -199,7 +205,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -265,7 +271,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -274,9 +280,11 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 12,
@@ -321,7 +329,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
             ]
           }
         ],
-        'normalized' => 'first-before-top',
+        'normalized' => 'first-before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -352,7 +362,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'text' => 'first before top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -374,7 +384,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'node in menu before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -394,7 +404,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -423,7 +435,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -454,7 +468,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'printindex node in menu before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -474,7 +488,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -516,7 +532,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
             'normalized' => 'first-before-top'
           }
         ],
-        'normalized' => 'node-in-menu-before-top',
+        'normalized' => 'node-in-menu-before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -536,7 +554,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -547,7 +565,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'text' => 'first before top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -564,7 +582,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'entry a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -584,7 +602,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -607,7 +627,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -618,7 +638,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -640,7 +662,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -651,7 +673,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -687,7 +711,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -698,7 +722,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -715,7 +741,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -781,7 +807,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -790,9 +816,11 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 36,
@@ -832,7 +860,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
             'normalized' => 'first-before-top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -868,7 +898,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -892,7 +922,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                       'text' => '! entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -912,7 +942,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -930,7 +962,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                       'text' => 'fun in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -950,7 +982,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'findex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -968,7 +1002,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                       'text' => 'entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -988,7 +1022,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1014,7 +1050,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1025,7 +1061,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1042,7 +1080,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1108,7 +1146,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1117,9 +1155,11 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 48,
@@ -1165,7 +1205,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1196,7 +1238,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1208,7 +1250,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1323,7 +1365,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1332,9 +1374,11 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 54,
@@ -1361,7 +1405,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1372,7 +1416,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1408,7 +1454,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'second',
+        'normalized' => 'second'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1428,7 +1476,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1439,7 +1487,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'text' => 'a node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1450,7 +1498,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -1473,7 +1521,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'something'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1493,7 +1541,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1511,7 +1561,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'somewhere'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1531,7 +1581,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1549,7 +1601,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'another'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1569,7 +1621,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1610,7 +1664,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
             'normalized' => 'second'
           }
         ],
-        'normalized' => 'another',
+        'normalized' => 'another'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1635,13 +1691,13 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'text' => 'another'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1652,7 +1708,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1669,7 +1725,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'entry after printindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1689,7 +1745,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1712,7 +1770,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1723,7 +1781,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1745,7 +1805,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'a function'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1765,7 +1825,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1783,7 +1845,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'a concept a node'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1803,7 +1865,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1826,7 +1890,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1837,7 +1901,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1878,7 +1944,9 @@ $result_trees{'nodes_before_top_no_nodes'} = {
             'normalized' => 'second'
           }
         ],
-        'normalized' => 'a-node',
+        'normalized' => 'a-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2111,6 +2179,7 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2123,6 +2192,7 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
         ],
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2135,6 +2205,7 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
             ],
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -2142,12 +2213,14 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
                 'isindex' => 1,
                 'normalized' => 'a-node'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'another'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2174,6 +2247,7 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
         ],
         'normalized' => 'first-before-top'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2181,6 +2255,7 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
             'isindex' => 1,
             'normalized' => 'node-in-menu-before-top'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -2214,6 +2289,7 @@ $result_menus{'nodes_before_top_no_nodes'} = {
     'isindex' => 1,
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2221,6 +2297,7 @@ $result_menus{'nodes_before_top_no_nodes'} = {
         'isindex' => 1,
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2228,6 +2305,7 @@ $result_menus{'nodes_before_top_no_nodes'} = {
             'isindex' => 1,
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -2235,12 +2313,14 @@ $result_menus{'nodes_before_top_no_nodes'} = {
                 'isindex' => 1,
                 'normalized' => 'a-node'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'another'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/moreindices/nodes_before_top_nodes.pl 
b/tp/t/results/moreindices/nodes_before_top_nodes.pl
index 346335d88a..c5c177d4d7 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                       'text' => 'index_nodes'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'nodes_before_top_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'index_nodes'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 3,
@@ -89,13 +91,13 @@ $result_trees{'nodes_before_top_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -112,7 +114,7 @@ $result_trees{'nodes_before_top_nodes'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -129,7 +131,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'first before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -149,7 +151,9 @@ $result_trees{'nodes_before_top_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -167,7 +171,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -178,7 +182,9 @@ $result_trees{'nodes_before_top_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -199,7 +205,7 @@ $result_trees{'nodes_before_top_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -265,7 +271,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -274,9 +280,11 @@ $result_trees{'nodes_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 12,
@@ -321,7 +329,9 @@ $result_trees{'nodes_before_top_nodes'} = {
             ]
           }
         ],
-        'normalized' => 'first-before-top',
+        'normalized' => 'first-before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -352,7 +362,7 @@ $result_trees{'nodes_before_top_nodes'} = {
               'text' => 'first before top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -374,7 +384,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'node in menu before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -394,7 +404,9 @@ $result_trees{'nodes_before_top_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -412,7 +424,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -423,7 +435,9 @@ $result_trees{'nodes_before_top_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -454,7 +468,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'printindex node in menu before top'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -474,7 +488,9 @@ $result_trees{'nodes_before_top_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -516,7 +532,9 @@ $result_trees{'nodes_before_top_nodes'} = {
             'normalized' => 'first-before-top'
           }
         ],
-        'normalized' => 'node-in-menu-before-top',
+        'normalized' => 'node-in-menu-before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -536,7 +554,7 @@ $result_trees{'nodes_before_top_nodes'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -547,7 +565,7 @@ $result_trees{'nodes_before_top_nodes'} = {
               'text' => 'first before top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -564,7 +582,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'entry a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -584,7 +602,9 @@ $result_trees{'nodes_before_top_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -607,7 +627,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -618,7 +638,9 @@ $result_trees{'nodes_before_top_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -640,7 +662,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -651,7 +673,9 @@ $result_trees{'nodes_before_top_nodes'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -687,7 +711,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -698,7 +722,9 @@ $result_trees{'nodes_before_top_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -715,7 +741,7 @@ $result_trees{'nodes_before_top_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -781,7 +807,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -790,9 +816,11 @@ $result_trees{'nodes_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 36,
@@ -832,7 +860,9 @@ $result_trees{'nodes_before_top_nodes'} = {
             'normalized' => 'first-before-top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -868,7 +898,7 @@ $result_trees{'nodes_before_top_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -892,7 +922,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                       'text' => '! entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -912,7 +942,9 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -930,7 +962,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                       'text' => 'fun in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -950,7 +982,9 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'findex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -968,7 +1002,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                       'text' => 'entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -988,7 +1022,9 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1014,7 +1050,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1025,7 +1061,9 @@ $result_trees{'nodes_before_top_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1042,7 +1080,7 @@ $result_trees{'nodes_before_top_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1108,7 +1146,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1117,9 +1155,11 @@ $result_trees{'nodes_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 48,
@@ -1165,7 +1205,9 @@ $result_trees{'nodes_before_top_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1196,7 +1238,7 @@ $result_trees{'nodes_before_top_nodes'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1208,7 +1250,7 @@ $result_trees{'nodes_before_top_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1323,7 +1365,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1332,9 +1374,11 @@ $result_trees{'nodes_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 54,
@@ -1361,7 +1405,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1372,7 +1416,9 @@ $result_trees{'nodes_before_top_nodes'} = {
           'extra' => {
             'misc_args' => [
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1408,7 +1454,9 @@ $result_trees{'nodes_before_top_nodes'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'second',
+        'normalized' => 'second'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1428,7 +1476,7 @@ $result_trees{'nodes_before_top_nodes'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1439,7 +1487,7 @@ $result_trees{'nodes_before_top_nodes'} = {
               'text' => 'a node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1450,7 +1498,7 @@ $result_trees{'nodes_before_top_nodes'} = {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -1473,7 +1521,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'something'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1493,7 +1541,9 @@ $result_trees{'nodes_before_top_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1511,7 +1561,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'somewhere'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1531,7 +1581,9 @@ $result_trees{'nodes_before_top_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1549,7 +1601,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'another'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1569,7 +1621,9 @@ $result_trees{'nodes_before_top_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1610,7 +1664,9 @@ $result_trees{'nodes_before_top_nodes'} = {
             'normalized' => 'second'
           }
         ],
-        'normalized' => 'another',
+        'normalized' => 'another'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1635,13 +1691,13 @@ $result_trees{'nodes_before_top_nodes'} = {
               'text' => 'another'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1652,7 +1708,7 @@ $result_trees{'nodes_before_top_nodes'} = {
               'text' => 'second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1669,7 +1725,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'entry after printindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1689,7 +1745,9 @@ $result_trees{'nodes_before_top_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1712,7 +1770,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1723,7 +1781,9 @@ $result_trees{'nodes_before_top_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1745,7 +1805,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'a function'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1765,7 +1825,9 @@ $result_trees{'nodes_before_top_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1783,7 +1845,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'a concept a node'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1803,7 +1865,9 @@ $result_trees{'nodes_before_top_nodes'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1826,7 +1890,7 @@ $result_trees{'nodes_before_top_nodes'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1837,7 +1901,9 @@ $result_trees{'nodes_before_top_nodes'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1878,7 +1944,9 @@ $result_trees{'nodes_before_top_nodes'} = {
             'normalized' => 'second'
           }
         ],
-        'normalized' => 'a-node',
+        'normalized' => 'a-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2111,6 +2179,7 @@ $result_nodes{'nodes_before_top_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2123,6 +2192,7 @@ $result_nodes{'nodes_before_top_nodes'} = {
         ],
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2135,6 +2205,7 @@ $result_nodes{'nodes_before_top_nodes'} = {
             ],
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -2142,12 +2213,14 @@ $result_nodes{'nodes_before_top_nodes'} = {
                 'isindex' => 1,
                 'normalized' => 'a-node'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'another'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2174,6 +2247,7 @@ $result_nodes{'nodes_before_top_nodes'} = {
         ],
         'normalized' => 'first-before-top'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2181,6 +2255,7 @@ $result_nodes{'nodes_before_top_nodes'} = {
             'isindex' => 1,
             'normalized' => 'node-in-menu-before-top'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -2214,6 +2289,7 @@ $result_menus{'nodes_before_top_nodes'} = {
     'isindex' => 1,
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2221,6 +2297,7 @@ $result_menus{'nodes_before_top_nodes'} = {
         'isindex' => 1,
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2228,6 +2305,7 @@ $result_menus{'nodes_before_top_nodes'} = {
             'isindex' => 1,
             'normalized' => 'second'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -2235,12 +2313,14 @@ $result_menus{'nodes_before_top_nodes'} = {
                 'isindex' => 1,
                 'normalized' => 'a-node'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'another'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/moreindices/split_chapter_index.pl 
b/tp/t/results/moreindices/split_chapter_index.pl
index 910d13fd8c..c8d8a9796b 100644
--- a/tp/t/results/moreindices/split_chapter_index.pl
+++ b/tp/t/results/moreindices/split_chapter_index.pl
@@ -39,7 +39,7 @@ $result_trees{'split_chapter_index'} = {
                       'text' => 'split_chapter_index'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'split_chapter_index'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'split_chapter_index'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'split_chapter_index'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'split_chapter_index'} = {
               'text' => 'split indices'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'split_chapter_index'} = {
                   'text' => 'entry a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -150,7 +154,9 @@ $result_trees{'split_chapter_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -187,7 +193,7 @@ $result_trees{'split_chapter_index'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -253,7 +259,7 @@ $result_trees{'split_chapter_index'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -262,9 +268,11 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
                 'line_nr' => 14,
@@ -284,7 +292,8 @@ $result_trees{'split_chapter_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -301,7 +310,7 @@ $result_trees{'split_chapter_index'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -322,7 +331,9 @@ $result_trees{'split_chapter_index'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -339,7 +350,7 @@ $result_trees{'split_chapter_index'} = {
               'text' => 'First chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -367,7 +378,7 @@ $result_trees{'split_chapter_index'} = {
                       'text' => 'entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -387,7 +398,9 @@ $result_trees{'split_chapter_index'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -405,7 +418,7 @@ $result_trees{'split_chapter_index'} = {
                       'text' => '! entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -425,7 +438,9 @@ $result_trees{'split_chapter_index'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -443,7 +458,7 @@ $result_trees{'split_chapter_index'} = {
                       'text' => 'fun in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -463,7 +478,9 @@ $result_trees{'split_chapter_index'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'findex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -481,7 +498,7 @@ $result_trees{'split_chapter_index'} = {
                       'text' => 'entry in node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -501,7 +518,9 @@ $result_trees{'split_chapter_index'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -527,7 +546,7 @@ $result_trees{'split_chapter_index'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -538,7 +557,9 @@ $result_trees{'split_chapter_index'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -560,7 +581,7 @@ $result_trees{'split_chapter_index'} = {
                   'text' => 'entry after printindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -580,7 +601,9 @@ $result_trees{'split_chapter_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -603,7 +626,7 @@ $result_trees{'split_chapter_index'} = {
                   'text' => 'a function'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -623,7 +646,9 @@ $result_trees{'split_chapter_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -641,7 +666,7 @@ $result_trees{'split_chapter_index'} = {
                   'text' => 'a concept in first'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -661,7 +686,9 @@ $result_trees{'split_chapter_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -679,7 +706,7 @@ $result_trees{'split_chapter_index'} = {
                   'text' => 'somewhere'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -699,7 +726,9 @@ $result_trees{'split_chapter_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -717,7 +746,7 @@ $result_trees{'split_chapter_index'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -783,7 +812,7 @@ $result_trees{'split_chapter_index'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -792,9 +821,11 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
                 'line_nr' => 35,
@@ -814,7 +845,8 @@ $result_trees{'split_chapter_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -831,7 +863,7 @@ $result_trees{'split_chapter_index'} = {
               'text' => 'section 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -851,7 +883,9 @@ $result_trees{'split_chapter_index'} = {
             'normalized' => 'section-1'
           }
         ],
-        'normalized' => 'section-1',
+        'normalized' => 'section-1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -868,7 +902,7 @@ $result_trees{'split_chapter_index'} = {
               'text' => 'Section 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -885,7 +919,7 @@ $result_trees{'split_chapter_index'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -951,7 +985,7 @@ $result_trees{'split_chapter_index'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -960,9 +994,11 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
                 'line_nr' => 42,
@@ -989,7 +1025,7 @@ $result_trees{'split_chapter_index'} = {
                   'text' => 'something'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1009,7 +1045,9 @@ $result_trees{'split_chapter_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1032,7 +1070,7 @@ $result_trees{'split_chapter_index'} = {
                   'text' => 'another'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1052,7 +1090,9 @@ $result_trees{'split_chapter_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1068,7 +1108,8 @@ $result_trees{'split_chapter_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1085,7 +1126,7 @@ $result_trees{'split_chapter_index'} = {
               'text' => 'subsection 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1105,7 +1146,9 @@ $result_trees{'split_chapter_index'} = {
             'normalized' => 'subsection-1'
           }
         ],
-        'normalized' => 'subsection-1',
+        'normalized' => 'subsection-1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1122,7 +1165,7 @@ $result_trees{'split_chapter_index'} = {
               'text' => 'Subsection 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1158,7 +1201,7 @@ $result_trees{'split_chapter_index'} = {
                   'text' => 'printindex subsection 2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1178,7 +1221,9 @@ $result_trees{'split_chapter_index'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1194,7 +1239,8 @@ $result_trees{'split_chapter_index'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1382,9 +1428,11 @@ $result_sectioning{'split_chapter_index'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1396,9 +1444,11 @@ $result_sectioning{'split_chapter_index'} = {
                     'isindex' => 1,
                     'normalized' => 'first'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1409,9 +1459,11 @@ $result_sectioning{'split_chapter_index'} = {
                         'extra' => {
                           'normalized' => 'section-1'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1422,9 +1474,11 @@ $result_sectioning{'split_chapter_index'} = {
                               'extra' => {
                                 'normalized' => 'subsection-1'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -1467,6 +1521,7 @@ $result_nodes{'split_chapter_index'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1476,6 +1531,7 @@ $result_nodes{'split_chapter_index'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1483,6 +1539,7 @@ $result_nodes{'split_chapter_index'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1495,6 +1552,7 @@ $result_nodes{'split_chapter_index'} = {
         ],
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1502,6 +1560,7 @@ $result_nodes{'split_chapter_index'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1513,6 +1572,7 @@ $result_nodes{'split_chapter_index'} = {
             ],
             'normalized' => 'section-1'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1520,12 +1580,14 @@ $result_nodes{'split_chapter_index'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection-1'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1551,6 +1613,7 @@ $result_menus{'split_chapter_index'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1558,18 +1621,21 @@ $result_menus{'split_chapter_index'} = {
         'isindex' => 1,
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section-1'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection-1'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/moresectioning/equivalent_nodes.pl 
b/tp/t/results/moresectioning/equivalent_nodes.pl
index 8e9f354f85..ffb176e48d 100644
--- a/tp/t/results/moresectioning/equivalent_nodes.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'equivalent_nodes'} = {
                       'text' => 'equivalent_nodes.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'equivalent_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'equivalent_nodes.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'equivalent_nodes.texi',
                 'line_nr' => 3,
@@ -99,7 +101,7 @@ $result_trees{'equivalent_nodes'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -119,7 +121,7 @@ $result_trees{'equivalent_nodes'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -158,7 +160,9 @@ $result_trees{'equivalent_nodes'} = {
             ]
           }
         ],
-        'normalized' => 'before-top',
+        'normalized' => 'before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -175,7 +179,7 @@ $result_trees{'equivalent_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -206,7 +210,7 @@ $result_trees{'equivalent_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -287,7 +291,7 @@ $result_trees{'equivalent_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -296,9 +300,11 @@ $result_trees{'equivalent_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'equivalent_nodes.texi',
                 'line_nr' => 13,
@@ -330,7 +336,9 @@ $result_trees{'equivalent_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -347,7 +355,7 @@ $result_trees{'equivalent_nodes'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -392,7 +400,7 @@ $result_trees{'equivalent_nodes'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -419,7 +427,7 @@ $result_trees{'equivalent_nodes'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -428,9 +436,11 @@ $result_trees{'equivalent_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'equivalent_nodes.texi',
                 'line_nr' => 19,
@@ -439,7 +449,6 @@ $result_trees{'equivalent_nodes'} = {
             }
           ],
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -447,6 +456,9 @@ $result_trees{'equivalent_nodes'} = {
               'normalized' => 'Figure'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => 'equivalent_nodes.texi',
             'line_nr' => 17,
@@ -466,7 +478,7 @@ $result_trees{'equivalent_nodes'} = {
                   'text' => 'Figure'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -475,7 +487,6 @@ $result_trees{'equivalent_nodes'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -483,6 +494,9 @@ $result_trees{'equivalent_nodes'} = {
               'normalized' => 'Figure'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => 'equivalent_nodes.texi',
             'line_nr' => 21,
@@ -628,7 +642,9 @@ $result_trees{'equivalent_nodes'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -725,12 +741,14 @@ $result_nodes{'equivalent_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -748,12 +766,14 @@ $result_menus{'equivalent_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
@@ -836,7 +856,8 @@ $result_floats{'equivalent_nodes'} = {
           ],
           'normalized' => 'Figure'
         }
-      }
+      },
+      'info' => {}
     }
   ]
 };
diff --git a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl 
b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
index e16f82119a..4801925ce2 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
@@ -39,7 +39,7 @@ $result_trees{'equivalent_nodes_no_node'} = {
                       'text' => 'equivalent_nodes.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'equivalent_nodes_no_node'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'equivalent_nodes.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'equivalent_nodes.texi',
                 'line_nr' => 3,
@@ -99,7 +101,7 @@ $result_trees{'equivalent_nodes_no_node'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -119,7 +121,7 @@ $result_trees{'equivalent_nodes_no_node'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -158,7 +160,9 @@ $result_trees{'equivalent_nodes_no_node'} = {
             ]
           }
         ],
-        'normalized' => 'before-top',
+        'normalized' => 'before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -175,7 +179,7 @@ $result_trees{'equivalent_nodes_no_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -206,7 +210,7 @@ $result_trees{'equivalent_nodes_no_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -287,7 +291,7 @@ $result_trees{'equivalent_nodes_no_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -296,9 +300,11 @@ $result_trees{'equivalent_nodes_no_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'equivalent_nodes.texi',
                 'line_nr' => 13,
@@ -330,7 +336,9 @@ $result_trees{'equivalent_nodes_no_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -347,7 +355,7 @@ $result_trees{'equivalent_nodes_no_node'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -392,7 +400,7 @@ $result_trees{'equivalent_nodes_no_node'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -419,7 +427,7 @@ $result_trees{'equivalent_nodes_no_node'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -428,9 +436,11 @@ $result_trees{'equivalent_nodes_no_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'equivalent_nodes.texi',
                 'line_nr' => 19,
@@ -439,7 +449,6 @@ $result_trees{'equivalent_nodes_no_node'} = {
             }
           ],
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -447,6 +456,9 @@ $result_trees{'equivalent_nodes_no_node'} = {
               'normalized' => 'Figure'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => 'equivalent_nodes.texi',
             'line_nr' => 17,
@@ -466,7 +478,7 @@ $result_trees{'equivalent_nodes_no_node'} = {
                   'text' => 'Figure'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -475,7 +487,6 @@ $result_trees{'equivalent_nodes_no_node'} = {
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -483,6 +494,9 @@ $result_trees{'equivalent_nodes_no_node'} = {
               'normalized' => 'Figure'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => 'equivalent_nodes.texi',
             'line_nr' => 21,
@@ -628,7 +642,9 @@ $result_trees{'equivalent_nodes_no_node'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -725,12 +741,14 @@ $result_nodes{'equivalent_nodes_no_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -748,12 +766,14 @@ $result_menus{'equivalent_nodes_no_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
@@ -836,7 +856,8 @@ $result_floats{'equivalent_nodes_no_node'} = {
           ],
           'normalized' => 'Figure'
         }
-      }
+      },
+      'info' => {}
     }
   ]
 };
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index 74fe1bf39f..a7a9ee0735 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'more_sections_than_nodes'} = {
                       'text' => 'more_sections_than_nodes.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'more_sections_than_nodes.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'more_sections_than_nodes.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'more_sections_than_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'more_sections_than_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -294,7 +298,7 @@ $result_trees{'more_sections_than_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -303,9 +307,11 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'more_sections_than_nodes.texi',
                 'line_nr' => 12,
@@ -325,7 +331,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -342,7 +349,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -357,7 +364,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -374,7 +382,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'n c2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -394,7 +402,9 @@ $result_trees{'more_sections_than_nodes'} = {
             'normalized' => 'n-c2'
           }
         ],
-        'normalized' => 'n-c2',
+        'normalized' => 'n-c2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -411,7 +421,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -426,7 +436,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -443,7 +454,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 's1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -458,7 +469,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -483,7 +495,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'n c3 s1 s2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -494,7 +506,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'n c2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -505,7 +517,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -544,7 +556,9 @@ $result_trees{'more_sections_than_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'n-c3',
+        'normalized' => 'n-c3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -561,7 +575,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -578,7 +592,7 @@ $result_trees{'more_sections_than_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -644,7 +658,7 @@ $result_trees{'more_sections_than_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -653,9 +667,11 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'more_sections_than_nodes.texi',
                 'line_nr' => 26,
@@ -675,7 +691,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -692,7 +709,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'C3 s1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -707,7 +724,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -724,7 +742,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'n c3 s 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -744,7 +762,9 @@ $result_trees{'more_sections_than_nodes'} = {
             'normalized' => 'n-c3-s-2'
           }
         ],
-        'normalized' => 'n-c3-s-2',
+        'normalized' => 'n-c3-s-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -761,7 +781,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3 s2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -776,7 +796,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -793,7 +814,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3 s3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -808,7 +829,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -825,7 +847,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -840,7 +862,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -857,7 +880,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3 s1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -872,7 +895,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -889,7 +913,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3 s1 s1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -904,7 +928,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -940,7 +965,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -973,7 +998,9 @@ $result_trees{'more_sections_than_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'n-c3-s1-s2',
+        'normalized' => 'n-c3-s1-s2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -990,7 +1017,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3 s1 s2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1005,7 +1032,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1022,7 +1050,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'appendix'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1037,7 +1065,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1191,14 +1220,17 @@ $result_sectioning{'more_sections_than_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1215,14 +1247,17 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   'extra' => {
                     'normalized' => 'n-c2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.1',
@@ -1246,14 +1281,17 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   'extra' => {
                     'normalized' => 'n-c3'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '3.1',
@@ -1268,9 +1306,11 @@ $result_sectioning{'more_sections_than_nodes'} = {
                         'extra' => {
                           'normalized' => 'n-c3-s-2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '3.2',
@@ -1281,6 +1321,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '3.3',
@@ -1300,16 +1341,19 @@ $result_sectioning{'more_sections_than_nodes'} = {
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '4.1.1',
@@ -1324,9 +1368,11 @@ $result_sectioning{'more_sections_than_nodes'} = {
                               'extra' => {
                                 'normalized' => 'n-c3-s1-s2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '4.1.2',
@@ -1352,6 +1398,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
             {
               'cmdname' => 'appendix',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 'A',
@@ -1407,6 +1454,7 @@ $result_nodes{'more_sections_than_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1416,6 +1464,7 @@ $result_nodes{'more_sections_than_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1423,12 +1472,14 @@ $result_nodes{'more_sections_than_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 2
           }
         },
         'normalized' => 'n-c2'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1436,6 +1487,7 @@ $result_nodes{'more_sections_than_nodes'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 3
               }
@@ -1447,6 +1499,7 @@ $result_nodes{'more_sections_than_nodes'} = {
             ],
             'normalized' => 'n-c3'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1454,12 +1507,14 @@ $result_nodes{'more_sections_than_nodes'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '3.2'
                   }
                 },
                 'normalized' => 'n-c3-s-2'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1470,12 +1525,14 @@ $result_nodes{'more_sections_than_nodes'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '4.1.2'
                   }
                 },
                 'normalized' => 'n-c3-s1-s2'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -1506,24 +1563,28 @@ $result_menus{'more_sections_than_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'n-c2'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'n-c3'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'n-c3-s-2'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
@@ -1536,6 +1597,7 @@ $result_menus{'more_sections_than_nodes'} = {
               'extra' => {
                 'normalized' => 'n-c3-s1-s2'
               },
+              'info' => {},
               'structure' => {
                 'menu_prev' => {},
                 'menu_up' => {},
diff --git a/tp/t/results/moresectioning/node_footnote_end.pl 
b/tp/t/results/moresectioning/node_footnote_end.pl
index 91907762eb..e5dd34c63e 100644
--- a/tp/t/results/moresectioning/node_footnote_end.pl
+++ b/tp/t/results/moresectioning/node_footnote_end.pl
@@ -39,7 +39,7 @@ $result_trees{'node_footnote_end'} = {
                       'text' => 'node_footnote.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'node_footnote_end'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'node_footnote.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'node_footnote_end'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,7 @@ $result_trees{'node_footnote_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -351,7 +353,7 @@ $result_trees{'node_footnote_end'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -360,9 +362,11 @@ $result_trees{'node_footnote_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 12,
@@ -394,7 +398,9 @@ $result_trees{'node_footnote_end'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -426,7 +432,7 @@ $result_trees{'node_footnote_end'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -536,7 +542,9 @@ $result_trees{'node_footnote_end'} = {
             'normalized' => '_00e1'
           }
         ],
-        'normalized' => '_00e1',
+        'normalized' => '_00e1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -568,7 +576,7 @@ $result_trees{'node_footnote_end'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -678,7 +686,9 @@ $result_trees{'node_footnote_end'} = {
             'normalized' => '_00e2'
           }
         ],
-        'normalized' => '_00e2',
+        'normalized' => '_00e2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -695,7 +705,7 @@ $result_trees{'node_footnote_end'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -715,7 +725,9 @@ $result_trees{'node_footnote_end'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -732,7 +744,7 @@ $result_trees{'node_footnote_end'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -749,7 +761,7 @@ $result_trees{'node_footnote_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -830,7 +842,7 @@ $result_trees{'node_footnote_end'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -839,9 +851,11 @@ $result_trees{'node_footnote_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 29,
@@ -861,7 +875,8 @@ $result_trees{'node_footnote_end'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -893,7 +908,7 @@ $result_trees{'node_footnote_end'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1003,7 +1018,9 @@ $result_trees{'node_footnote_end'} = {
             'normalized' => '_00e0'
           }
         ],
-        'normalized' => '_00e0',
+        'normalized' => '_00e0'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1122,9 +1139,11 @@ $result_sectioning{'node_footnote_end'} = {
             'extra' => {
               'normalized' => 'chapter'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -1147,18 +1166,21 @@ $result_nodes{'node_footnote_end'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_00e1'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '_00e2'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1166,6 +1188,7 @@ $result_nodes{'node_footnote_end'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 1
                   }
@@ -1177,12 +1200,14 @@ $result_nodes{'node_footnote_end'} = {
                 ],
                 'normalized' => 'chapter'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => '_00e0'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -1220,30 +1245,35 @@ $result_menus{'node_footnote_end'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_00e1'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '_00e2'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'chapter'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => '_00e0'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/moresectioning/node_footnote_separated.pl 
b/tp/t/results/moresectioning/node_footnote_separated.pl
index c48327a314..da444df4ec 100644
--- a/tp/t/results/moresectioning/node_footnote_separated.pl
+++ b/tp/t/results/moresectioning/node_footnote_separated.pl
@@ -39,7 +39,7 @@ $result_trees{'node_footnote_separated'} = {
                       'text' => 'node_footnote.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'node_footnote_separated'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'node_footnote.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'node_footnote_separated'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,7 @@ $result_trees{'node_footnote_separated'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -351,7 +353,7 @@ $result_trees{'node_footnote_separated'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -360,9 +362,11 @@ $result_trees{'node_footnote_separated'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 12,
@@ -394,7 +398,9 @@ $result_trees{'node_footnote_separated'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -426,7 +432,7 @@ $result_trees{'node_footnote_separated'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -536,7 +542,9 @@ $result_trees{'node_footnote_separated'} = {
             'normalized' => '_00e1'
           }
         ],
-        'normalized' => '_00e1',
+        'normalized' => '_00e1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -568,7 +576,7 @@ $result_trees{'node_footnote_separated'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -678,7 +686,9 @@ $result_trees{'node_footnote_separated'} = {
             'normalized' => '_00e2'
           }
         ],
-        'normalized' => '_00e2',
+        'normalized' => '_00e2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -695,7 +705,7 @@ $result_trees{'node_footnote_separated'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -715,7 +725,9 @@ $result_trees{'node_footnote_separated'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -732,7 +744,7 @@ $result_trees{'node_footnote_separated'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -749,7 +761,7 @@ $result_trees{'node_footnote_separated'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -830,7 +842,7 @@ $result_trees{'node_footnote_separated'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -839,9 +851,11 @@ $result_trees{'node_footnote_separated'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 29,
@@ -861,7 +875,8 @@ $result_trees{'node_footnote_separated'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -893,7 +908,7 @@ $result_trees{'node_footnote_separated'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1003,7 +1018,9 @@ $result_trees{'node_footnote_separated'} = {
             'normalized' => '_00e0'
           }
         ],
-        'normalized' => '_00e0',
+        'normalized' => '_00e0'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1122,9 +1139,11 @@ $result_sectioning{'node_footnote_separated'} = {
             'extra' => {
               'normalized' => 'chapter'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -1147,18 +1166,21 @@ $result_nodes{'node_footnote_separated'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_00e1'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '_00e2'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1166,6 +1188,7 @@ $result_nodes{'node_footnote_separated'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 1
                   }
@@ -1177,12 +1200,14 @@ $result_nodes{'node_footnote_separated'} = {
                 ],
                 'normalized' => 'chapter'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => '_00e0'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -1220,30 +1245,35 @@ $result_menus{'node_footnote_separated'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_00e1'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '_00e2'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'chapter'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => '_00e0'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/moresectioning/node_footnote_use_node.pl 
b/tp/t/results/moresectioning/node_footnote_use_node.pl
index 1f2cbf53bf..ccbe6ef09e 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node.pl
+++ b/tp/t/results/moresectioning/node_footnote_use_node.pl
@@ -39,7 +39,7 @@ $result_trees{'node_footnote_use_node'} = {
                       'text' => 'node_footnote.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'node_footnote_use_node'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'node_footnote.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'node_footnote_use_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,7 @@ $result_trees{'node_footnote_use_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -351,7 +353,7 @@ $result_trees{'node_footnote_use_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -360,9 +362,11 @@ $result_trees{'node_footnote_use_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 12,
@@ -394,7 +398,9 @@ $result_trees{'node_footnote_use_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -426,7 +432,7 @@ $result_trees{'node_footnote_use_node'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -536,7 +542,9 @@ $result_trees{'node_footnote_use_node'} = {
             'normalized' => '_00e1'
           }
         ],
-        'normalized' => '_00e1',
+        'normalized' => '_00e1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -568,7 +576,7 @@ $result_trees{'node_footnote_use_node'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -678,7 +686,9 @@ $result_trees{'node_footnote_use_node'} = {
             'normalized' => '_00e2'
           }
         ],
-        'normalized' => '_00e2',
+        'normalized' => '_00e2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -695,7 +705,7 @@ $result_trees{'node_footnote_use_node'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -715,7 +725,9 @@ $result_trees{'node_footnote_use_node'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -732,7 +744,7 @@ $result_trees{'node_footnote_use_node'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -749,7 +761,7 @@ $result_trees{'node_footnote_use_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -830,7 +842,7 @@ $result_trees{'node_footnote_use_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -839,9 +851,11 @@ $result_trees{'node_footnote_use_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 29,
@@ -861,7 +875,8 @@ $result_trees{'node_footnote_use_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -893,7 +908,7 @@ $result_trees{'node_footnote_use_node'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1003,7 +1018,9 @@ $result_trees{'node_footnote_use_node'} = {
             'normalized' => '_00e0'
           }
         ],
-        'normalized' => '_00e0',
+        'normalized' => '_00e0'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1122,9 +1139,11 @@ $result_sectioning{'node_footnote_use_node'} = {
             'extra' => {
               'normalized' => 'chapter'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -1147,18 +1166,21 @@ $result_nodes{'node_footnote_use_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_00e1'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '_00e2'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1166,6 +1188,7 @@ $result_nodes{'node_footnote_use_node'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 1
                   }
@@ -1177,12 +1200,14 @@ $result_nodes{'node_footnote_use_node'} = {
                 ],
                 'normalized' => 'chapter'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => '_00e0'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -1220,30 +1245,35 @@ $result_menus{'node_footnote_use_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_00e1'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '_00e2'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'chapter'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => '_00e0'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
index f129dbca0a..2a4f566cf9 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
@@ -39,7 +39,7 @@ $result_trees{'nodes_after_top_before_chapter'} = {
                       'text' => 'nodes_after_top_before_chapter.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'nodes_after_top_before_chapter'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'nodes_after_top_before_chapter.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_after_top_before_chapter.texi',
                 'line_nr' => 3,
@@ -81,7 +83,7 @@ $result_trees{'nodes_after_top_before_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -102,7 +104,7 @@ $result_trees{'nodes_after_top_before_chapter'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -217,7 +219,7 @@ $result_trees{'nodes_after_top_before_chapter'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -226,9 +228,11 @@ $result_trees{'nodes_after_top_before_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_after_top_before_chapter.texi',
                 'line_nr' => 11,
@@ -260,7 +264,9 @@ $result_trees{'nodes_after_top_before_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -285,7 +291,7 @@ $result_trees{'nodes_after_top_before_chapter'} = {
               'text' => 'third node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -304,7 +310,7 @@ $result_trees{'nodes_after_top_before_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -363,7 +369,9 @@ $result_trees{'nodes_after_top_before_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'second-node',
+        'normalized' => 'second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -399,7 +407,7 @@ $result_trees{'nodes_after_top_before_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +440,9 @@ $result_trees{'nodes_after_top_before_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'third-node',
+        'normalized' => 'third-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +459,7 @@ $result_trees{'nodes_after_top_before_chapter'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -469,7 +479,8 @@ $result_trees{'nodes_after_top_before_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -557,9 +568,11 @@ $result_sectioning{'nodes_after_top_before_chapter'} = {
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -582,12 +595,14 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -595,12 +610,14 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 1
               }
             },
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -624,18 +641,21 @@ $result_menus{'nodes_after_top_before_chapter'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
index 3fec179a5d..be674db42d 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
@@ -39,7 +39,7 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
                       'text' => 'nodes_after_top_before_chapter.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'nodes_after_top_before_chapter.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_after_top_before_chapter.texi',
                 'line_nr' => 3,
@@ -81,7 +83,7 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -102,7 +104,7 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -217,7 +219,7 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -226,9 +228,11 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_after_top_before_chapter.texi',
                 'line_nr' => 11,
@@ -260,7 +264,9 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -285,7 +291,7 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
               'text' => 'third node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -304,7 +310,7 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -363,7 +369,9 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'second-node',
+        'normalized' => 'second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -399,7 +407,7 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +440,9 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'third-node',
+        'normalized' => 'third-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +459,7 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -469,7 +479,8 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -557,9 +568,11 @@ 
$result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -582,12 +595,14 @@ 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -595,12 +610,14 @@ 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 1
               }
             },
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -624,18 +641,21 @@ 
$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_section.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
index ca7ac2af58..a6b5514779 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
@@ -39,7 +39,7 @@ $result_trees{'nodes_after_top_before_section'} = {
                       'text' => 'nodes_after_top_before_section.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'nodes_after_top_before_section'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'nodes_after_top_before_section.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_after_top_before_section.texi',
                 'line_nr' => 3,
@@ -81,7 +83,7 @@ $result_trees{'nodes_after_top_before_section'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -102,7 +104,7 @@ $result_trees{'nodes_after_top_before_section'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -217,7 +219,7 @@ $result_trees{'nodes_after_top_before_section'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -226,9 +228,11 @@ $result_trees{'nodes_after_top_before_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_after_top_before_section.texi',
                 'line_nr' => 11,
@@ -260,7 +264,9 @@ $result_trees{'nodes_after_top_before_section'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -285,7 +291,7 @@ $result_trees{'nodes_after_top_before_section'} = {
               'text' => 'third node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -304,7 +310,7 @@ $result_trees{'nodes_after_top_before_section'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -363,7 +369,9 @@ $result_trees{'nodes_after_top_before_section'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'second-node',
+        'normalized' => 'second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -399,7 +407,7 @@ $result_trees{'nodes_after_top_before_section'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +440,9 @@ $result_trees{'nodes_after_top_before_section'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'third-node',
+        'normalized' => 'third-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +459,7 @@ $result_trees{'nodes_after_top_before_section'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -469,7 +479,8 @@ $result_trees{'nodes_after_top_before_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -557,9 +568,11 @@ $result_sectioning{'nodes_after_top_before_section'} = {
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 3,
           'section_number' => 1,
@@ -582,12 +595,14 @@ $result_nodes{'nodes_after_top_before_section'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -595,12 +610,14 @@ $result_nodes{'nodes_after_top_before_section'} = {
             'associated_section' => {
               'cmdname' => 'subsection',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 1
               }
             },
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -624,18 +641,21 @@ $result_menus{'nodes_after_top_before_section'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
index 523362dcf2..d59818d46b 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = {
                       'text' => 'nodes_after_top_before_section.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'nodes_after_top_before_section.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_after_top_before_section.texi',
                 'line_nr' => 3,
@@ -81,7 +83,7 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -102,7 +104,7 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -217,7 +219,7 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -226,9 +228,11 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_after_top_before_section.texi',
                 'line_nr' => 11,
@@ -260,7 +264,9 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -285,7 +291,7 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
               'text' => 'third node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -304,7 +310,7 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -363,7 +369,9 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'second-node',
+        'normalized' => 'second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -399,7 +407,7 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +440,9 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'third-node',
+        'normalized' => 'third-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +459,7 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -469,7 +479,8 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -557,9 +568,11 @@ 
$result_sectioning{'nodes_after_top_before_section_use_nodes'} = {
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 3,
           'section_number' => 1,
@@ -582,12 +595,14 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} 
= {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -595,12 +610,14 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} 
= {
             'associated_section' => {
               'cmdname' => 'subsection',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 1
               }
             },
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -624,18 +641,21 @@ $result_menus{'nodes_after_top_before_section_use_nodes'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
index 903fdff4ee..43f967ec21 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
@@ -39,7 +39,7 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
                       'text' => 'nodes_after_top_before_section.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'nodes_after_top_before_section.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_after_top_before_section.texi',
                 'line_nr' => 3,
@@ -81,7 +83,7 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -102,7 +104,7 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -217,7 +219,7 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -226,9 +228,11 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodes_after_top_before_section.texi',
                 'line_nr' => 11,
@@ -260,7 +264,9 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -285,7 +291,7 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
               'text' => 'third node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -304,7 +310,7 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -363,7 +369,9 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'second-node',
+        'normalized' => 'second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -399,7 +407,7 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -432,7 +440,9 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'third-node',
+        'normalized' => 'third-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -449,7 +459,7 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -469,7 +479,8 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -557,9 +568,11 @@ 
$result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'} = {
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 3,
           'section_number' => 1,
@@ -582,12 +595,14 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -595,12 +610,14 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
             'associated_section' => {
               'cmdname' => 'subsection',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 1
               }
             },
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -624,18 +641,21 @@ 
$result_menus{'nodes_after_top_before_section_use_nodes_chapter'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index e658a4280e..e81eec6abf 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -34,7 +34,7 @@ $result_trees{'placed_things_before_element'} = {
                       'text' => 'placed_things_before_element.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'placed_things_before_element'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'placed_things_before_element.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'placed_things_before_element.texi',
                 'line_nr' => 2,
@@ -60,7 +62,7 @@ $result_trees{'placed_things_before_element'} = {
                       'text' => 'before element test'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -68,7 +70,8 @@ $result_trees{'placed_things_before_element'} = {
                 }
               ],
               'cmdname' => 'settitle',
-              'extra' => {
+              'extra' => {},
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -342,7 +345,7 @@ $result_trees{'placed_things_before_element'} = {
                   'text' => 'float anchor'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -369,7 +372,7 @@ $result_trees{'placed_things_before_element'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -378,9 +381,11 @@ $result_trees{'placed_things_before_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'placed_things_before_element.texi',
                 'line_nr' => 24,
@@ -393,11 +398,13 @@ $result_trees{'placed_things_before_element'} = {
               {}
             ],
             'normalized' => 'float-anchor',
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => 'placed_things_before_element.texi',
             'line_nr' => 22,
@@ -457,7 +464,7 @@ $result_trees{'placed_things_before_element'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -523,7 +530,7 @@ $result_trees{'placed_things_before_element'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -532,9 +539,11 @@ $result_trees{'placed_things_before_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'placed_things_before_element.texi',
                 'line_nr' => 31,
@@ -561,7 +570,7 @@ $result_trees{'placed_things_before_element'} = {
                   'text' => 'index entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -580,7 +589,9 @@ $result_trees{'placed_things_before_element'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -606,7 +617,7 @@ $result_trees{'placed_things_before_element'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -711,7 +722,8 @@ $result_trees{'placed_things_before_element'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -837,6 +849,7 @@ $result_sectioning{'placed_things_before_element'} = {
       {
         'cmdname' => 'section',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
@@ -872,6 +885,7 @@ $result_floats{'placed_things_before_element'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/moresectioning/sectioning_frames.pl 
b/tp/t/results/moresectioning/sectioning_frames.pl
index d2318bb13d..398a54b4ed 100644
--- a/tp/t/results/moresectioning/sectioning_frames.pl
+++ b/tp/t/results/moresectioning/sectioning_frames.pl
@@ -61,7 +61,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -92,7 +92,9 @@ $result_trees{'sectioning_frames'} = {
             ]
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -104,7 +106,7 @@ $result_trees{'sectioning_frames'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -116,7 +118,7 @@ $result_trees{'sectioning_frames'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -545,7 +547,7 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -554,9 +556,11 @@ $result_trees{'sectioning_frames'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 27,
@@ -610,7 +614,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -643,7 +647,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'First-node',
+        'normalized' => 'First-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -660,7 +666,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'first node chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -686,7 +692,7 @@ $result_trees{'sectioning_frames'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -865,7 +871,7 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -874,9 +880,11 @@ $result_trees{'sectioning_frames'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 38,
@@ -896,7 +904,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -913,7 +922,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -933,7 +942,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'unnumbered'
           }
         ],
-        'normalized' => 'unnumbered',
+        'normalized' => 'unnumbered'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -950,7 +961,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'unnumbered section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -967,7 +978,7 @@ $result_trees{'sectioning_frames'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1180,7 +1191,7 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1189,9 +1200,11 @@ $result_trees{'sectioning_frames'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 48,
@@ -1211,7 +1224,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1228,7 +1242,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'unnumbered sub'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1248,7 +1262,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'unnumbered-sub'
           }
         ],
-        'normalized' => 'unnumbered-sub',
+        'normalized' => 'unnumbered-sub'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1265,7 +1281,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'unnumbered subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1280,7 +1296,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1297,7 +1314,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'numbered sub'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1317,7 +1334,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'numbered-sub'
           }
         ],
-        'normalized' => 'numbered-sub',
+        'normalized' => 'numbered-sub'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1334,7 +1353,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'numbered subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1349,7 +1368,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1366,7 +1386,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'unnumbered sub2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1386,7 +1406,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'unnumbered-sub2'
           }
         ],
-        'normalized' => 'unnumbered-sub2',
+        'normalized' => 'unnumbered-sub2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1403,7 +1425,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'unnumbered subsection2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1418,7 +1440,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1435,7 +1458,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'numbered sub2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1455,7 +1478,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'numbered-sub2'
           }
         ],
-        'normalized' => 'numbered-sub2',
+        'normalized' => 'numbered-sub2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1472,7 +1497,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'numbered subsection2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1487,7 +1512,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1504,7 +1530,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'unnumbered2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1524,7 +1550,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'unnumbered2'
           }
         ],
-        'normalized' => 'unnumbered2',
+        'normalized' => 'unnumbered2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1541,7 +1569,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'unnumbered section2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1558,7 +1586,7 @@ $result_trees{'sectioning_frames'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1624,7 +1652,7 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1633,9 +1661,11 @@ $result_trees{'sectioning_frames'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 67,
@@ -1655,7 +1685,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1672,7 +1703,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'numbered sub3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1692,7 +1723,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'numbered-sub3'
           }
         ],
-        'normalized' => 'numbered-sub3',
+        'normalized' => 'numbered-sub3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1709,7 +1742,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'numbered subsection3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1729,7 +1762,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1746,7 +1780,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'numbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1766,7 +1800,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'numbered'
           }
         ],
-        'normalized' => 'numbered',
+        'normalized' => 'numbered'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1783,7 +1819,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'numbered section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1798,7 +1834,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => '  '
       },
       'source_info' => {
@@ -1829,7 +1866,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1878,7 +1915,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'between-node',
+        'normalized' => 'between-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1914,7 +1953,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1968,7 +2007,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Second-node',
+        'normalized' => 'Second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1985,7 +2026,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'second node chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2014,7 +2055,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2031,7 +2073,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'Third node unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2051,7 +2093,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'Third-node-unnumbered'
           }
         ],
-        'normalized' => 'Third-node-unnumbered',
+        'normalized' => 'Third-node-unnumbered'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2068,7 +2112,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'unnumbered chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2102,7 +2146,8 @@ $result_trees{'sectioning_frames'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2138,7 +2183,7 @@ $result_trees{'sectioning_frames'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2193,7 +2238,9 @@ $result_trees{'sectioning_frames'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Last-node-no-description',
+        'normalized' => 'Last-node-no-description'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2473,6 +2520,7 @@ $result_sectioning{'sectioning_frames'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -2486,9 +2534,11 @@ $result_sectioning{'sectioning_frames'} = {
                   'extra' => {
                     'normalized' => 'First-node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -2499,9 +2549,11 @@ $result_sectioning{'sectioning_frames'} = {
                         'extra' => {
                           'normalized' => 'unnumbered'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -2512,9 +2564,11 @@ $result_sectioning{'sectioning_frames'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -2528,9 +2582,11 @@ $result_sectioning{'sectioning_frames'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -2545,9 +2601,11 @@ $result_sectioning{'sectioning_frames'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -2562,9 +2620,11 @@ $result_sectioning{'sectioning_frames'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -2584,9 +2644,11 @@ $result_sectioning{'sectioning_frames'} = {
                         'extra' => {
                           'normalized' => 'unnumbered2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -2597,9 +2659,11 @@ $result_sectioning{'sectioning_frames'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -2619,9 +2683,11 @@ $result_sectioning{'sectioning_frames'} = {
                         'extra' => {
                           'normalized' => 'numbered'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -2645,9 +2711,11 @@ $result_sectioning{'sectioning_frames'} = {
                   'extra' => {
                     'normalized' => 'Second-node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -2665,9 +2733,11 @@ $result_sectioning{'sectioning_frames'} = {
                   'extra' => {
                     'normalized' => 'Third-node-unnumbered'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -2726,6 +2796,7 @@ $result_nodes{'sectioning_frames'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2733,6 +2804,7 @@ $result_nodes{'sectioning_frames'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -2744,6 +2816,7 @@ $result_nodes{'sectioning_frames'} = {
         ],
         'normalized' => 'First-node'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2751,6 +2824,7 @@ $result_nodes{'sectioning_frames'} = {
             'associated_section' => {
               'cmdname' => 'unnumberedsec',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             },
             'menus' => [
@@ -2760,6 +2834,7 @@ $result_nodes{'sectioning_frames'} = {
             ],
             'normalized' => 'unnumbered'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -2767,10 +2842,12 @@ $result_nodes{'sectioning_frames'} = {
                 'associated_section' => {
                   'cmdname' => 'unnumberedsubsec',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {}
                 },
                 'normalized' => 'unnumbered-sub'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -2778,10 +2855,12 @@ $result_nodes{'sectioning_frames'} = {
                     'associated_section' => {
                       'cmdname' => 'subsection',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {}
                     },
                     'normalized' => 'numbered-sub'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -2789,10 +2868,12 @@ $result_nodes{'sectioning_frames'} = {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsubsec',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {}
                         },
                         'normalized' => 'unnumbered-sub2'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_next' => {
                           'cmdname' => 'node',
@@ -2800,10 +2881,12 @@ $result_nodes{'sectioning_frames'} = {
                             'associated_section' => {
                               'cmdname' => 'subsection',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {}
                             },
                             'normalized' => 'numbered-sub2'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_prev' => {},
                             'node_up' => {}
@@ -2826,6 +2909,7 @@ $result_nodes{'sectioning_frames'} = {
                 'associated_section' => {
                   'cmdname' => 'unnumberedsec',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {}
                 },
                 'menus' => [
@@ -2835,6 +2919,7 @@ $result_nodes{'sectioning_frames'} = {
                 ],
                 'normalized' => 'unnumbered2'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
@@ -2842,10 +2927,12 @@ $result_nodes{'sectioning_frames'} = {
                     'associated_section' => {
                       'cmdname' => 'subsection',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {}
                     },
                     'normalized' => 'numbered-sub3'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_up' => {}
                   }
@@ -2856,12 +2943,14 @@ $result_nodes{'sectioning_frames'} = {
                     'associated_section' => {
                       'cmdname' => 'section',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => '1.1'
                       }
                     },
                     'normalized' => 'numbered'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -2912,42 +3001,49 @@ $result_menus{'sectioning_frames'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'First-node'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'unnumbered'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'unnumbered-sub'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'numbered-sub'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'unnumbered-sub2'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'numbered-sub2'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_prev' => {},
                             'menu_up' => {},
@@ -2981,12 +3077,14 @@ $result_menus{'sectioning_frames'} = {
               'extra' => {
                 'normalized' => 'unnumbered2'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'numbered-sub3'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_up' => {},
                     'menu_up_hash' => {
@@ -2999,6 +3097,7 @@ $result_menus{'sectioning_frames'} = {
                   'extra' => {
                     'normalized' => 'numbered'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
@@ -3025,24 +3124,28 @@ $result_menus{'sectioning_frames'} = {
           'extra' => {
             'normalized' => 'between-node'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Second-node'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'Third-node-unnumbered'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'Last-node-no-description'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_prev' => {},
                         'menu_up' => {},
diff --git a/tp/t/results/moresectioning/top_node_up_explicit.pl 
b/tp/t/results/moresectioning/top_node_up_explicit.pl
index 0010018163..6ebf9e4401 100644
--- a/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_explicit.pl
@@ -34,7 +34,7 @@ $result_trees{'top_node_up_explicit'} = {
                       'text' => 'top_node_up_explicit'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'top_node_up_explicit'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'top_node_up_explicit'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'top_node_up_explicit.texi',
                 'line_nr' => 2,
@@ -122,7 +124,7 @@ $result_trees{'top_node_up_explicit'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -139,7 +141,7 @@ $result_trees{'top_node_up_explicit'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -156,7 +158,7 @@ $result_trees{'top_node_up_explicit'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -192,7 +194,9 @@ $result_trees{'top_node_up_explicit'} = {
             ]
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -209,7 +213,7 @@ $result_trees{'top_node_up_explicit'} = {
               'text' => 'The top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -240,7 +244,7 @@ $result_trees{'top_node_up_explicit'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -306,7 +310,7 @@ $result_trees{'top_node_up_explicit'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -315,9 +319,11 @@ $result_trees{'top_node_up_explicit'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'top_node_up_explicit.texi',
                 'line_nr' => 14,
@@ -337,7 +343,8 @@ $result_trees{'top_node_up_explicit'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -354,7 +361,7 @@ $result_trees{'top_node_up_explicit'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -374,7 +381,9 @@ $result_trees{'top_node_up_explicit'} = {
             'normalized' => 'Chap'
           }
         ],
-        'normalized' => 'Chap',
+        'normalized' => 'Chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -391,7 +400,7 @@ $result_trees{'top_node_up_explicit'} = {
               'text' => 'A chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -420,7 +429,8 @@ $result_trees{'top_node_up_explicit'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -503,9 +513,11 @@ $result_sectioning{'top_node_up_explicit'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -516,9 +528,11 @@ $result_sectioning{'top_node_up_explicit'} = {
                   'extra' => {
                     'normalized' => 'Chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -547,6 +561,7 @@ $result_nodes{'top_node_up_explicit'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -556,6 +571,7 @@ $result_nodes{'top_node_up_explicit'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -563,12 +579,14 @@ $result_nodes{'top_node_up_explicit'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chap'
       },
+      'info' => {},
       'structure' => {
         'node_up' => {}
       }
@@ -609,12 +627,14 @@ $result_menus{'top_node_up_explicit'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Chap'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/moresectioning/top_node_up_implicit.pl 
b/tp/t/results/moresectioning/top_node_up_implicit.pl
index 16c4c05ae8..c8bf134033 100644
--- a/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_implicit.pl
@@ -34,7 +34,7 @@ $result_trees{'top_node_up_implicit'} = {
                       'text' => 'top_node_up_implicit'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'top_node_up_implicit'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'top_node_up_implicit'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'top_node_up_implicit.texi',
                 'line_nr' => 2,
@@ -92,7 +94,7 @@ $result_trees{'top_node_up_implicit'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -112,7 +114,9 @@ $result_trees{'top_node_up_implicit'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -129,7 +133,7 @@ $result_trees{'top_node_up_implicit'} = {
               'text' => 'The top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -160,7 +164,7 @@ $result_trees{'top_node_up_implicit'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -226,7 +230,7 @@ $result_trees{'top_node_up_implicit'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -235,9 +239,11 @@ $result_trees{'top_node_up_implicit'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'top_node_up_implicit.texi',
                 'line_nr' => 13,
@@ -257,7 +263,8 @@ $result_trees{'top_node_up_implicit'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -274,7 +281,7 @@ $result_trees{'top_node_up_implicit'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -294,7 +301,9 @@ $result_trees{'top_node_up_implicit'} = {
             'normalized' => 'Chap'
           }
         ],
-        'normalized' => 'Chap',
+        'normalized' => 'Chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -311,7 +320,7 @@ $result_trees{'top_node_up_implicit'} = {
               'text' => 'A chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -340,7 +349,8 @@ $result_trees{'top_node_up_implicit'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -419,9 +429,11 @@ $result_sectioning{'top_node_up_implicit'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -432,9 +444,11 @@ $result_sectioning{'top_node_up_implicit'} = {
                   'extra' => {
                     'normalized' => 'Chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -463,6 +477,7 @@ $result_nodes{'top_node_up_implicit'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -472,6 +487,7 @@ $result_nodes{'top_node_up_implicit'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -479,12 +495,14 @@ $result_nodes{'top_node_up_implicit'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -502,12 +520,14 @@ $result_menus{'top_node_up_implicit'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Chap'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl 
b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
index 575ee51487..48bf234030 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
                       'text' => 'two_footnotes_in_nodes.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'two_footnotes_in_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'two_footnotes_in_nodes.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'two_footnotes_in_nodes.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'two_footnotes_in_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => '2 footnotes in 2 nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -238,7 +242,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -304,7 +308,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -313,9 +317,11 @@ $result_trees{'two_footnotes_in_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'two_footnotes_in_nodes.texi',
                 'line_nr' => 18,
@@ -335,7 +341,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -352,7 +359,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -372,7 +379,9 @@ $result_trees{'two_footnotes_in_nodes'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -389,7 +398,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -512,7 +521,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -605,9 +615,11 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -618,9 +630,11 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -649,6 +663,7 @@ $result_nodes{'two_footnotes_in_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -658,6 +673,7 @@ $result_nodes{'two_footnotes_in_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -665,12 +681,14 @@ $result_nodes{'two_footnotes_in_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -688,12 +706,14 @@ $result_menus{'two_footnotes_in_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl 
b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
index 949e0de29d..19c9b884eb 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
@@ -39,7 +39,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
                       'text' => 'two_footnotes_in_nodes.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'two_footnotes_in_nodes.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'two_footnotes_in_nodes.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
               'text' => '2 footnotes in 2 nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -238,7 +242,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -304,7 +308,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -313,9 +317,11 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'two_footnotes_in_nodes.texi',
                 'line_nr' => 18,
@@ -335,7 +341,8 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -352,7 +359,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -372,7 +379,9 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -389,7 +398,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -512,7 +521,8 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -605,9 +615,11 @@ $result_sectioning{'two_footnotes_in_nodes_separated'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -618,9 +630,11 @@ $result_sectioning{'two_footnotes_in_nodes_separated'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -649,6 +663,7 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -658,6 +673,7 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -665,12 +681,14 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -688,12 +706,14 @@ $result_menus{'two_footnotes_in_nodes_separated'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/multitable/empty_headitem.pl 
b/tp/t/results/multitable/empty_headitem.pl
index 1923befa31..d9b22dd54e 100644
--- a/tp/t/results/multitable/empty_headitem.pl
+++ b/tp/t/results/multitable/empty_headitem.pl
@@ -21,7 +21,7 @@ $result_trees{'empty_headitem'} = {
                           'text' => '.1 .1 .1'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -34,7 +34,9 @@ $result_trees{'empty_headitem'} = {
                       '.1',
                       '.1',
                       '.1'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -255,7 +257,7 @@ $result_trees{'empty_headitem'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -264,9 +266,11 @@ $result_trees{'empty_headitem'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -276,7 +280,9 @@ $result_trees{'empty_headitem'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 3,
+            'max_columns' => 3
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/empty_item_tab.pl 
b/tp/t/results/multitable/empty_item_tab.pl
index 046fd2fc36..41b586a4af 100644
--- a/tp/t/results/multitable/empty_item_tab.pl
+++ b/tp/t/results/multitable/empty_item_tab.pl
@@ -21,7 +21,7 @@ $result_trees{'empty_item_tab'} = {
                           'text' => '1.0'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -32,7 +32,9 @@ $result_trees{'empty_item_tab'} = {
                   'extra' => {
                     'misc_args' => [
                       '1.0'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -177,7 +179,7 @@ $result_trees{'empty_item_tab'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -186,9 +188,11 @@ $result_trees{'empty_item_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -198,7 +202,9 @@ $result_trees{'empty_item_tab'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 1,
+            'max_columns' => 1
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -224,7 +230,7 @@ $result_trees{'empty_item_tab'} = {
                           'text' => '0.5 0.5'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -236,7 +242,9 @@ $result_trees{'empty_item_tab'} = {
                     'misc_args' => [
                       '0.5',
                       '0.5'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -619,7 +627,7 @@ $result_trees{'empty_item_tab'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -628,9 +636,11 @@ $result_trees{'empty_item_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -640,7 +650,9 @@ $result_trees{'empty_item_tab'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/empty_multitable_with_cells.pl 
b/tp/t/results/multitable/empty_multitable_with_cells.pl
index 6218000843..069004a662 100644
--- a/tp/t/results/multitable/empty_multitable_with_cells.pl
+++ b/tp/t/results/multitable/empty_multitable_with_cells.pl
@@ -12,7 +12,7 @@ $result_trees{'empty_multitable_with_cells'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -84,7 +84,7 @@ $result_trees{'empty_multitable_with_cells'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -93,9 +93,11 @@ $result_trees{'empty_multitable_with_cells'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/multitable/inter_item_commands_in_multitable.pl 
b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
index f94a5cff23..6beb58f315 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -22,7 +22,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -90,7 +90,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                                   'text' => 'index entry between empty lines'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -109,7 +109,9 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
                               'index_type_command' => 'cindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -201,7 +203,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -210,9 +212,11 @@ $result_trees{'inter_item_commands_in_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -229,7 +233,9 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -255,7 +261,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                           'text' => '0.6 0.4'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -267,7 +273,9 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                     'misc_args' => [
                       '0.6',
                       '0.4'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -471,7 +479,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                                       'text' => 'index entry within multitable'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -490,7 +498,9 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
                                   'index_type_command' => 'cindex'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -564,7 +574,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -573,9 +583,11 @@ $result_trees{'inter_item_commands_in_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -585,7 +597,9 @@ $result_trees{'inter_item_commands_in_multitable'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -612,7 +626,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -637,7 +651,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                               'text' => 'cindex'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -656,7 +670,9 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
                           'index_type_command' => 'cindex'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -719,7 +735,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -728,9 +744,11 @@ $result_trees{'inter_item_commands_in_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -747,7 +765,9 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/multitable_begin_with_tab.pl 
b/tp/t/results/multitable/multitable_begin_with_tab.pl
index 16cd2866fd..8d83aa6b76 100644
--- a/tp/t/results/multitable/multitable_begin_with_tab.pl
+++ b/tp/t/results/multitable/multitable_begin_with_tab.pl
@@ -33,7 +33,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -68,7 +68,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -77,9 +77,11 @@ $result_trees{'multitable_begin_with_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -102,7 +104,9 @@ $result_trees{'multitable_begin_with_tab'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -140,7 +144,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -214,7 +218,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -223,9 +227,11 @@ $result_trees{'multitable_begin_with_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -248,7 +254,9 @@ $result_trees{'multitable_begin_with_tab'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl 
b/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
index 9cdb104717..2a3caca3b4 100644
--- a/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
+++ b/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
@@ -35,7 +35,7 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -52,7 +52,7 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -61,9 +61,11 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -86,7 +88,9 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
index e8ba5c03d1..cde2dade62 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
@@ -19,7 +19,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
             {
               'contents' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '
 '
                   },
@@ -39,7 +39,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -64,7 +66,9 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
               {
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
index 007c523afb..a60f72d30e 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
@@ -53,7 +53,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -62,9 +62,11 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -81,7 +83,9 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
index eeed6ca56e..9b0a6a3753 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
@@ -19,7 +19,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
             {
               'contents' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' 
 '
                   },
@@ -39,7 +39,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -64,7 +66,9 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
               {
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
index 1186db925e..87765485c4 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
@@ -37,7 +37,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'bracketed'
@@ -56,7 +56,7 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +65,11 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -84,7 +86,9 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
index 52825550a7..458b91346c 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
@@ -25,7 +25,7 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = {
 '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'bracketed'
@@ -44,7 +44,7 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -53,9 +53,11 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -72,7 +74,9 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
index 0a0eb5f359..252bb3109a 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
@@ -56,7 +56,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +65,11 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -85,7 +87,9 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
index 31a14440e3..3bb2b62e43 100644
--- 
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
+++ 
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
@@ -56,7 +56,7 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +65,11 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -85,7 +87,9 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl 
b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
index 7224f47415..36391c275f 100644
--- a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
+++ b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
@@ -33,7 +33,7 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -50,7 +50,7 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,9 +59,11 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -81,7 +83,9 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/multitable_figure_space.pl 
b/tp/t/results/multitable/multitable_figure_space.pl
index 594be92acd..7f0e94ffd5 100644
--- a/tp/t/results/multitable/multitable_figure_space.pl
+++ b/tp/t/results/multitable/multitable_figure_space.pl
@@ -33,7 +33,7 @@ $result_trees{'multitable_figure_space'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -232,7 +232,7 @@ $result_trees{'multitable_figure_space'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -241,9 +241,11 @@ $result_trees{'multitable_figure_space'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -266,7 +268,9 @@ $result_trees{'multitable_figure_space'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/multitable_in_example.pl 
b/tp/t/results/multitable/multitable_in_example.pl
index dc5400d0aa..551da83230 100644
--- a/tp/t/results/multitable/multitable_in_example.pl
+++ b/tp/t/results/multitable/multitable_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'multitable_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -45,7 +45,7 @@ $result_trees{'multitable_in_example'} = {
                       'type' => 'bracketed'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -209,7 +209,7 @@ $result_trees{'multitable_in_example'} = {
                           'text' => 'multitable'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -218,9 +218,11 @@ $result_trees{'multitable_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'multitable'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 11,
@@ -243,7 +245,9 @@ $result_trees{'multitable_in_example'} = {
                     ],
                     'type' => 'bracketed_multitable_prototype'
                   }
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -265,9 +269,11 @@ $result_trees{'multitable_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
diff --git a/tp/t/results/multitable/multitable_not_closed.pl 
b/tp/t/results/multitable/multitable_not_closed.pl
index 14c09f99c4..5757dc55fb 100644
--- a/tp/t/results/multitable/multitable_not_closed.pl
+++ b/tp/t/results/multitable/multitable_not_closed.pl
@@ -33,7 +33,7 @@ $result_trees{'multitable_not_closed'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -56,7 +56,9 @@ $result_trees{'multitable_not_closed'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/multitable_not_closed_item.pl 
b/tp/t/results/multitable/multitable_not_closed_item.pl
index c5d6c4ffc6..9650832b85 100644
--- a/tp/t/results/multitable/multitable_not_closed_item.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item.pl
@@ -33,7 +33,7 @@ $result_trees{'multitable_not_closed_item'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -97,7 +97,9 @@ $result_trees{'multitable_not_closed_item'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/multitable_not_closed_item_tab.pl 
b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
index 2a9d04bca1..7983f5bb81 100644
--- a/tp/t/results/multitable/multitable_not_closed_item_tab.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
@@ -33,7 +33,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -122,7 +122,9 @@ $result_trees{'multitable_not_closed_item_tab'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl 
b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
index ede4b54efd..bc2ac18461 100644
--- a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
@@ -22,7 +22,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -264,7 +264,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -273,9 +273,11 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -292,7 +294,9 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl 
b/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
index c006e8ae5d..38ffeb6fb9 100644
--- a/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
@@ -21,7 +21,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                           'text' => '0.4 0.6'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -33,7 +33,9 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                     'misc_args' => [
                       '0.4',
                       '0.6'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -261,7 +263,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -270,9 +272,11 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -282,7 +286,9 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/multitable_with_empty_item_tab.pl 
b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
index 45319983c3..d760df02a4 100644
--- a/tp/t/results/multitable/multitable_with_empty_item_tab.pl
+++ b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
@@ -21,7 +21,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                           'text' => '0.3 0.7'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -33,7 +33,9 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                     'misc_args' => [
                       '0.3',
                       '0.7'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -208,7 +210,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -217,9 +219,11 @@ $result_trees{'multitable_with_empty_item_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -229,7 +233,9 @@ $result_trees{'multitable_with_empty_item_tab'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/not_letters_in_prototype.pl 
b/tp/t/results/multitable/not_letters_in_prototype.pl
index c4a4b8e5d4..34a798ad74 100644
--- a/tp/t/results/multitable/not_letters_in_prototype.pl
+++ b/tp/t/results/multitable/not_letters_in_prototype.pl
@@ -17,7 +17,7 @@ $result_trees{'not_letters_in_prototype'} = {
                   'text' => '1.3  5-6'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -98,7 +98,7 @@ $result_trees{'not_letters_in_prototype'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -107,9 +107,11 @@ $result_trees{'not_letters_in_prototype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -128,7 +130,9 @@ $result_trees{'not_letters_in_prototype'} = {
                 'text' => '5-6',
                 'type' => 'row_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/paragraph_in_cells.pl 
b/tp/t/results/multitable/paragraph_in_cells.pl
index a082b5dc19..c3f000807c 100644
--- a/tp/t/results/multitable/paragraph_in_cells.pl
+++ b/tp/t/results/multitable/paragraph_in_cells.pl
@@ -33,7 +33,7 @@ $result_trees{'paragraph_in_cells'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -212,9 +212,11 @@ $result_trees{'paragraph_in_cells'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -237,7 +239,9 @@ $result_trees{'paragraph_in_cells'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/prototype_brace_no_brace.pl 
b/tp/t/results/multitable/prototype_brace_no_brace.pl
index 0f67159e23..3933d4d283 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace.pl
@@ -25,7 +25,7 @@ $result_trees{'prototype_brace_no_brace'} = {
                   'text' => ' bb'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -42,7 +42,7 @@ $result_trees{'prototype_brace_no_brace'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -51,9 +51,11 @@ $result_trees{'prototype_brace_no_brace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -74,7 +76,9 @@ $result_trees{'prototype_brace_no_brace'} = {
                 'text' => 'bb',
                 'type' => 'row_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl 
b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
index 8c4836bf6c..ebdc5bf8e9 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -56,7 +56,7 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +65,11 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -88,7 +90,9 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
                 'text' => 'bb',
                 'type' => 'row_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/prototype_no_brace.pl 
b/tp/t/results/multitable/prototype_no_brace.pl
index 36829e8056..748106dbd6 100644
--- a/tp/t/results/multitable/prototype_no_brace.pl
+++ b/tp/t/results/multitable/prototype_no_brace.pl
@@ -38,7 +38,7 @@ $result_trees{'prototype_no_brace'} = {
                   'text' => ' b    cc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -55,7 +55,7 @@ $result_trees{'prototype_no_brace'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -64,9 +64,11 @@ $result_trees{'prototype_no_brace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -89,7 +91,9 @@ $result_trees{'prototype_no_brace'} = {
                 'text' => 'cc',
                 'type' => 'row_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index c751dc4fd7..2fd322943d 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -86,7 +86,7 @@ $result_trees{'ref_in_multitable'} = {
                           'text' => '.35 .65'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -98,7 +98,9 @@ $result_trees{'ref_in_multitable'} = {
                     'misc_args' => [
                       '.35',
                       '.65'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -418,7 +420,7 @@ $result_trees{'ref_in_multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -427,9 +429,11 @@ $result_trees{'ref_in_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -439,7 +443,9 @@ $result_trees{'ref_in_multitable'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/multitable/w_in_multitable.pl 
b/tp/t/results/multitable/w_in_multitable.pl
index f72c898d2c..8db4f07746 100644
--- a/tp/t/results/multitable/w_in_multitable.pl
+++ b/tp/t/results/multitable/w_in_multitable.pl
@@ -33,7 +33,7 @@ $result_trees{'w_in_multitable'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -137,7 +137,7 @@ $result_trees{'w_in_multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -146,9 +146,11 @@ $result_trees{'w_in_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -171,7 +173,9 @@ $result_trees{'w_in_multitable'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/paragraph/close_paragraph_command.pl 
b/tp/t/results/paragraph/close_paragraph_command.pl
index 70c29c49f1..32799851f0 100644
--- a/tp/t/results/paragraph/close_paragraph_command.pl
+++ b/tp/t/results/paragraph/close_paragraph_command.pl
@@ -66,7 +66,7 @@ $result_trees{'close_paragraph_command'} = {
                   'text' => '4'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -77,7 +77,9 @@ $result_trees{'close_paragraph_command'} = {
           'extra' => {
             'misc_args' => [
               '4'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index 97322a0fce..acc601b06d 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -12,7 +12,7 @@ $result_trees{'commands_in_flushright'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -29,7 +29,7 @@ $result_trees{'commands_in_flushright'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -55,7 +55,7 @@ $result_trees{'commands_in_flushright'} = {
                           'text' => 'group'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -64,9 +64,11 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'group'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -93,7 +95,7 @@ $result_trees{'commands_in_flushright'} = {
                       'text' => 'type'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -119,7 +121,7 @@ $result_trees{'commands_in_flushright'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -128,9 +130,11 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -138,7 +142,7 @@ $result_trees{'commands_in_flushright'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -155,7 +159,7 @@ $result_trees{'commands_in_flushright'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -229,7 +233,7 @@ $result_trees{'commands_in_flushright'} = {
                           'text' => 'enumerate'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -238,9 +242,11 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'enumerate'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 15,
@@ -276,7 +282,7 @@ $result_trees{'commands_in_flushright'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -297,7 +303,7 @@ $result_trees{'commands_in_flushright'} = {
                                   'text' => 'table item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -305,7 +311,7 @@ $result_trees{'commands_in_flushright'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -322,7 +328,7 @@ $result_trees{'commands_in_flushright'} = {
                                   'text' => 'table itemx'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -330,7 +336,7 @@ $result_trees{'commands_in_flushright'} = {
                             }
                           ],
                           'cmdname' => 'itemx',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -381,7 +387,7 @@ $result_trees{'commands_in_flushright'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -390,9 +396,11 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 23,
@@ -401,7 +409,9 @@ $result_trees{'commands_in_flushright'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -427,7 +437,7 @@ $result_trees{'commands_in_flushright'} = {
                               'text' => '0.5 0.5'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -439,7 +449,9 @@ $result_trees{'commands_in_flushright'} = {
                         'misc_args' => [
                           '0.5',
                           '0.5'
-                        ],
+                        ]
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -606,7 +618,7 @@ $result_trees{'commands_in_flushright'} = {
                           'text' => 'multitable'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -615,9 +627,11 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'multitable'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 33,
@@ -627,7 +641,9 @@ $result_trees{'commands_in_flushright'} = {
               ],
               'extra' => {
                 'columnfractions' => {},
-                'max_columns' => 2,
+                'max_columns' => 2
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -657,7 +673,7 @@ $result_trees{'commands_in_flushright'} = {
                       'text' => 'type'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 ',
                     'spaces_before_argument' => ' '
@@ -724,7 +740,7 @@ $result_trees{'commands_in_flushright'} = {
                           'text' => 'float'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -733,9 +749,11 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'float'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 40,
@@ -749,7 +767,6 @@ $result_trees{'commands_in_flushright'} = {
                   {}
                 ],
                 'normalized' => 'type',
-                'spaces_before_argument' => ' ',
                 'type' => {
                   'content' => [
                     {}
@@ -757,6 +774,9 @@ $result_trees{'commands_in_flushright'} = {
                   'normalized' => 'label'
                 }
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
@@ -785,7 +805,7 @@ $result_trees{'commands_in_flushright'} = {
                       'text' => '2'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -796,7 +816,9 @@ $result_trees{'commands_in_flushright'} = {
               'extra' => {
                 'misc_args' => [
                   '2'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -813,7 +835,7 @@ $result_trees{'commands_in_flushright'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -839,7 +861,7 @@ $result_trees{'commands_in_flushright'} = {
                           'text' => 'smallexample'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -848,9 +870,11 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'smallexample'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 47,
@@ -872,7 +896,7 @@ $result_trees{'commands_in_flushright'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -898,7 +922,7 @@ $result_trees{'commands_in_flushright'} = {
                           'text' => 'format'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -907,9 +931,11 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'format'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 51,
@@ -931,7 +957,7 @@ $result_trees{'commands_in_flushright'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -957,7 +983,7 @@ $result_trees{'commands_in_flushright'} = {
                           'text' => 'flushleft'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -966,9 +992,11 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'flushleft'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 55,
@@ -995,7 +1023,7 @@ $result_trees{'commands_in_flushright'} = {
                       'text' => 'in center'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1003,7 +1031,7 @@ $result_trees{'commands_in_flushright'} = {
                 }
               ],
               'cmdname' => 'center',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1025,7 +1053,7 @@ $result_trees{'commands_in_flushright'} = {
                       'text' => 'flushright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1034,9 +1062,11 @@ $result_trees{'commands_in_flushright'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 59,
@@ -1192,6 +1222,7 @@ $result_floats{'commands_in_flushright'} = {
           'normalized' => 'label'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/paragraph/comment_in_quotation.pl 
b/tp/t/results/paragraph/comment_in_quotation.pl
index 968c8467ae..9fefac61d6 100644
--- a/tp/t/results/paragraph/comment_in_quotation.pl
+++ b/tp/t/results/paragraph/comment_in_quotation.pl
@@ -17,7 +17,7 @@ $result_trees{'comment_in_quotation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -58,7 +58,7 @@ $result_trees{'comment_in_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -67,9 +67,11 @@ $result_trees{'comment_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -91,7 +93,7 @@ $result_trees{'comment_in_quotation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -132,7 +134,7 @@ $result_trees{'comment_in_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -141,9 +143,11 @@ $result_trees{'comment_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/paragraph/paragraph_command.pl 
b/tp/t/results/paragraph/paragraph_command.pl
index 4f403d5c34..0e3cafb467 100644
--- a/tp/t/results/paragraph/paragraph_command.pl
+++ b/tp/t/results/paragraph/paragraph_command.pl
@@ -162,7 +162,7 @@ $result_trees{'paragraph_command'} = {
                   'text' => 'foo,\\,//'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -175,7 +175,9 @@ $result_trees{'paragraph_command'} = {
               'foo',
               '\\',
               '//'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/paragraph/paragraph_count_and_example.pl 
b/tp/t/results/paragraph/paragraph_count_and_example.pl
index 8919e079f5..e253ff2883 100644
--- a/tp/t/results/paragraph/paragraph_count_and_example.pl
+++ b/tp/t/results/paragraph/paragraph_count_and_example.pl
@@ -12,7 +12,7 @@ $result_trees{'paragraph_count_and_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -38,7 +38,7 @@ $result_trees{'paragraph_count_and_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -47,9 +47,11 @@ $result_trees{'paragraph_count_and_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/paragraph/paragraph_indent_asis.pl 
b/tp/t/results/paragraph/paragraph_indent_asis.pl
index a77aa3912b..ed9e9ff579 100644
--- a/tp/t/results/paragraph/paragraph_indent_asis.pl
+++ b/tp/t/results/paragraph/paragraph_indent_asis.pl
@@ -17,7 +17,7 @@ $result_trees{'paragraph_indent_asis'} = {
                   'text' => 'asis'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'paragraph_indent_asis'} = {
           'extra' => {
             'misc_args' => [
               'asis'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -67,7 +69,7 @@ $result_trees{'paragraph_indent_asis'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -97,7 +99,7 @@ $result_trees{'paragraph_indent_asis'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -106,9 +108,11 @@ $result_trees{'paragraph_indent_asis'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl 
b/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl
index a56ec3c3e1..438c087253 100644
--- a/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl
+++ b/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl
@@ -17,7 +17,7 @@ $result_trees{'U_with_utf8_enable_encoding'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'U_with_utf8_enable_encoding'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl 
b/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
index 53533977e4..c627f24df4 100644
--- a/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
+++ b/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
@@ -17,7 +17,7 @@ $result_trees{'accents_in_var_enable_encoding'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'accents_in_var_enable_encoding'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/plaintext_tests/all_spaces.pl 
b/tp/t/results/plaintext_tests/all_spaces.pl
index 21909dc65f..cd2642004e 100644
--- a/tp/t/results/plaintext_tests/all_spaces.pl
+++ b/tp/t/results/plaintext_tests/all_spaces.pl
@@ -19,7 +19,7 @@ $result_trees{'all_spaces'} = {
                       "text" => "utf-8"
                     }
                   ],
-                  "extra" => {
+                  "info" => {
                     "spaces_after_argument" => "\n"
                   },
                   "type" => "line_arg"
@@ -29,9 +29,11 @@ $result_trees{'all_spaces'} = {
               "extra" => {
                 "input_encoding_name" => "utf-8",
                 "input_perl_encoding" => "utf-8-strict",
-                "spaces_before_argument" => " ",
                 "text_arg" => "utf-8"
               },
+              "info" => {
+                "spaces_before_argument" => " "
+              },
               "source_info" => {
                 "file_name" => "all_spaces.texi",
                 "line_nr" => 1,
@@ -56,7 +58,7 @@ $result_trees{'all_spaces'} = {
               "text" => "Top"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -408,7 +410,9 @@ $result_trees{'all_spaces'} = {
             "normalized" => "Top"
           }
         ],
-        "normalized" => "Top",
+        "normalized" => "Top"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -544,14 +548,16 @@ $result_nodes{'all_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'all_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'all_spaces'} = [];
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 71163ce248..9a26e2fdee 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
@@ -12,7 +12,7 @@ $result_trees{'at_commands_glued_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -97,7 +97,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                           'text' => 'aaa bb cc'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -158,7 +158,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                           'text' => 'mali'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -318,7 +318,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                           'text' => '4'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -329,7 +329,9 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'extra' => {
                     'misc_args' => [
                       '4'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -380,7 +382,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                           'text' => 'index'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -399,7 +401,9 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -420,7 +424,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -429,9 +433,11 @@ $result_trees{'at_commands_glued_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
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 c4484c99ee..5a9997670d 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
@@ -85,7 +85,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                       'text' => 'aaa bb cc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -146,7 +146,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                       'text' => 'mali'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -309,7 +309,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'text' => '4'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -320,7 +320,9 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
           'extra' => {
             'misc_args' => [
               '4'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -373,7 +375,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                       'text' => 'index'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -392,7 +394,9 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
                   'index_type_command' => 'cindex'
-                },
+                }
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl 
b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
index 20b817ffe9..ce2bfbe738 100644
--- a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -29,7 +29,7 @@ $result_trees{'chinese_mixed_with_en'} = {
                       'text' => 'utf-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'chinese_mixed_with_en'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'utf-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'chinese_mixed_with_en.texi',
                 'line_nr' => 2,
@@ -62,7 +64,7 @@ $result_trees{'chinese_mixed_with_en'} = {
                       'text' => 'chinese_mixed_with_en.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +73,11 @@ $result_trees{'chinese_mixed_with_en'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'chinese_mixed_with_en.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'chinese_mixed_with_en.texi',
                 'line_nr' => 3,
@@ -88,7 +92,7 @@ $result_trees{'chinese_mixed_with_en'} = {
                       'text' => 'chinese mixed with english'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,7 +100,7 @@ $result_trees{'chinese_mixed_with_en'} = {
                 }
               ],
               'cmdname' => 'settitle',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -124,7 +128,7 @@ $result_trees{'chinese_mixed_with_en'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -304,7 +308,9 @@ $result_trees{'chinese_mixed_with_en'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -400,14 +406,16 @@ $result_nodes{'chinese_mixed_with_en'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'chinese_mixed_with_en'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'chinese_mixed_with_en'} = [];
diff --git a/tp/t/results/plaintext_tests/del_quote_linebreaking.pl 
b/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
index dc70a9bfc9..f3320f4a6b 100644
--- a/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
+++ b/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
@@ -50,7 +50,7 @@ $result_trees{'del_quote_linebreaking'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -117,7 +117,7 @@ $result_trees{'del_quote_linebreaking'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -184,7 +184,7 @@ $result_trees{'del_quote_linebreaking'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -265,7 +265,7 @@ $result_trees{'del_quote_linebreaking'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -332,7 +332,7 @@ $result_trees{'del_quote_linebreaking'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -399,7 +399,7 @@ $result_trees{'del_quote_linebreaking'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/plaintext_tests/east_asian_in_w.pl 
b/tp/t/results/plaintext_tests/east_asian_in_w.pl
index d26947ed19..2f4765add2 100644
--- a/tp/t/results/plaintext_tests/east_asian_in_w.pl
+++ b/tp/t/results/plaintext_tests/east_asian_in_w.pl
@@ -19,7 +19,7 @@ $result_trees{'east_asian_in_w'} = {
                       'text' => 'utf-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,9 +30,11 @@ $result_trees{'east_asian_in_w'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'utf-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'east_asian_in_w.texi',
                 'line_nr' => 1,
diff --git a/tp/t/results/plaintext_tests/empty_line_in_example_end.pl 
b/tp/t/results/plaintext_tests/empty_line_in_example_end.pl
index ec9f854ef2..dfd5e3926c 100644
--- a/tp/t/results/plaintext_tests/empty_line_in_example_end.pl
+++ b/tp/t/results/plaintext_tests/empty_line_in_example_end.pl
@@ -12,7 +12,7 @@ $result_trees{'empty_line_in_example_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'empty_line_in_example_end'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -52,9 +52,11 @@ $result_trees{'empty_line_in_example_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl 
b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
index 5d233c7e1f..dbe3cb5155 100644
--- a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
+++ b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
@@ -17,7 +17,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
                   'text' => 'a--n itemize line'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -50,7 +50,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -67,7 +67,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
                               'text' => 'multitable'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -76,9 +76,11 @@ $result_trees{'empty_multitable_in_itemize'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'multitable'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 5,
@@ -119,7 +121,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -128,9 +130,11 @@ $result_trees{'empty_multitable_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -138,7 +142,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/plaintext_tests/expanded_tex.pl 
b/tp/t/results/plaintext_tests/expanded_tex.pl
index b49721f3bd..7ad54d7a95 100644
--- a/tp/t/results/plaintext_tests/expanded_tex.pl
+++ b/tp/t/results/plaintext_tests/expanded_tex.pl
@@ -18,7 +18,7 @@ $result_trees{'expanded_tex'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -52,7 +52,7 @@ $result_trees{'expanded_tex'} = {
                           'text' => 'tex'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -61,9 +61,11 @@ $result_trees{'expanded_tex'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
diff --git a/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl 
b/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl
index ffa425e7bf..be2b862fbe 100644
--- a/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl
+++ b/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl
@@ -12,7 +12,7 @@ $result_trees{'flushright_not_closed_and_format'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -38,7 +38,7 @@ $result_trees{'flushright_not_closed_and_format'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -64,7 +64,7 @@ $result_trees{'flushright_not_closed_and_format'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -73,9 +73,11 @@ $result_trees{'flushright_not_closed_and_format'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
diff --git a/tp/t/results/plaintext_tests/html_expanded.pl 
b/tp/t/results/plaintext_tests/html_expanded.pl
index b0e17fc3f5..0f20e2dd5b 100644
--- a/tp/t/results/plaintext_tests/html_expanded.pl
+++ b/tp/t/results/plaintext_tests/html_expanded.pl
@@ -18,7 +18,7 @@ $result_trees{'html_expanded'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,7 +44,7 @@ $result_trees{'html_expanded'} = {
                           'text' => 'html'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -53,9 +53,11 @@ $result_trees{'html_expanded'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
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 e44063e182..6cce3e3c07 100644
--- a/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
+++ b/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
@@ -12,7 +12,7 @@ $result_trees{'insert_copying_and_paragraph'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -38,7 +38,7 @@ $result_trees{'insert_copying_and_paragraph'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -47,9 +47,11 @@ $result_trees{'insert_copying_and_paragraph'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
diff --git a/tp/t/results/plaintext_tests/isolated_html_expanded.pl 
b/tp/t/results/plaintext_tests/isolated_html_expanded.pl
index cb7736f974..552e9ce4ec 100644
--- a/tp/t/results/plaintext_tests/isolated_html_expanded.pl
+++ b/tp/t/results/plaintext_tests/isolated_html_expanded.pl
@@ -17,7 +17,7 @@ $result_trees{'isolated_html_expanded'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'isolated_html_expanded'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -52,9 +52,11 @@ $result_trees{'isolated_html_expanded'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl 
b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
index 0b97ddba0b..af177a99ad 100644
--- a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
+++ b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -30,7 +30,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                       'type' => 'command_as_argument_inserted'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,7 +65,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -74,9 +74,11 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -112,7 +114,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                       'type' => 'command_as_argument_inserted'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -168,7 +170,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -177,9 +179,11 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -215,7 +219,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                       'type' => 'command_as_argument_inserted'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -276,7 +280,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -285,9 +289,11 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 14,
@@ -323,7 +329,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                       'type' => 'command_as_argument_inserted'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -405,7 +411,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                           'text' => 'itemize'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -414,9 +420,11 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 20,
@@ -451,7 +459,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -460,9 +468,11 @@ $result_trees{'itemize_in_headitem_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index e7edf470a2..c2ac2484b9 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -29,7 +29,7 @@ $result_trees{'japanese_utf8'} = {
                       'text' => 'UTF-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -40,9 +40,11 @@ $result_trees{'japanese_utf8'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'UTF-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
                 'line_nr' => 2,
@@ -62,7 +64,7 @@ $result_trees{'japanese_utf8'} = {
                       'text' => 'japanese_utf8.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -71,9 +73,11 @@ $result_trees{'japanese_utf8'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'japanese_utf8.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
                 'line_nr' => 3,
@@ -88,7 +92,7 @@ $result_trees{'japanese_utf8'} = {
                       'text' => 'GNU LilyPond -- Manuel d\'initiation japanese'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -96,7 +100,7 @@ $result_trees{'japanese_utf8'} = {
                 }
               ],
               'cmdname' => 'settitle',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -118,7 +122,7 @@ $result_trees{'japanese_utf8'} = {
                       'text' => 'ja'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -127,9 +131,11 @@ $result_trees{'japanese_utf8'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ja'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
                 'line_nr' => 6,
@@ -155,7 +161,7 @@ $result_trees{'japanese_utf8'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -175,7 +181,9 @@ $result_trees{'japanese_utf8'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -192,7 +200,7 @@ $result_trees{'japanese_utf8'} = {
               'text' => "GNU LilyPond --- 
\x{5b66}\x{7fd2}\x{30de}\x{30cb}\x{30e5}\x{30a2}\x{30eb}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -209,7 +217,7 @@ $result_trees{'japanese_utf8'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -327,7 +335,7 @@ $result_trees{'japanese_utf8'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -336,9 +344,11 @@ $result_trees{'japanese_utf8'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
                 'line_nr' => 20,
@@ -379,7 +389,7 @@ $result_trees{'japanese_utf8'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -494,7 +504,7 @@ $result_trees{'japanese_utf8'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -503,9 +513,11 @@ $result_trees{'japanese_utf8'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
                 'line_nr' => 28,
@@ -525,7 +537,8 @@ $result_trees{'japanese_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -542,7 +555,7 @@ $result_trees{'japanese_utf8'} = {
               'text' => 'Preface'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -562,7 +575,9 @@ $result_trees{'japanese_utf8'} = {
             'normalized' => 'Preface'
           }
         ],
-        'normalized' => 'Preface',
+        'normalized' => 'Preface'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -579,7 +594,7 @@ $result_trees{'japanese_utf8'} = {
               'text' => 'Preface'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -613,7 +628,8 @@ $result_trees{'japanese_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -630,7 +646,7 @@ $result_trees{'japanese_utf8'} = {
               'text' => 'Introduction'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -650,7 +666,9 @@ $result_trees{'japanese_utf8'} = {
             'normalized' => 'Introduction'
           }
         ],
-        'normalized' => 'Introduction',
+        'normalized' => 'Introduction'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -667,7 +685,7 @@ $result_trees{'japanese_utf8'} = {
               'text' => 'Introduction'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -696,7 +714,8 @@ $result_trees{'japanese_utf8'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -809,9 +828,11 @@ $result_sectioning{'japanese_utf8'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -822,9 +843,11 @@ $result_sectioning{'japanese_utf8'} = {
                   'extra' => {
                     'normalized' => 'Preface'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -841,9 +864,11 @@ $result_sectioning{'japanese_utf8'} = {
                   'extra' => {
                     'normalized' => 'Introduction'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -877,6 +902,7 @@ $result_nodes{'japanese_utf8'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -886,6 +912,7 @@ $result_nodes{'japanese_utf8'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -893,12 +920,14 @@ $result_nodes{'japanese_utf8'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Preface'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -906,12 +935,14 @@ $result_nodes{'japanese_utf8'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'Introduction'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -935,18 +966,21 @@ $result_menus{'japanese_utf8'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Preface'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Introduction'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/plaintext_tests/line_passed_and_formats.pl 
b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
index edb9d9f368..07b5d4518f 100644
--- a/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -18,7 +18,7 @@ $result_trees{'line_passed_and_formats'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -40,7 +40,7 @@ $result_trees{'line_passed_and_formats'} = {
                   'text' => 'special'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -61,7 +61,7 @@ $result_trees{'line_passed_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -91,7 +91,7 @@ $result_trees{'line_passed_and_formats'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -100,9 +100,11 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 8,
@@ -124,7 +126,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -133,9 +135,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -143,7 +147,7 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -160,7 +164,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -181,7 +185,7 @@ $result_trees{'line_passed_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -207,7 +211,7 @@ $result_trees{'line_passed_and_formats'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -216,9 +220,11 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 15,
@@ -240,7 +246,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -249,9 +255,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -273,7 +281,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -294,7 +302,7 @@ $result_trees{'line_passed_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -320,7 +328,7 @@ $result_trees{'line_passed_and_formats'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -329,9 +337,11 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 22,
@@ -353,7 +363,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -362,9 +372,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -386,7 +398,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -412,7 +424,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -421,9 +433,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -440,7 +454,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -466,7 +480,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -475,9 +489,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -499,7 +515,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -525,7 +541,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -534,9 +550,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -553,7 +571,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -579,7 +597,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -588,9 +606,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -612,7 +632,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -633,7 +653,7 @@ $result_trees{'line_passed_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -659,7 +679,7 @@ $result_trees{'line_passed_and_formats'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -668,9 +688,11 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 43,
@@ -701,7 +723,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -710,9 +732,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 45,
@@ -734,7 +758,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -755,7 +779,7 @@ $result_trees{'line_passed_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -781,7 +805,7 @@ $result_trees{'line_passed_and_formats'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -790,9 +814,11 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 51,
@@ -823,7 +849,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -832,9 +858,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 53,
@@ -856,7 +884,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -877,7 +905,7 @@ $result_trees{'line_passed_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -903,7 +931,7 @@ $result_trees{'line_passed_and_formats'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -912,9 +940,11 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 59,
@@ -945,7 +975,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -954,9 +984,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 61,
@@ -987,7 +1019,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1013,7 +1045,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1022,9 +1054,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 66,
@@ -1064,7 +1098,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1090,7 +1124,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1099,9 +1133,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 72,
@@ -1141,7 +1177,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1177,7 +1213,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1186,9 +1222,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 80,
@@ -1228,7 +1266,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1264,7 +1302,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1273,9 +1311,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 88,
@@ -1329,7 +1369,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1346,7 +1386,7 @@ $result_trees{'line_passed_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1382,7 +1422,7 @@ $result_trees{'line_passed_and_formats'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1391,9 +1431,11 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 100,
@@ -1420,7 +1462,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1429,9 +1471,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 102,
@@ -1462,7 +1506,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1479,7 +1523,7 @@ $result_trees{'line_passed_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1505,7 +1549,7 @@ $result_trees{'line_passed_and_formats'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1514,9 +1558,11 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 109,
@@ -1543,7 +1589,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1552,9 +1598,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 111,
@@ -1585,7 +1633,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1607,7 +1655,7 @@ $result_trees{'line_passed_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1643,7 +1691,7 @@ $result_trees{'line_passed_and_formats'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1652,9 +1700,11 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 120,
@@ -1686,7 +1736,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1695,9 +1745,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 122,
@@ -1728,7 +1780,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1750,7 +1802,7 @@ $result_trees{'line_passed_and_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1776,7 +1828,7 @@ $result_trees{'line_passed_and_formats'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1785,9 +1837,11 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 129,
@@ -1819,7 +1873,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1828,9 +1882,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 131,
@@ -1861,7 +1917,7 @@ $result_trees{'line_passed_and_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1939,7 +1995,7 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1948,9 +2004,11 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 136,
@@ -1986,7 +2044,9 @@ $result_trees{'line_passed_and_formats'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2235,6 +2295,7 @@ $result_nodes{'line_passed_and_formats'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -2256,6 +2317,7 @@ $result_menus{'line_passed_and_formats'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
diff --git a/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl 
b/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
index 98e96caebc..29e9e7d795 100644
--- a/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
+++ b/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
@@ -37,7 +37,7 @@ $result_trees{'lone_braces_in_inlineraw'} = {
                       'type' => 'bracketed'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/plaintext_tests/long_uref_after_item.pl 
b/tp/t/results/plaintext_tests/long_uref_after_item.pl
index d79d955b18..e0f3bb5733 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -18,7 +18,7 @@ $result_trees{'long_uref_after_item'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -80,7 +80,7 @@ $result_trees{'long_uref_after_item'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -89,9 +89,11 @@ $result_trees{'long_uref_after_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/plaintext_tests/multiline_image_and_align.pl 
b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
index cd078b755b..c5fc7724d4 100644
--- a/tp/t/results/plaintext_tests/multiline_image_and_align.pl
+++ b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
@@ -35,7 +35,7 @@ $result_trees{'multiline_image_and_align'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -86,7 +86,7 @@ $result_trees{'multiline_image_and_align'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -94,7 +94,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -137,7 +137,7 @@ $result_trees{'multiline_image_and_align'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -145,7 +145,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -191,7 +191,7 @@ $result_trees{'multiline_image_and_align'} = {
                   'text' => ' iiiii'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -199,7 +199,7 @@ $result_trees{'multiline_image_and_align'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -216,7 +216,7 @@ $result_trees{'multiline_image_and_align'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -368,7 +368,7 @@ $result_trees{'multiline_image_and_align'} = {
                       'text' => 'flushright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -377,9 +377,11 @@ $result_trees{'multiline_image_and_align'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
diff --git a/tp/t/results/plaintext_tests/multitable.pl 
b/tp/t/results/plaintext_tests/multitable.pl
index a736826247..b8d65a2004 100644
--- a/tp/t/results/plaintext_tests/multitable.pl
+++ b/tp/t/results/plaintext_tests/multitable.pl
@@ -33,7 +33,7 @@ $result_trees{'multitable'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -173,7 +173,7 @@ $result_trees{'multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -182,9 +182,11 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -207,7 +209,9 @@ $result_trees{'multitable'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -245,7 +249,7 @@ $result_trees{'multitable'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1098,7 +1102,7 @@ $result_trees{'multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1107,9 +1111,11 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -1132,7 +1138,9 @@ $result_trees{'multitable'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1170,7 +1178,7 @@ $result_trees{'multitable'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1369,7 +1377,7 @@ $result_trees{'multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1378,9 +1386,11 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -1403,7 +1413,9 @@ $result_trees{'multitable'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1430,7 +1442,7 @@ $result_trees{'multitable'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1524,7 +1536,7 @@ $result_trees{'multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1533,9 +1545,11 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 33,
@@ -1552,7 +1566,9 @@ $result_trees{'multitable'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1590,7 +1606,7 @@ $result_trees{'multitable'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1740,7 +1756,7 @@ $result_trees{'multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1749,9 +1765,11 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 42,
@@ -1774,7 +1792,9 @@ $result_trees{'multitable'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl 
b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
index 2f002a32a0..2451c86ae6 100644
--- a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
+++ b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
@@ -12,7 +12,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -29,7 +29,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                       'text' => 'a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -140,7 +140,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                           'text' => 'multitable'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -149,9 +149,11 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'multitable'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -166,7 +168,9 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                     'text' => 'a',
                     'type' => 'row_prototype'
                   }
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -183,7 +187,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -192,9 +196,11 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/plaintext_tests/nested_code_commands.pl 
b/tp/t/results/plaintext_tests/nested_code_commands.pl
index 0516e5d66f..1f04d0f788 100644
--- a/tp/t/results/plaintext_tests/nested_code_commands.pl
+++ b/tp/t/results/plaintext_tests/nested_code_commands.pl
@@ -342,7 +342,7 @@ $result_trees{'nested_code_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -688,7 +688,7 @@ $result_trees{'nested_code_commands'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -697,9 +697,11 @@ $result_trees{'nested_code_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -721,7 +723,7 @@ $result_trees{'nested_code_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1045,7 +1047,7 @@ $result_trees{'nested_code_commands'} = {
                       'text' => 'display'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1054,9 +1056,11 @@ $result_trees{'nested_code_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
diff --git a/tp/t/results/plaintext_tests/nested_indentedblock.pl 
b/tp/t/results/plaintext_tests/nested_indentedblock.pl
index 1c043c2aa6..f225c8dc8b 100644
--- a/tp/t/results/plaintext_tests/nested_indentedblock.pl
+++ b/tp/t/results/plaintext_tests/nested_indentedblock.pl
@@ -12,7 +12,7 @@ $result_trees{'nested_indentedblock'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -33,7 +33,7 @@ $result_trees{'nested_indentedblock'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -59,7 +59,7 @@ $result_trees{'nested_indentedblock'} = {
                           'text' => 'indentedblock'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -68,9 +68,11 @@ $result_trees{'nested_indentedblock'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'indentedblock'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -92,7 +94,7 @@ $result_trees{'nested_indentedblock'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -101,9 +103,11 @@ $result_trees{'nested_indentedblock'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -125,7 +129,7 @@ $result_trees{'nested_indentedblock'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -150,7 +154,7 @@ $result_trees{'nested_indentedblock'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -176,7 +180,7 @@ $result_trees{'nested_indentedblock'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -185,9 +189,11 @@ $result_trees{'nested_indentedblock'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 12,
@@ -209,7 +215,7 @@ $result_trees{'nested_indentedblock'} = {
                       'text' => 'indentedblock'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -218,9 +224,11 @@ $result_trees{'nested_indentedblock'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'indentedblock'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
diff --git a/tp/t/results/plaintext_tests/nested_multitable.pl 
b/tp/t/results/plaintext_tests/nested_multitable.pl
index 313153ff49..d930c2524a 100644
--- a/tp/t/results/plaintext_tests/nested_multitable.pl
+++ b/tp/t/results/plaintext_tests/nested_multitable.pl
@@ -44,7 +44,7 @@ $result_trees{'nested_multitable'} = {
                   'type' => 'bracketed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -89,7 +89,7 @@ $result_trees{'nested_multitable'} = {
                                   'type' => 'bracketed'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -170,7 +170,7 @@ $result_trees{'nested_multitable'} = {
                                       'text' => 'multitable'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -179,9 +179,11 @@ $result_trees{'nested_multitable'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'spaces_before_argument' => ' ',
                                 'text_arg' => 'multitable'
                               },
+                              'info' => {
+                                'spaces_before_argument' => ' '
+                              },
                               'source_info' => {
                                 'file_name' => '',
                                 'line_nr' => 6,
@@ -204,7 +206,9 @@ $result_trees{'nested_multitable'} = {
                                 ],
                                 'type' => 'bracketed_multitable_prototype'
                               }
-                            ],
+                            ]
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -329,7 +333,7 @@ $result_trees{'nested_multitable'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -338,9 +342,11 @@ $result_trees{'nested_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -365,7 +371,9 @@ $result_trees{'nested_multitable'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl 
b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
index 2452ca01b5..aedb8d12a1 100644
--- a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
+++ b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
@@ -29,7 +29,7 @@ $result_trees{'no_empty_line_after_section'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -53,7 +53,7 @@ $result_trees{'no_empty_line_after_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -70,7 +70,7 @@ $result_trees{'no_empty_line_after_section'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -126,7 +126,7 @@ $result_trees{'no_empty_line_after_section'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -143,7 +143,7 @@ $result_trees{'no_empty_line_after_section'} = {
               'text' => 'sec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -192,7 +192,7 @@ $result_trees{'no_empty_line_after_section'} = {
                   'text' => '3'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -203,7 +203,9 @@ $result_trees{'no_empty_line_after_section'} = {
           'extra' => {
             'misc_args' => [
               '3'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -213,7 +215,7 @@ $result_trees{'no_empty_line_after_section'} = {
           }
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -230,7 +232,7 @@ $result_trees{'no_empty_line_after_section'} = {
               'text' => 'after sp'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -270,7 +272,7 @@ $result_trees{'no_empty_line_after_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -330,17 +332,17 @@ $result_sectioning{'no_empty_line_after_section'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -349,7 +351,7 @@ $result_sectioning{'no_empty_line_after_section'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.2',
diff --git 
a/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl 
b/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl
index 6e1d29d059..fc04a8646a 100644
--- a/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl
@@ -17,7 +17,7 @@ $result_trees{'no_punctuation_commands_frenchspacing'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'no_punctuation_commands_frenchspacing'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/plaintext_tests/non_break_spaces.pl 
b/tp/t/results/plaintext_tests/non_break_spaces.pl
index 6442333f3e..44ac19f2e9 100644
--- a/tp/t/results/plaintext_tests/non_break_spaces.pl
+++ b/tp/t/results/plaintext_tests/non_break_spaces.pl
@@ -19,7 +19,7 @@ $result_trees{'non_break_spaces'} = {
                       'text' => 'utf-8'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -30,9 +30,11 @@ $result_trees{'non_break_spaces'} = {
               'extra' => {
                 'input_encoding_name' => 'utf-8',
                 'input_perl_encoding' => 'utf-8-strict',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'utf-8'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'non_break_spaces.texi',
                 'line_nr' => 1,
@@ -58,7 +60,7 @@ $result_trees{'non_break_spaces'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -98,7 +100,9 @@ $result_trees{'non_break_spaces'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -132,14 +136,16 @@ $result_nodes{'non_break_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'non_break_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'non_break_spaces'} = [];
diff --git a/tp/t/results/plaintext_tests/paragraphindent.pl 
b/tp/t/results/plaintext_tests/paragraphindent.pl
index 66371d3419..f9a4b18da8 100644
--- a/tp/t/results/plaintext_tests/paragraphindent.pl
+++ b/tp/t/results/plaintext_tests/paragraphindent.pl
@@ -49,7 +49,7 @@ $result_trees{'paragraphindent'} = {
                   'text' => 'asis'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -60,7 +60,9 @@ $result_trees{'paragraphindent'} = {
           'extra' => {
             'misc_args' => [
               'asis'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -100,7 +102,7 @@ $result_trees{'paragraphindent'} = {
                   'text' => '0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -111,7 +113,9 @@ $result_trees{'paragraphindent'} = {
           'extra' => {
             'misc_args' => [
               '0'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -151,7 +155,7 @@ $result_trees{'paragraphindent'} = {
                   'text' => '7'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -162,7 +166,9 @@ $result_trees{'paragraphindent'} = {
           'extra' => {
             'misc_args' => [
               '7'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/plaintext_tests/protect_spaces_on_line.pl 
b/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
index c764cbe6be..9a0b3c9b49 100644
--- a/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
+++ b/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
@@ -73,7 +73,7 @@ $result_trees{'protect_spaces_on_line'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -132,7 +132,7 @@ $result_trees{'protect_spaces_on_line'} = {
                       'text' => '  afterw'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -140,7 +140,7 @@ $result_trees{'protect_spaces_on_line'} = {
                 }
               ],
               'cmdname' => 'exdent',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -157,7 +157,7 @@ $result_trees{'protect_spaces_on_line'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -166,9 +166,11 @@ $result_trees{'protect_spaces_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl 
b/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
index c294cb1437..e8202c9b30 100644
--- a/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
+++ b/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
@@ -112,7 +112,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
                       'text' => 'expL'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -144,7 +144,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
                       'text' => 'explA'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -176,7 +176,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
                       'text' => 'expl'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -209,7 +209,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
                       'text' => 'expla'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl 
b/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
index 7a19babed4..0a86d8b3be 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
@@ -17,7 +17,7 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
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 3093a00d27..ab36a96bf4 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
@@ -17,7 +17,7 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git 
a/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl 
b/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
index 6da835e0d4..66923c2e5b 100644
--- a/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
+++ b/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
@@ -17,7 +17,7 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl 
b/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
index 660cb6c376..666b6727d1 100644
--- a/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
@@ -17,7 +17,7 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'punctuation_commands_frenchspacing'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl 
b/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl
index ec36288baf..193595e27c 100644
--- a/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl
+++ b/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl
@@ -17,7 +17,7 @@ $result_trees{'punctuation_frenchspacing'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'punctuation_frenchspacing'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct.pl
index 8a9257c892..3579b6ea28 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct.pl
@@ -39,7 +39,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,9 @@ $result_trees{'punctuation_sc_accents_ascii_punct'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,8 @@ $result_trees{'punctuation_sc_accents_ascii_punct'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +111,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -128,7 +131,9 @@ $result_trees{'punctuation_sc_accents_ascii_punct'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -145,7 +150,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1119,7 +1124,8 @@ $result_trees{'punctuation_sc_accents_ascii_punct'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1196,9 +1202,11 @@ $result_sectioning{'punctuation_sc_accents_ascii_punct'} 
= {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1209,9 +1217,11 @@ $result_sectioning{'punctuation_sc_accents_ascii_punct'} 
= {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1240,10 +1250,12 @@ $result_nodes{'punctuation_sc_accents_ascii_punct'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1251,12 +1263,14 @@ $result_nodes{'punctuation_sc_accents_ascii_punct'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1272,6 +1286,7 @@ $result_menus{'punctuation_sc_accents_ascii_punct'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct_latin1.pl
index cabab01450..aba20262e2 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct_latin1.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct_latin1.pl
@@ -34,7 +34,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct_latin1'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'punctuation_sc_accents_ascii_punct_latin1'} = 
{
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct_latin1'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'punctuation_sc_accents_ascii_punct_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct_latin1'} 
= {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'punctuation_sc_accents_ascii_punct_latin1'} 
= {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct_latin1'} 
= {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'punctuation_sc_accents_ascii_punct_latin1'} 
= {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct_latin1'} 
= {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1153,7 +1160,8 @@ 
$result_trees{'punctuation_sc_accents_ascii_punct_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1233,9 +1241,11 @@ 
$result_sectioning{'punctuation_sc_accents_ascii_punct_latin1'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1246,9 +1256,11 @@ 
$result_sectioning{'punctuation_sc_accents_ascii_punct_latin1'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1277,10 +1289,12 @@ 
$result_nodes{'punctuation_sc_accents_ascii_punct_latin1'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1288,12 +1302,14 @@ 
$result_nodes{'punctuation_sc_accents_ascii_punct_latin1'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1309,6 +1325,7 @@ 
$result_menus{'punctuation_sc_accents_ascii_punct_latin1'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct_usascii.pl
index 45677ed221..d5cf7c7434 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct_usascii.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_punct_usascii.pl
@@ -34,7 +34,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct_usascii'} = 
{
                       'text' => 'US-ASCII'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'punctuation_sc_accents_ascii_punct_usascii'} 
= {
               'extra' => {
                 'input_encoding_name' => 'us-ascii',
                 'input_perl_encoding' => 'ascii',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'US-ASCII'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct_usascii'} = 
{
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'punctuation_sc_accents_ascii_punct_usascii'} = 
{
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct_usascii'} 
= {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'punctuation_sc_accents_ascii_punct_usascii'} 
= {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct_usascii'} 
= {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'punctuation_sc_accents_ascii_punct_usascii'} 
= {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'punctuation_sc_accents_ascii_punct_usascii'} 
= {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1174,7 +1181,8 @@ 
$result_trees{'punctuation_sc_accents_ascii_punct_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1254,9 +1262,11 @@ 
$result_sectioning{'punctuation_sc_accents_ascii_punct_usascii'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1267,9 +1277,11 @@ 
$result_sectioning{'punctuation_sc_accents_ascii_punct_usascii'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1298,10 +1310,12 @@ 
$result_nodes{'punctuation_sc_accents_ascii_punct_usascii'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1309,12 +1323,14 @@ 
$result_nodes{'punctuation_sc_accents_ascii_punct_usascii'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1330,6 +1346,7 @@ 
$result_menus{'punctuation_sc_accents_ascii_punct_usascii'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
index a9b8626b44..3eb9a97e92 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
@@ -39,7 +39,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,9 @@ $result_trees{'punctuation_sc_accents_default'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +111,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -128,7 +131,9 @@ $result_trees{'punctuation_sc_accents_default'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -145,7 +150,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1119,7 +1124,8 @@ $result_trees{'punctuation_sc_accents_default'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1196,9 +1202,11 @@ $result_sectioning{'punctuation_sc_accents_default'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1209,9 +1217,11 @@ $result_sectioning{'punctuation_sc_accents_default'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1240,10 +1250,12 @@ $result_nodes{'punctuation_sc_accents_default'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1251,12 +1263,14 @@ $result_nodes{'punctuation_sc_accents_default'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1272,6 +1286,7 @@ $result_menus{'punctuation_sc_accents_default'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
index 1260bf0961..86ee33c6f2 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
@@ -34,7 +34,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1153,7 +1160,8 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1233,9 +1241,11 @@ 
$result_sectioning{'punctuation_sc_accents_default_latin1'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1246,9 +1256,11 @@ 
$result_sectioning{'punctuation_sc_accents_default_latin1'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1277,10 +1289,12 @@ $result_nodes{'punctuation_sc_accents_default_latin1'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1288,12 +1302,14 @@ $result_nodes{'punctuation_sc_accents_default_latin1'} 
= {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1309,6 +1325,7 @@ $result_menus{'punctuation_sc_accents_default_latin1'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
index dcc7b5e3a6..ce0661a922 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
@@ -34,7 +34,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
                       'text' => 'US-ASCII'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'extra' => {
                 'input_encoding_name' => 'us-ascii',
                 'input_perl_encoding' => 'ascii',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'US-ASCII'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1174,7 +1181,8 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1254,9 +1262,11 @@ 
$result_sectioning{'punctuation_sc_accents_default_usascii'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1267,9 +1277,11 @@ 
$result_sectioning{'punctuation_sc_accents_default_usascii'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1298,10 +1310,12 @@ $result_nodes{'punctuation_sc_accents_default_usascii'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1309,12 +1323,14 @@ $result_nodes{'punctuation_sc_accents_default_usascii'} 
= {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1330,6 +1346,7 @@ $result_menus{'punctuation_sc_accents_default_usascii'} = 
{
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
index 16f487aa50..86d29d7ee8 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
@@ -39,7 +39,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,9 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +111,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -128,7 +131,9 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -145,7 +150,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1119,7 +1124,8 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1196,9 +1202,11 @@ 
$result_sectioning{'punctuation_sc_accents_disable_encoding'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1209,9 +1217,11 @@ 
$result_sectioning{'punctuation_sc_accents_disable_encoding'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1240,10 +1250,12 @@ 
$result_nodes{'punctuation_sc_accents_disable_encoding'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1251,12 +1263,14 @@ 
$result_nodes{'punctuation_sc_accents_disable_encoding'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1272,6 +1286,7 @@ $result_menus{'punctuation_sc_accents_disable_encoding'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
index 1a44c9dd20..b112d3249c 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
@@ -34,7 +34,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1153,7 +1160,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1233,9 +1241,11 @@ 
$result_sectioning{'punctuation_sc_accents_disable_encoding_latin1'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1246,9 +1256,11 @@ 
$result_sectioning{'punctuation_sc_accents_disable_encoding_latin1'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1277,10 +1289,12 @@ 
$result_nodes{'punctuation_sc_accents_disable_encoding_latin1'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1288,12 +1302,14 @@ 
$result_nodes{'punctuation_sc_accents_disable_encoding_latin1'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1309,6 +1325,7 @@ 
$result_menus{'punctuation_sc_accents_disable_encoding_latin1'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
index 73bedb4b08..5823a109a5 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
@@ -34,7 +34,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
                       'text' => 'US-ASCII'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'extra' => {
                 'input_encoding_name' => 'us-ascii',
                 'input_perl_encoding' => 'ascii',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'US-ASCII'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1174,7 +1181,8 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1254,9 +1262,11 @@ 
$result_sectioning{'punctuation_sc_accents_disable_encoding_usascii'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1267,9 +1277,11 @@ 
$result_sectioning{'punctuation_sc_accents_disable_encoding_usascii'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1298,10 +1310,12 @@ 
$result_nodes{'punctuation_sc_accents_disable_encoding_usascii'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1309,12 +1323,14 @@ 
$result_nodes{'punctuation_sc_accents_disable_encoding_usascii'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1330,6 +1346,7 @@ 
$result_menus{'punctuation_sc_accents_disable_encoding_usascii'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_punct_latin1.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_punct_latin1.pl
index 390ca3f51f..cbd31a2cd6 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_punct_latin1.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_punct_latin1.pl
@@ -34,7 +34,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1153,7 +1160,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1233,9 +1241,11 @@ 
$result_sectioning{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1246,9 +1256,11 @@ 
$result_sectioning{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1277,10 +1289,12 @@ 
$result_nodes{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1288,12 +1302,14 @@ 
$result_nodes{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1309,6 +1325,7 @@ 
$result_menus{'punctuation_sc_accents_to_utf8_ascii_punct_latin1'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_punct_usascii.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_punct_usascii.pl
index 80ee942063..c9a89456a3 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_punct_usascii.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_punct_usascii.pl
@@ -34,7 +34,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
                       'text' => 'US-ASCII'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
               'extra' => {
                 'input_encoding_name' => 'us-ascii',
                 'input_perl_encoding' => 'ascii',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'US-ASCII'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1174,7 +1181,8 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1254,9 +1262,11 @@ 
$result_sectioning{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1267,9 +1277,11 @@ 
$result_sectioning{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1298,10 +1310,12 @@ 
$result_nodes{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1309,12 +1323,14 @@ 
$result_nodes{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1330,6 +1346,7 @@ 
$result_menus{'punctuation_sc_accents_to_utf8_ascii_punct_usascii'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
index 2f92a01d32..a86c5e8b07 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
@@ -34,7 +34,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
                       'text' => 'ISO-8859-1'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'extra' => {
                 'input_encoding_name' => 'iso-8859-1',
                 'input_perl_encoding' => 'iso-8859-1',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ISO-8859-1'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_latin1.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1153,7 +1160,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1233,9 +1241,11 @@ 
$result_sectioning{'punctuation_sc_accents_to_utf8_latin1'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1246,9 +1256,11 @@ 
$result_sectioning{'punctuation_sc_accents_to_utf8_latin1'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1277,10 +1289,12 @@ $result_nodes{'punctuation_sc_accents_to_utf8_latin1'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1288,12 +1302,14 @@ $result_nodes{'punctuation_sc_accents_to_utf8_latin1'} 
= {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1309,6 +1325,7 @@ $result_menus{'punctuation_sc_accents_to_utf8_latin1'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
index 3d3b073ab1..10f41b7f62 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
@@ -34,7 +34,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
                       'text' => 'US-ASCII'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -45,9 +45,11 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'extra' => {
                 'input_encoding_name' => 'us-ascii',
                 'input_perl_encoding' => 'ascii',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'US-ASCII'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'punctuation_small_case_accents_us_ascii.texi',
                 'line_nr' => 3,
@@ -73,7 +75,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,9 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -110,7 +114,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +147,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => 'node chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -162,7 +167,9 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
             'normalized' => 'node-chap'
           }
         ],
-        'normalized' => 'node-chap',
+        'normalized' => 'node-chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -179,7 +186,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1174,7 +1181,8 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1254,9 +1262,11 @@ 
$result_sectioning{'punctuation_sc_accents_to_utf8_usascii'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1267,9 +1277,11 @@ 
$result_sectioning{'punctuation_sc_accents_to_utf8_usascii'} = {
                   'extra' => {
                     'normalized' => 'node-chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1298,10 +1310,12 @@ $result_nodes{'punctuation_sc_accents_to_utf8_usascii'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1309,12 +1323,14 @@ $result_nodes{'punctuation_sc_accents_to_utf8_usascii'} 
= {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1330,6 +1346,7 @@ $result_menus{'punctuation_sc_accents_to_utf8_usascii'} = 
{
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index d0dd7c1922..6468fa29ce 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -24,7 +24,7 @@ $result_trees{'quote_node_names'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'quote_node_names'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'quote_node_names'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'the::caption and a word'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -137,7 +139,7 @@ $result_trees{'quote_node_names'} = {
                           'text' => 'direction'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -173,7 +175,7 @@ $result_trees{'quote_node_names'} = {
                           'text' => 'ion'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -193,7 +195,7 @@ $result_trees{'quote_node_names'} = {
                           'text' => 'direct::i.on'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -245,7 +247,9 @@ $result_trees{'quote_node_names'} = {
                         'normalized' => 'direct_003a_003ai_002eon'
                       }
                     ],
-                    'normalized' => 'normal-node',
+                    'normalized' => 'normal-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -287,7 +291,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'the::caption'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -339,7 +343,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'the::caption and a word'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -355,7 +359,7 @@ $result_trees{'quote_node_names'} = {
                           'text' => 'blah:blah'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -375,7 +379,9 @@ $result_trees{'quote_node_names'} = {
                         'normalized' => 'blah_003ablah'
                       }
                     ],
-                    'normalized' => 'blah_003ablah',
+                    'normalized' => 'blah_003ablah'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -417,7 +423,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'the::caption'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -469,7 +475,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'the::caption and a word'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -485,7 +491,7 @@ $result_trees{'quote_node_names'} = {
                           'text' => 'blumpty.fump'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -505,7 +511,9 @@ $result_trees{'quote_node_names'} = {
                         'normalized' => 'blumpty_002efump'
                       }
                     ],
-                    'normalized' => 'blumpty_002efump',
+                    'normalized' => 'blumpty_002efump'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -547,7 +555,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'the::caption'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -675,7 +683,7 @@ $result_trees{'quote_node_names'} = {
                           }
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -695,7 +703,9 @@ $result_trees{'quote_node_names'} = {
                         'normalized' => 'secret_002cnode'
                       }
                     ],
-                    'normalized' => 'secret_002cnode',
+                    'normalized' => 'secret_002cnode'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -916,7 +926,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'label'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -927,7 +937,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'man_ual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -988,7 +998,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'label'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -999,7 +1009,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'man_ual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1060,7 +1070,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'label'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1071,7 +1081,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'man:u.al'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1082,7 +1092,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'Book Title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1135,7 +1145,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'label'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1146,7 +1156,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'man:u.al'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1157,7 +1167,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'Book Title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1210,7 +1220,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'la:bel'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1221,7 +1231,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'man:u.al'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1232,7 +1242,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'Book Title'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -1267,7 +1277,7 @@ $result_trees{'quote_node_names'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1656,7 +1666,7 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1665,9 +1675,11 @@ $result_trees{'quote_node_names'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 40,
@@ -1703,7 +1715,7 @@ $result_trees{'quote_node_names'} = {
               'text' => 'blah:blah'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1732,7 +1744,8 @@ $result_trees{'quote_node_names'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1750,7 +1763,7 @@ $result_trees{'quote_node_names'} = {
               'text' => 'blumpty.fump'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1765,7 +1778,8 @@ $result_trees{'quote_node_names'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1783,7 +1797,7 @@ $result_trees{'quote_node_names'} = {
               'text' => 'normal node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1798,7 +1812,8 @@ $result_trees{'quote_node_names'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1831,7 +1846,7 @@ $result_trees{'quote_node_names'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1846,7 +1861,8 @@ $result_trees{'quote_node_names'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1863,7 +1879,7 @@ $result_trees{'quote_node_names'} = {
               'text' => 'top secret node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1899,7 +1915,9 @@ $result_trees{'quote_node_names'} = {
             'normalized' => 'top-secret-node'
           }
         ],
-        'normalized' => 'top-secret-node',
+        'normalized' => 'top-secret-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2104,6 +2122,7 @@ $result_sectioning{'quote_node_names'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -2117,9 +2136,11 @@ $result_sectioning{'quote_node_names'} = {
                   'extra' => {
                     'normalized' => 'blah_003ablah'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2136,9 +2157,11 @@ $result_sectioning{'quote_node_names'} = {
                   'extra' => {
                     'normalized' => 'blumpty_002efump'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -2156,9 +2179,11 @@ $result_sectioning{'quote_node_names'} = {
                   'extra' => {
                     'normalized' => 'normal-node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -2176,9 +2201,11 @@ $result_sectioning{'quote_node_names'} = {
                   'extra' => {
                     'normalized' => 'secret_002cnode'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -2229,6 +2256,7 @@ $result_nodes{'quote_node_names'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2236,12 +2264,14 @@ $result_nodes{'quote_node_names'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'blah_003ablah'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -2249,12 +2279,14 @@ $result_nodes{'quote_node_names'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'blumpty_002efump'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -2262,12 +2294,14 @@ $result_nodes{'quote_node_names'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => 'normal-node'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'extra' => {
@@ -2329,30 +2363,35 @@ $result_menus{'quote_node_names'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'blah_003ablah'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'blumpty_002efump'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'normal-node'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'secret_002cnode'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl 
b/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
index 43dfb6025b..9ff8d3b515 100644
--- a/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
+++ b/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
@@ -17,7 +17,7 @@ $result_trees{'sc_with_utf8_enable_encoding'} = {
                   'text' => 'utf-8'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,9 +28,11 @@ $result_trees{'sc_with_utf8_enable_encoding'} = {
           'extra' => {
             'input_encoding_name' => 'utf-8',
             'input_perl_encoding' => 'utf-8-strict',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'utf-8'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
diff --git a/tp/t/results/plaintext_tests/settitle_and_empty_top.pl 
b/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
index 67809d02ae..f4a2160e09 100644
--- a/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
+++ b/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
@@ -17,7 +17,7 @@ $result_trees{'settitle_and_empty_top'} = {
                   'text' => 'Title'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -25,7 +25,7 @@ $result_trees{'settitle_and_empty_top'} = {
             }
           ],
           'cmdname' => 'settitle',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -45,7 +45,7 @@ $result_trees{'settitle_and_empty_top'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
diff --git a/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl 
b/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl
index c2f31186b9..9717eea19e 100644
--- a/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl
+++ b/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl
@@ -17,7 +17,7 @@ $result_trees{'sp_with_text_before_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -39,7 +39,7 @@ $result_trees{'sp_with_text_before_in_example'} = {
                           'text' => '4'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -50,7 +50,9 @@ $result_trees{'sp_with_text_before_in_example'} = {
                   'extra' => {
                     'misc_args' => [
                       '4'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -74,7 +76,7 @@ $result_trees{'sp_with_text_before_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -83,9 +85,11 @@ $result_trees{'sp_with_text_before_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/plaintext_tests/star_at_command_formatting.pl 
b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
index 69fe65b0b9..9e923fef3b 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -86,7 +86,7 @@ $result_trees{'star_at_command_formatting'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -95,9 +95,11 @@ $result_trees{'star_at_command_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -348,7 +350,7 @@ $result_trees{'star_at_command_formatting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -584,7 +586,7 @@ $result_trees{'star_at_command_formatting'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -593,9 +595,11 @@ $result_trees{'star_at_command_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -617,7 +621,7 @@ $result_trees{'star_at_command_formatting'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -858,7 +862,7 @@ $result_trees{'star_at_command_formatting'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -867,9 +871,11 @@ $result_trees{'star_at_command_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
diff --git a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl 
b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
index 20b2055f46..1a46499db3 100644
--- a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'tab_in_table_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -35,7 +35,7 @@ $result_trees{'tab_in_table_in_example'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,7 +74,7 @@ $result_trees{'tab_in_table_in_example'} = {
                                   'text' => 'table item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -82,7 +82,7 @@ $result_trees{'tab_in_table_in_example'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -132,7 +132,7 @@ $result_trees{'tab_in_table_in_example'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -141,9 +141,11 @@ $result_trees{'tab_in_table_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -152,7 +154,9 @@ $result_trees{'tab_in_table_in_example'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -169,7 +173,7 @@ $result_trees{'tab_in_table_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -178,9 +182,11 @@ $result_trees{'tab_in_table_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/plaintext_tests/tab_item_in_example.pl 
b/tp/t/results/plaintext_tests/tab_item_in_example.pl
index 9d4ed5a431..cce1a8dae8 100644
--- a/tp/t/results/plaintext_tests/tab_item_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_item_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'tab_item_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -55,7 +55,7 @@ $result_trees{'tab_item_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -64,9 +64,11 @@ $result_trees{'tab_item_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/plaintext_tests/xref_quote_long_item.pl 
b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
index f5035124ee..25e8da8d31 100644
--- a/tp/t/results/plaintext_tests/xref_quote_long_item.pl
+++ b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
@@ -23,7 +23,7 @@ $result_trees{'xref_quote_long_item'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -72,7 +72,7 @@ $result_trees{'xref_quote_long_item'} = {
                               }
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -80,7 +80,7 @@ $result_trees{'xref_quote_long_item'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -147,7 +147,7 @@ $result_trees{'xref_quote_long_item'} = {
                                   'text' => 
'Texinfo::Convert::Utils::expand_verbatiminclude'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => '
 '
                               },
@@ -159,7 +159,7 @@ $result_trees{'xref_quote_long_item'} = {
                                   'text' => 'tp_api'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'type' => 'brace_command_arg'
@@ -209,7 +209,7 @@ $result_trees{'xref_quote_long_item'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -218,9 +218,11 @@ $result_trees{'xref_quote_long_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -229,7 +231,9 @@ $result_trees{'xref_quote_long_item'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index 5fd83512a8..4425774b35 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -17,7 +17,7 @@ $result_trees{'caption_in_example'} = {
                   'text' => 'float'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -34,7 +34,7 @@ $result_trees{'caption_in_example'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -109,7 +109,7 @@ $result_trees{'caption_in_example'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -118,9 +118,11 @@ $result_trees{'caption_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -142,7 +144,7 @@ $result_trees{'caption_in_example'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -151,9 +153,11 @@ $result_trees{'caption_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -163,7 +167,6 @@ $result_trees{'caption_in_example'} = {
           ],
           'extra' => {
             'caption' => {},
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -171,6 +174,9 @@ $result_trees{'caption_in_example'} = {
               'normalized' => 'float'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -241,7 +247,8 @@ $result_floats{'caption_in_example'} = {
           ],
           'normalized' => 'float'
         }
-      }
+      },
+      'info' => {}
     }
   ]
 };
diff --git a/tp/t/results/preformatted/comment_example_and_blank_lines.pl 
b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
index faebb2a2b2..2050b4f27c 100644
--- a/tp/t/results/preformatted/comment_example_and_blank_lines.pl
+++ b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
@@ -26,7 +26,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -67,7 +67,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -76,9 +76,11 @@ $result_trees{'comment_example_and_blank_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -114,7 +116,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -155,7 +157,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -164,9 +166,11 @@ $result_trees{'comment_example_and_blank_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -197,7 +201,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -223,7 +227,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -232,9 +236,11 @@ $result_trees{'comment_example_and_blank_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -270,7 +276,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -296,7 +302,7 @@ $result_trees{'comment_example_and_blank_lines'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -305,9 +311,11 @@ $result_trees{'comment_example_and_blank_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
diff --git a/tp/t/results/preformatted/comments_in_example.pl 
b/tp/t/results/preformatted/comments_in_example.pl
index 8d73ea40d4..a7926ebf1f 100644
--- a/tp/t/results/preformatted/comments_in_example.pl
+++ b/tp/t/results/preformatted/comments_in_example.pl
@@ -21,7 +21,7 @@ $result_trees{'comments_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -81,7 +81,7 @@ $result_trees{'comments_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -90,9 +90,11 @@ $result_trees{'comments_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -123,7 +125,7 @@ $result_trees{'comments_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -164,7 +166,7 @@ $result_trees{'comments_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -173,9 +175,11 @@ $result_trees{'comments_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -206,7 +210,7 @@ $result_trees{'comments_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -256,7 +260,7 @@ $result_trees{'comments_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -265,9 +269,11 @@ $result_trees{'comments_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index e45817ea70..28a2185d04 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'def_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -129,7 +129,7 @@ $result_trees{'def_in_example'} = {
                           'text' => 'defun'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -138,9 +138,11 @@ $result_trees{'def_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'defun'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -148,7 +150,7 @@ $result_trees{'def_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -165,7 +167,7 @@ $result_trees{'def_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -174,9 +176,11 @@ $result_trees{'def_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/preformatted/empty_line.pl 
b/tp/t/results/preformatted/empty_line.pl
index b92bc67be3..60c235f4ed 100644
--- a/tp/t/results/preformatted/empty_line.pl
+++ b/tp/t/results/preformatted/empty_line.pl
@@ -12,7 +12,7 @@ $result_trees{'empty_line'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -47,7 +47,7 @@ $result_trees{'empty_line'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -56,9 +56,11 @@ $result_trees{'empty_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/preformatted/empty_line_style_command.pl 
b/tp/t/results/preformatted/empty_line_style_command.pl
index 6cd1efa430..c85cae2083 100644
--- a/tp/t/results/preformatted/empty_line_style_command.pl
+++ b/tp/t/results/preformatted/empty_line_style_command.pl
@@ -12,7 +12,7 @@ $result_trees{'empty_line_style_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -68,7 +68,7 @@ $result_trees{'empty_line_style_command'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -77,9 +77,11 @@ $result_trees{'empty_line_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/preformatted/example_at_commands_arguments.pl 
b/tp/t/results/preformatted/example_at_commands_arguments.pl
index 929510fd91..ec40057302 100644
--- a/tp/t/results/preformatted/example_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_at_commands_arguments.pl
@@ -139,7 +139,7 @@ $result_trees{'example_at_commands_arguments'} = {
                   'text' => '0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -171,7 +171,7 @@ $result_trees{'example_at_commands_arguments'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -180,9 +180,11 @@ $result_trees{'example_at_commands_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -190,7 +192,7 @@ $result_trees{'example_at_commands_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/preformatted/example_class.pl 
b/tp/t/results/preformatted/example_class.pl
index f0990cb068..44ca2dea5c 100644
--- a/tp/t/results/preformatted/example_class.pl
+++ b/tp/t/results/preformatted/example_class.pl
@@ -17,7 +17,7 @@ $result_trees{'example_class'} = {
                   'text' => 'perl'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -110,7 +110,7 @@ $result_trees{'example_class'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -119,9 +119,11 @@ $result_trees{'example_class'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -129,7 +131,7 @@ $result_trees{'example_class'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/preformatted/example_empty_arguments.pl 
b/tp/t/results/preformatted/example_empty_arguments.pl
index 196f6c1c81..7f7784a2e7 100644
--- a/tp/t/results/preformatted/example_empty_arguments.pl
+++ b/tp/t/results/preformatted/example_empty_arguments.pl
@@ -30,7 +30,7 @@ $result_trees{'example_empty_arguments'} = {
               'type' => 'block_line_arg'
             },
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -56,7 +56,7 @@ $result_trees{'example_empty_arguments'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -65,9 +65,11 @@ $result_trees{'example_empty_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -75,7 +77,7 @@ $result_trees{'example_empty_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -95,7 +97,7 @@ $result_trees{'example_empty_arguments'} = {
               'type' => 'block_line_arg'
             },
             {
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -104,7 +106,7 @@ $result_trees{'example_empty_arguments'} = {
               'type' => 'block_line_arg'
             },
             {
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '  '
               },
               'type' => 'block_line_arg'
@@ -116,7 +118,7 @@ $result_trees{'example_empty_arguments'} = {
               'type' => 'block_line_arg'
             },
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -142,7 +144,7 @@ $result_trees{'example_empty_arguments'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -151,9 +153,11 @@ $result_trees{'example_empty_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -161,7 +165,7 @@ $result_trees{'example_empty_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -201,7 +205,7 @@ $result_trees{'example_empty_arguments'} = {
               'type' => 'block_line_arg'
             },
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -227,7 +231,7 @@ $result_trees{'example_empty_arguments'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -236,9 +240,11 @@ $result_trees{'example_empty_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -246,7 +252,7 @@ $result_trees{'example_empty_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl 
b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
index 5fb2935d2a..73fdc86998 100644
--- a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
@@ -102,7 +102,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                   'text' => 'on example line'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -117,7 +117,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                           'text' => 'in center'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -125,7 +125,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                     }
                   ],
                   'cmdname' => 'center',
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -135,7 +135,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -151,7 +151,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -160,9 +160,11 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -170,7 +172,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/preformatted/example_multi_class.pl 
b/tp/t/results/preformatted/example_multi_class.pl
index ae03282cc8..e4efb63682 100644
--- a/tp/t/results/preformatted/example_multi_class.pl
+++ b/tp/t/results/preformatted/example_multi_class.pl
@@ -17,7 +17,7 @@ $result_trees{'example_multi_class'} = {
                   'text' => 'C++'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -28,7 +28,7 @@ $result_trees{'example_multi_class'} = {
                   'text' => 'gothic'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -39,7 +39,7 @@ $result_trees{'example_multi_class'} = {
                   'text' => 'purple'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -50,7 +50,7 @@ $result_trees{'example_multi_class'} = {
                   'text' => 'embed'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -174,7 +174,7 @@ $result_trees{'example_multi_class'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -183,9 +183,11 @@ $result_trees{'example_multi_class'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -193,7 +195,7 @@ $result_trees{'example_multi_class'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/preformatted/insertcopying_in_example.pl 
b/tp/t/results/preformatted/insertcopying_in_example.pl
index eb74c349b1..3b231c327f 100644
--- a/tp/t/results/preformatted/insertcopying_in_example.pl
+++ b/tp/t/results/preformatted/insertcopying_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'insertcopying_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -53,7 +53,7 @@ $result_trees{'insertcopying_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -62,9 +62,11 @@ $result_trees{'insertcopying_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/preformatted/nested_example_and_comment.pl 
b/tp/t/results/preformatted/nested_example_and_comment.pl
index e0f2416340..15e56a8dce 100644
--- a/tp/t/results/preformatted/nested_example_and_comment.pl
+++ b/tp/t/results/preformatted/nested_example_and_comment.pl
@@ -12,7 +12,7 @@ $result_trees{'nested_example_and_comment'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -48,7 +48,7 @@ $result_trees{'nested_example_and_comment'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,7 +74,7 @@ $result_trees{'nested_example_and_comment'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -83,9 +83,11 @@ $result_trees{'nested_example_and_comment'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -116,7 +118,7 @@ $result_trees{'nested_example_and_comment'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -125,9 +127,11 @@ $result_trees{'nested_example_and_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -149,7 +153,7 @@ $result_trees{'nested_example_and_comment'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -185,7 +189,7 @@ $result_trees{'nested_example_and_comment'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -226,7 +230,7 @@ $result_trees{'nested_example_and_comment'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -235,9 +239,11 @@ $result_trees{'nested_example_and_comment'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 13,
@@ -268,7 +274,7 @@ $result_trees{'nested_example_and_comment'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -277,9 +283,11 @@ $result_trees{'nested_example_and_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -301,7 +309,7 @@ $result_trees{'nested_example_and_comment'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -337,7 +345,7 @@ $result_trees{'nested_example_and_comment'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -378,7 +386,7 @@ $result_trees{'nested_example_and_comment'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -387,9 +395,11 @@ $result_trees{'nested_example_and_comment'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 21,
@@ -435,7 +445,7 @@ $result_trees{'nested_example_and_comment'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -444,9 +454,11 @@ $result_trees{'nested_example_and_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
diff --git a/tp/t/results/preformatted/nested_formats.pl 
b/tp/t/results/preformatted/nested_formats.pl
index e169720b19..9ad3f503de 100644
--- a/tp/t/results/preformatted/nested_formats.pl
+++ b/tp/t/results/preformatted/nested_formats.pl
@@ -12,7 +12,7 @@ $result_trees{'nested_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -24,7 +24,7 @@ $result_trees{'nested_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -60,7 +60,7 @@ $result_trees{'nested_formats'} = {
                           'text' => 'example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -69,9 +69,11 @@ $result_trees{'nested_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
@@ -93,7 +95,7 @@ $result_trees{'nested_formats'} = {
                       'text' => 'format'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -102,9 +104,11 @@ $result_trees{'nested_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'format'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -126,7 +130,7 @@ $result_trees{'nested_formats'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -138,7 +142,7 @@ $result_trees{'nested_formats'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -174,7 +178,7 @@ $result_trees{'nested_formats'} = {
                           'text' => 'format'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -183,9 +187,11 @@ $result_trees{'nested_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'format'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 14,
@@ -207,7 +213,7 @@ $result_trees{'nested_formats'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -216,9 +222,11 @@ $result_trees{'nested_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
diff --git a/tp/t/results/preformatted/page_in_example.pl 
b/tp/t/results/preformatted/page_in_example.pl
index ebf6041995..a000ac9853 100644
--- a/tp/t/results/preformatted/page_in_example.pl
+++ b/tp/t/results/preformatted/page_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'page_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -48,7 +48,7 @@ $result_trees{'page_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -57,9 +57,11 @@ $result_trees{'page_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/preformatted/quote_dash_in_display.pl 
b/tp/t/results/preformatted/quote_dash_in_display.pl
index 5dea838874..95ef8a5bd9 100644
--- a/tp/t/results/preformatted/quote_dash_in_display.pl
+++ b/tp/t/results/preformatted/quote_dash_in_display.pl
@@ -17,7 +17,7 @@ $result_trees{'quote_dash_in_display'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -48,7 +48,7 @@ $result_trees{'quote_dash_in_display'} = {
                       'text' => 'display'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -57,9 +57,11 @@ $result_trees{'quote_dash_in_display'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/preformatted/quote_dash_in_example.pl 
b/tp/t/results/preformatted/quote_dash_in_example.pl
index 55874dd97f..488dab9a96 100644
--- a/tp/t/results/preformatted/quote_dash_in_example.pl
+++ b/tp/t/results/preformatted/quote_dash_in_example.pl
@@ -17,7 +17,7 @@ $result_trees{'quote_dash_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -48,7 +48,7 @@ $result_trees{'quote_dash_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -57,9 +57,11 @@ $result_trees{'quote_dash_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/preformatted/text_on_display_command_line.pl 
b/tp/t/results/preformatted/text_on_display_command_line.pl
index 163e51cf66..c9d3a5dbff 100644
--- a/tp/t/results/preformatted/text_on_display_command_line.pl
+++ b/tp/t/results/preformatted/text_on_display_command_line.pl
@@ -17,7 +17,7 @@ $result_trees{'text_on_display_command_line'} = {
                   'text' => 'text on line'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -34,7 +34,7 @@ $result_trees{'text_on_display_command_line'} = {
                       'text' => 'display'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'text_on_display_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -53,7 +55,7 @@ $result_trees{'text_on_display_command_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -75,7 +77,7 @@ $result_trees{'text_on_display_command_line'} = {
                   'text' => 'text on line followed by text'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +103,7 @@ $result_trees{'text_on_display_command_line'} = {
                       'text' => 'display'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -110,9 +112,11 @@ $result_trees{'text_on_display_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -120,7 +124,7 @@ $result_trees{'text_on_display_command_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -137,7 +141,7 @@ $result_trees{'text_on_display_command_line'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -163,7 +167,7 @@ $result_trees{'text_on_display_command_line'} = {
                       'text' => 'display text after end'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -172,9 +176,11 @@ $result_trees{'text_on_display_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'display text after end'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -196,7 +202,7 @@ $result_trees{'text_on_display_command_line'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -208,7 +214,7 @@ $result_trees{'text_on_display_command_line'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -225,7 +231,7 @@ $result_trees{'text_on_display_command_line'} = {
                           'text' => 'display text after end display nested in 
display'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -234,9 +240,11 @@ $result_trees{'text_on_display_command_line'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'display text after end display nested in 
display'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 14,
@@ -258,7 +266,7 @@ $result_trees{'text_on_display_command_line'} = {
                       'text' => 'display'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -267,9 +275,11 @@ $result_trees{'text_on_display_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
diff --git a/tp/t/results/preformatted/text_on_example_command_line.pl 
b/tp/t/results/preformatted/text_on_example_command_line.pl
index 5e8ffdac8b..f9a8e9e4c3 100644
--- a/tp/t/results/preformatted/text_on_example_command_line.pl
+++ b/tp/t/results/preformatted/text_on_example_command_line.pl
@@ -17,7 +17,7 @@ $result_trees{'text_on_example_command_line'} = {
                   'text' => 'text on line'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -34,7 +34,7 @@ $result_trees{'text_on_example_command_line'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'text_on_example_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -53,7 +55,7 @@ $result_trees{'text_on_example_command_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -75,7 +77,7 @@ $result_trees{'text_on_example_command_line'} = {
                   'text' => 'text on line followed by text'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +103,7 @@ $result_trees{'text_on_example_command_line'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -110,9 +112,11 @@ $result_trees{'text_on_example_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -120,7 +124,7 @@ $result_trees{'text_on_example_command_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -137,7 +141,7 @@ $result_trees{'text_on_example_command_line'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -163,7 +167,7 @@ $result_trees{'text_on_example_command_line'} = {
                       'text' => 'example text after end'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -172,9 +176,11 @@ $result_trees{'text_on_example_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example text after end'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -196,7 +202,7 @@ $result_trees{'text_on_example_command_line'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -208,7 +214,7 @@ $result_trees{'text_on_example_command_line'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -225,7 +231,7 @@ $result_trees{'text_on_example_command_line'} = {
                           'text' => 'example text after end example nested in 
example'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -234,9 +240,11 @@ $result_trees{'text_on_example_command_line'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'example text after end example nested in 
example'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 14,
@@ -258,7 +266,7 @@ $result_trees{'text_on_example_command_line'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -267,9 +275,11 @@ $result_trees{'text_on_example_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl 
b/tp/t/results/preformatted/titlefont_in_example.pl
index d35b4e7fdc..d58469ff1d 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'titlefont_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -60,7 +60,7 @@ $result_trees{'titlefont_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -69,9 +69,11 @@ $result_trees{'titlefont_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/quotation/comment_on_quotation_line.pl 
b/tp/t/results/quotation/comment_on_quotation_line.pl
index 1079ef730f..18572848ff 100644
--- a/tp/t/results/quotation/comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/comment_on_quotation_line.pl
@@ -60,7 +60,7 @@ $result_trees{'comment_on_quotation_line'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -69,9 +69,11 @@ $result_trees{'comment_on_quotation_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -79,7 +81,7 @@ $result_trees{'comment_on_quotation_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/quotation/empty_quotation.pl 
b/tp/t/results/quotation/empty_quotation.pl
index 2d2fa1c0dc..927b6bbfff 100644
--- a/tp/t/results/quotation/empty_quotation.pl
+++ b/tp/t/results/quotation/empty_quotation.pl
@@ -12,7 +12,7 @@ $result_trees{'empty_quotation'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -29,7 +29,7 @@ $result_trees{'empty_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -38,9 +38,11 @@ $result_trees{'empty_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -67,7 +69,7 @@ $result_trees{'empty_quotation'} = {
                   'text' => 'Empty'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -84,7 +86,7 @@ $result_trees{'empty_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -93,9 +95,11 @@ $result_trees{'empty_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -103,7 +107,7 @@ $result_trees{'empty_quotation'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -135,7 +139,7 @@ $result_trees{'empty_quotation'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -152,7 +156,7 @@ $result_trees{'empty_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -161,9 +165,11 @@ $result_trees{'empty_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -171,7 +177,7 @@ $result_trees{'empty_quotation'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -193,7 +199,7 @@ $result_trees{'empty_quotation'} = {
                   'cmdname' => '*'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -210,7 +216,7 @@ $result_trees{'empty_quotation'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -219,9 +225,11 @@ $result_trees{'empty_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -229,7 +237,7 @@ $result_trees{'empty_quotation'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
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 af661837e9..4a6e8702a2 100644
--- a/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
+++ b/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
@@ -17,7 +17,7 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
                   'text' => 'lean'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -69,7 +69,7 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -78,9 +78,11 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -88,7 +90,7 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/quotation/only_comment_on_quotation_line.pl 
b/tp/t/results/quotation/only_comment_on_quotation_line.pl
index 9bc39be9f6..a54ce79411 100644
--- a/tp/t/results/quotation/only_comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/only_comment_on_quotation_line.pl
@@ -52,7 +52,7 @@ $result_trees{'only_comment_on_quotation_line'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -61,9 +61,11 @@ $result_trees{'only_comment_on_quotation_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'only_comment_on_quotation_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/quotation/quotation_and_author.pl 
b/tp/t/results/quotation/quotation_and_author.pl
index bbc96f2dd6..200c7ce529 100644
--- a/tp/t/results/quotation/quotation_and_author.pl
+++ b/tp/t/results/quotation/quotation_and_author.pl
@@ -26,7 +26,7 @@ $result_trees{'quotation_and_author'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'quotation_and_author'} = {
                       'text' => 'Some One'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -52,7 +52,9 @@ $result_trees{'quotation_and_author'} = {
               ],
               'cmdname' => 'author',
               'extra' => {
-                'quotation' => {},
+                'quotation' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -78,7 +80,7 @@ $result_trees{'quotation_and_author'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -87,9 +89,11 @@ $result_trees{'quotation_and_author'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -130,7 +134,7 @@ $result_trees{'quotation_and_author'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -147,7 +151,7 @@ $result_trees{'quotation_and_author'} = {
                       'text' => 'An Author Name'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -156,7 +160,9 @@ $result_trees{'quotation_and_author'} = {
               ],
               'cmdname' => 'author',
               'extra' => {
-                'quotation' => {},
+                'quotation' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -182,7 +188,7 @@ $result_trees{'quotation_and_author'} = {
                       'text' => 'smallquotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -191,9 +197,11 @@ $result_trees{'quotation_and_author'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'smallquotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -225,7 +233,7 @@ $result_trees{'quotation_and_author'} = {
                   'text' => 'Note'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -242,7 +250,7 @@ $result_trees{'quotation_and_author'} = {
                       'text' => 'Some Notifier'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -251,7 +259,9 @@ $result_trees{'quotation_and_author'} = {
               ],
               'cmdname' => 'author',
               'extra' => {
-                'quotation' => {},
+                'quotation' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -277,7 +287,7 @@ $result_trees{'quotation_and_author'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -286,9 +296,11 @@ $result_trees{'quotation_and_author'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -299,7 +311,9 @@ $result_trees{'quotation_and_author'} = {
           'extra' => {
             'authors' => [
               {}
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/quotation/quotation_author_in_example.pl 
b/tp/t/results/quotation/quotation_author_in_example.pl
index 4b89ed48da..9c6151b2f8 100644
--- a/tp/t/results/quotation/quotation_author_in_example.pl
+++ b/tp/t/results/quotation/quotation_author_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'quotation_author_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -24,7 +24,7 @@ $result_trees{'quotation_author_in_example'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -43,7 +43,7 @@ $result_trees{'quotation_author_in_example'} = {
                               'text' => 'Some One'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -52,7 +52,9 @@ $result_trees{'quotation_author_in_example'} = {
                       ],
                       'cmdname' => 'author',
                       'extra' => {
-                        'quotation' => {},
+                        'quotation' => {}
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'quotation_author_in_example'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -85,9 +87,11 @@ $result_trees{'quotation_author_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -114,7 +118,7 @@ $result_trees{'quotation_author_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -123,9 +127,11 @@ $result_trees{'quotation_author_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
diff --git a/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl 
b/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
index 780d3a3e87..6354cbfb8f 100644
--- a/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
+++ b/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
@@ -30,7 +30,7 @@ $result_trees{'quotation_beginning_and_end_on_line'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -39,9 +39,11 @@ $result_trees{'quotation_beginning_and_end_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -49,7 +51,7 @@ $result_trees{'quotation_beginning_and_end_on_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/quotation/space_at_commands_end_quotation_line.pl 
b/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
index 3daa98d4be..5b949866c7 100644
--- a/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
+++ b/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
@@ -58,7 +58,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -67,9 +67,11 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -77,7 +79,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -108,7 +110,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
                   'cmdname' => ' '
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -149,7 +151,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -158,9 +160,11 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -168,7 +172,7 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/quotation/standard_quotations.pl 
b/tp/t/results/quotation/standard_quotations.pl
index a3bd1add4d..a41efdd8bb 100644
--- a/tp/t/results/quotation/standard_quotations.pl
+++ b/tp/t/results/quotation/standard_quotations.pl
@@ -17,7 +17,7 @@ $result_trees{'standard_quotations'} = {
                   'text' => 'Note'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'standard_quotations'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -52,9 +52,11 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -62,7 +64,7 @@ $result_trees{'standard_quotations'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -84,7 +86,7 @@ $result_trees{'standard_quotations'} = {
                   'text' => 'note'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -110,7 +112,7 @@ $result_trees{'standard_quotations'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -119,9 +121,11 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -129,7 +133,7 @@ $result_trees{'standard_quotations'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -151,7 +155,7 @@ $result_trees{'standard_quotations'} = {
                   'text' => 'Caution'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -177,7 +181,7 @@ $result_trees{'standard_quotations'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -186,9 +190,11 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -196,7 +202,7 @@ $result_trees{'standard_quotations'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -218,7 +224,7 @@ $result_trees{'standard_quotations'} = {
                   'text' => 'Important'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -244,7 +250,7 @@ $result_trees{'standard_quotations'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -253,9 +259,11 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -263,7 +271,7 @@ $result_trees{'standard_quotations'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -285,7 +293,7 @@ $result_trees{'standard_quotations'} = {
                   'text' => 'Tip'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -311,7 +319,7 @@ $result_trees{'standard_quotations'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -320,9 +328,11 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -330,7 +340,7 @@ $result_trees{'standard_quotations'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -352,7 +362,7 @@ $result_trees{'standard_quotations'} = {
                   'text' => 'Warning'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -378,7 +388,7 @@ $result_trees{'standard_quotations'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -387,9 +397,11 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -397,7 +409,7 @@ $result_trees{'standard_quotations'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/raw/beginning_and_end_on_line.pl 
b/tp/t/results/raw/beginning_and_end_on_line.pl
index 9cda5f0a0f..03b5d0cf1b 100644
--- a/tp/t/results/raw/beginning_and_end_on_line.pl
+++ b/tp/t/results/raw/beginning_and_end_on_line.pl
@@ -35,7 +35,7 @@ $result_trees{'beginning_and_end_on_line'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -44,9 +44,11 @@ $result_trees{'beginning_and_end_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -54,7 +56,7 @@ $result_trees{'beginning_and_end_on_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -89,7 +91,7 @@ $result_trees{'beginning_and_end_on_line'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -98,9 +100,11 @@ $result_trees{'beginning_and_end_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -108,7 +112,7 @@ $result_trees{'beginning_and_end_on_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -143,7 +147,7 @@ $result_trees{'beginning_and_end_on_line'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -152,9 +156,11 @@ $result_trees{'beginning_and_end_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -162,7 +168,7 @@ $result_trees{'beginning_and_end_on_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/raw/braces_in_tex.pl 
b/tp/t/results/raw/braces_in_tex.pl
index 4c596023e9..8634a42fe1 100644
--- a/tp/t/results/raw/braces_in_tex.pl
+++ b/tp/t/results/raw/braces_in_tex.pl
@@ -17,7 +17,7 @@ $result_trees{'braces_in_tex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'braces_in_tex'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'braces_in_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -103,7 +105,7 @@ $result_trees{'braces_in_tex'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -117,7 +119,7 @@ $result_trees{'braces_in_tex'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -165,7 +167,7 @@ $result_trees{'braces_in_tex'} = {
                               'text' => 'tex'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -174,9 +176,11 @@ $result_trees{'braces_in_tex'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'tex'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 18,
@@ -201,7 +205,7 @@ $result_trees{'braces_in_tex'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -210,9 +214,11 @@ $result_trees{'braces_in_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
diff --git a/tp/t/results/raw/displaymath.pl b/tp/t/results/raw/displaymath.pl
index 35c221fa91..f88d761e5e 100644
--- a/tp/t/results/raw/displaymath.pl
+++ b/tp/t/results/raw/displaymath.pl
@@ -12,7 +12,7 @@ $result_trees{'displaymath'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'displaymath'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -107,7 +109,7 @@ $result_trees{'displaymath'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -160,7 +162,7 @@ $result_trees{'displaymath'} = {
                       'text' => 'displaymath'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -169,9 +171,11 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/raw/displaymath_not_closed.pl 
b/tp/t/results/raw/displaymath_not_closed.pl
index beda9c339c..a837c25d9f 100644
--- a/tp/t/results/raw/displaymath_not_closed.pl
+++ b/tp/t/results/raw/displaymath_not_closed.pl
@@ -12,7 +12,7 @@ $result_trees{'displaymath_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/raw/inline_in_example.pl 
b/tp/t/results/raw/inline_in_example.pl
index 173f8b50f1..45ab858190 100644
--- a/tp/t/results/raw/inline_in_example.pl
+++ b/tp/t/results/raw/inline_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'inline_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -67,7 +67,7 @@ $result_trees{'inline_in_example'} = {
                           'text' => ' '
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -104,7 +104,7 @@ $result_trees{'inline_in_example'} = {
                           'text' => '`` '
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'brace_command_arg'
@@ -176,7 +176,7 @@ $result_trees{'inline_in_example'} = {
                           'text' => '</i>'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' 
 '
                       },
@@ -209,7 +209,7 @@ $result_trees{'inline_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -218,9 +218,11 @@ $result_trees{'inline_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
diff --git a/tp/t/results/raw/inline_missing_first_arg.pl 
b/tp/t/results/raw/inline_missing_first_arg.pl
index b5b14ee93a..1dc7b94a19 100644
--- a/tp/t/results/raw/inline_missing_first_arg.pl
+++ b/tp/t/results/raw/inline_missing_first_arg.pl
@@ -14,7 +14,7 @@ $result_trees{'inline_missing_first_arg'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/raw/inlinefmt.pl b/tp/t/results/raw/inlinefmt.pl
index 64666404c8..cab792542b 100644
--- a/tp/t/results/raw/inlinefmt.pl
+++ b/tp/t/results/raw/inlinefmt.pl
@@ -46,7 +46,7 @@ $result_trees{'inlinefmt'} = {
                       'text' => ' '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -104,7 +104,7 @@ $result_trees{'inlinefmt'} = {
                       'text' => '</i>'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/raw/inlinefmt_with_empty_line.pl 
b/tp/t/results/raw/inlinefmt_with_empty_line.pl
index e031669a41..530bdd3d40 100644
--- a/tp/t/results/raw/inlinefmt_with_empty_line.pl
+++ b/tp/t/results/raw/inlinefmt_with_empty_line.pl
@@ -36,7 +36,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
                       'type' => 'empty_line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -97,7 +97,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
                       'type' => 'empty_line'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/raw/inlineraw.pl b/tp/t/results/raw/inlineraw.pl
index ea08c5471b..25f4e01dfd 100644
--- a/tp/t/results/raw/inlineraw.pl
+++ b/tp/t/results/raw/inlineraw.pl
@@ -46,7 +46,7 @@ $result_trees{'inlineraw'} = {
                       'text' => ' '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -104,7 +104,7 @@ $result_trees{'inlineraw'} = {
                       'text' => '</i>'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/raw/inlineraw_with_empty_line.pl 
b/tp/t/results/raw/inlineraw_with_empty_line.pl
index 66e2d9916e..e8204d75a3 100644
--- a/tp/t/results/raw/inlineraw_with_empty_line.pl
+++ b/tp/t/results/raw/inlineraw_with_empty_line.pl
@@ -52,7 +52,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
                       'text' => ' '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -119,7 +119,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
                       'text' => '</i>'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/raw/lone_braces_in_html.pl 
b/tp/t/results/raw/lone_braces_in_html.pl
index 661be54d37..ea9d4bdf05 100644
--- a/tp/t/results/raw/lone_braces_in_html.pl
+++ b/tp/t/results/raw/lone_braces_in_html.pl
@@ -12,7 +12,7 @@ $result_trees{'lone_braces_in_html'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -38,7 +38,7 @@ $result_trees{'lone_braces_in_html'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -47,9 +47,11 @@ $result_trees{'lone_braces_in_html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'lone_braces_in_html'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -97,7 +99,7 @@ $result_trees{'lone_braces_in_html'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -106,9 +108,11 @@ $result_trees{'lone_braces_in_html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/raw/misc_raw.pl b/tp/t/results/raw/misc_raw.pl
index 25e274f84d..27559c02b8 100644
--- a/tp/t/results/raw/misc_raw.pl
+++ b/tp/t/results/raw/misc_raw.pl
@@ -17,7 +17,7 @@ $result_trees{'misc_raw'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -42,7 +42,7 @@ $result_trees{'misc_raw'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -51,9 +51,11 @@ $result_trees{'misc_raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -80,7 +82,7 @@ $result_trees{'misc_raw'} = {
                   'text' => 'in tex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -97,7 +99,7 @@ $result_trees{'misc_raw'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -106,9 +108,11 @@ $result_trees{'misc_raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -116,7 +120,7 @@ $result_trees{'misc_raw'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -133,7 +137,7 @@ $result_trees{'misc_raw'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -160,7 +164,7 @@ $result_trees{'misc_raw'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -169,9 +173,11 @@ $result_trees{'misc_raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
diff --git a/tp/t/results/raw/misc_raw_comments.pl 
b/tp/t/results/raw/misc_raw_comments.pl
index 30b283f08b..d6334e7626 100644
--- a/tp/t/results/raw/misc_raw_comments.pl
+++ b/tp/t/results/raw/misc_raw_comments.pl
@@ -79,9 +79,11 @@ $result_trees{'misc_raw_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -89,7 +91,7 @@ $result_trees{'misc_raw_comments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -111,7 +113,7 @@ $result_trees{'misc_raw_comments'} = {
                   'text' => 'in tex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -144,7 +146,9 @@ $result_trees{'misc_raw_comments'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => '    '
                   },
                   'type' => 'line_arg'
@@ -152,9 +156,11 @@ $result_trees{'misc_raw_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -162,7 +168,7 @@ $result_trees{'misc_raw_comments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -179,7 +185,7 @@ $result_trees{'misc_raw_comments'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -206,7 +212,7 @@ $result_trees{'misc_raw_comments'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -215,9 +221,11 @@ $result_trees{'misc_raw_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
diff --git a/tp/t/results/raw/nested_macros.pl 
b/tp/t/results/raw/nested_macros.pl
index aa09ea1b12..2a9230529e 100644
--- a/tp/t/results/raw/nested_macros.pl
+++ b/tp/t/results/raw/nested_macros.pl
@@ -47,7 +47,7 @@ $result_trees{'nested_macros'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -56,9 +56,11 @@ $result_trees{'nested_macros'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -82,7 +84,7 @@ $result_trees{'nested_macros'} = {
                           'text' => 'macro'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -91,9 +93,11 @@ $result_trees{'nested_macros'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'macro'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -114,7 +118,7 @@ $result_trees{'nested_macros'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -123,9 +127,11 @@ $result_trees{'nested_macros'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/raw/raw_commands_and_end_of_lines.pl 
b/tp/t/results/raw/raw_commands_and_end_of_lines.pl
index 4a53bfb8f3..bac1f879b0 100644
--- a/tp/t/results/raw/raw_commands_and_end_of_lines.pl
+++ b/tp/t/results/raw/raw_commands_and_end_of_lines.pl
@@ -17,7 +17,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -52,9 +52,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -82,7 +84,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -112,7 +114,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                           'text' => 'html'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -121,9 +123,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 10,
@@ -157,7 +161,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -183,7 +187,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                           'text' => 'html'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -192,9 +196,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 15,
@@ -228,7 +234,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -254,7 +260,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                           'text' => 'html after the closing command.'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -263,9 +269,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'html after the closing command.'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 20,
@@ -295,7 +303,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -321,7 +329,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                           'text' => 'html'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -330,9 +338,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 24,
@@ -366,7 +376,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -392,7 +402,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                           'text' => 'html. A symbol after the closing command.'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -401,9 +411,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'html. A symbol after the closing command.'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 29,
@@ -428,7 +440,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -454,7 +466,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -463,9 +475,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 33,
@@ -493,7 +507,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -519,7 +533,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                           'text' => 'tex'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -528,9 +542,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 38,
@@ -564,7 +580,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -590,7 +606,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                           'text' => 'tex'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -599,9 +615,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 43,
@@ -635,7 +653,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -661,7 +679,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                           'text' => 'tex after the closing command.'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -670,9 +688,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'tex after the closing command.'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 48,
@@ -702,7 +722,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -728,7 +748,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                           'text' => 'tex'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -737,9 +757,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 52,
@@ -773,7 +795,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -799,7 +821,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                           'text' => 'tex. A symbol after the closing command.'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -808,9 +830,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'tex. A symbol after the closing command.'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 57,
@@ -835,7 +859,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -857,7 +881,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -866,9 +890,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 61,
@@ -899,7 +925,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -921,7 +947,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -930,9 +956,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 66,
@@ -971,7 +999,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -993,7 +1021,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1002,9 +1030,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 71,
@@ -1043,7 +1073,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1065,7 +1095,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'text' => 'verbatim after the closing command.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1074,9 +1104,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim after the closing command.'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 76,
@@ -1106,7 +1138,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1128,7 +1160,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1137,9 +1169,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 80,
@@ -1178,7 +1212,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1200,7 +1234,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                       'text' => 'verbatim. A symbol after the closing command.'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1209,9 +1243,11 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim. A symbol after the closing command.'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 85,
diff --git a/tp/t/results/raw/raw_expanded_in_style.pl 
b/tp/t/results/raw/raw_expanded_in_style.pl
index 57c53d7774..7f6241e528 100644
--- a/tp/t/results/raw/raw_expanded_in_style.pl
+++ b/tp/t/results/raw/raw_expanded_in_style.pl
@@ -22,7 +22,7 @@ $result_trees{'raw_expanded_in_style'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -48,7 +48,7 @@ $result_trees{'raw_expanded_in_style'} = {
                                   'text' => 'html'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -57,9 +57,11 @@ $result_trees{'raw_expanded_in_style'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'html'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 4,
diff --git a/tp/t/results/raw/raw_in_example.pl 
b/tp/t/results/raw/raw_in_example.pl
index 57350d6451..16a4e6e3ae 100644
--- a/tp/t/results/raw/raw_in_example.pl
+++ b/tp/t/results/raw/raw_in_example.pl
@@ -12,7 +12,7 @@ $result_trees{'raw_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -26,7 +26,7 @@ $result_trees{'raw_in_example'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -52,7 +52,7 @@ $result_trees{'raw_in_example'} = {
                               'text' => 'html'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -61,9 +61,11 @@ $result_trees{'raw_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'html'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 4,
@@ -88,7 +90,7 @@ $result_trees{'raw_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -97,9 +99,11 @@ $result_trees{'raw_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -121,7 +125,7 @@ $result_trees{'raw_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -140,7 +144,7 @@ $result_trees{'raw_in_example'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -176,7 +180,7 @@ $result_trees{'raw_in_example'} = {
                               'text' => 'html'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -185,9 +189,11 @@ $result_trees{'raw_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'html'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 13,
@@ -209,7 +215,7 @@ $result_trees{'raw_in_example'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -267,7 +273,7 @@ $result_trees{'raw_in_example'} = {
                               'text' => 'tex'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -276,9 +282,11 @@ $result_trees{'raw_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'tex'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 23,
@@ -308,7 +316,7 @@ $result_trees{'raw_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -317,9 +325,11 @@ $result_trees{'raw_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
diff --git a/tp/t/results/raw/raw_in_para.pl b/tp/t/results/raw/raw_in_para.pl
index 935a2f5dd3..29b5baa1a0 100644
--- a/tp/t/results/raw/raw_in_para.pl
+++ b/tp/t/results/raw/raw_in_para.pl
@@ -21,7 +21,7 @@ $result_trees{'raw_in_para'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'raw_in_para'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -52,9 +52,11 @@ $result_trees{'raw_in_para'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -82,7 +84,7 @@ $result_trees{'raw_in_para'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -108,7 +110,7 @@ $result_trees{'raw_in_para'} = {
                           'text' => 'html'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -117,9 +119,11 @@ $result_trees{'raw_in_para'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -154,7 +158,7 @@ $result_trees{'raw_in_para'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -189,7 +193,7 @@ $result_trees{'raw_in_para'} = {
                           'text' => 'tex'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -198,9 +202,11 @@ $result_trees{'raw_in_para'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 17,
diff --git a/tp/t/results/raw/raw_in_style.pl b/tp/t/results/raw/raw_in_style.pl
index f3d2082e0f..6aac5a449f 100644
--- a/tp/t/results/raw/raw_in_style.pl
+++ b/tp/t/results/raw/raw_in_style.pl
@@ -22,7 +22,7 @@ $result_trees{'raw_in_style'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -48,7 +48,7 @@ $result_trees{'raw_in_style'} = {
                                   'text' => 'html'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -57,9 +57,11 @@ $result_trees{'raw_in_style'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'html'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 4,
diff --git a/tp/t/results/raw/raw_not_closed.pl 
b/tp/t/results/raw/raw_not_closed.pl
index 0391615fdb..cf5c41c563 100644
--- a/tp/t/results/raw/raw_not_closed.pl
+++ b/tp/t/results/raw/raw_not_closed.pl
@@ -12,7 +12,7 @@ $result_trees{'raw_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/raw/space_before_end.pl 
b/tp/t/results/raw/space_before_end.pl
index 5d09693609..0a3f7b53ef 100644
--- a/tp/t/results/raw/space_before_end.pl
+++ b/tp/t/results/raw/space_before_end.pl
@@ -12,7 +12,7 @@ $result_trees{'space_before_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -41,7 +41,7 @@ $result_trees{'space_before_end'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -50,9 +50,11 @@ $result_trees{'space_before_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -74,7 +76,7 @@ $result_trees{'space_before_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -100,7 +102,7 @@ $result_trees{'space_before_end'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -109,9 +111,11 @@ $result_trees{'space_before_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -133,7 +137,7 @@ $result_trees{'space_before_end'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -156,7 +160,7 @@ $result_trees{'space_before_end'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -165,9 +169,11 @@ $result_trees{'space_before_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
diff --git a/tp/t/results/raw/spurious_arg_on_line.pl 
b/tp/t/results/raw/spurious_arg_on_line.pl
index de1e340beb..f32d54ca73 100644
--- a/tp/t/results/raw/spurious_arg_on_line.pl
+++ b/tp/t/results/raw/spurious_arg_on_line.pl
@@ -22,7 +22,7 @@ $result_trees{'spurious_arg_on_line'} = {
                   'text' => 'argt'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -48,7 +48,7 @@ $result_trees{'spurious_arg_on_line'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -57,9 +57,11 @@ $result_trees{'spurious_arg_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -67,7 +69,7 @@ $result_trees{'spurious_arg_on_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -89,7 +91,7 @@ $result_trees{'spurious_arg_on_line'} = {
                   'text' => 'argverbatim'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -111,7 +113,7 @@ $result_trees{'spurious_arg_on_line'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -120,9 +122,11 @@ $result_trees{'spurious_arg_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -130,7 +134,7 @@ $result_trees{'spurious_arg_on_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -152,7 +156,7 @@ $result_trees{'spurious_arg_on_line'} = {
                   'text' => 'argh'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -172,7 +176,7 @@ $result_trees{'spurious_arg_on_line'} = {
                       'text' => 'html'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -181,9 +185,11 @@ $result_trees{'spurious_arg_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -191,7 +197,7 @@ $result_trees{'spurious_arg_on_line'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/raw/tex_not_closed.pl 
b/tp/t/results/raw/tex_not_closed.pl
index bdab9ab20d..255b5d32a8 100644
--- a/tp/t/results/raw/tex_not_closed.pl
+++ b/tp/t/results/raw/tex_not_closed.pl
@@ -12,7 +12,7 @@ $result_trees{'tex_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/raw/verbatim_and_verbatiminclude.pl 
b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
index 52fe46bfd3..06282c0fa3 100644
--- a/tp/t/results/raw/verbatim_and_verbatiminclude.pl
+++ b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
@@ -12,7 +12,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -34,7 +34,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -98,7 +100,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -107,9 +109,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -140,7 +144,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -161,7 +165,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -188,7 +192,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                           'text' => 'verbatim'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -197,9 +201,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'verbatim'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 16,
@@ -221,7 +227,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -230,9 +236,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -263,7 +271,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -285,7 +293,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -294,9 +302,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -332,7 +342,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   'text' => 'verb.txt'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -342,9 +352,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
           'cmdname' => 'verbatiminclude',
           'extra' => {
             'input_perl_encoding' => 'utf-8',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'verb.txt'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 25,
@@ -359,7 +371,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -385,7 +397,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'text' => 'verb.txt'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -395,9 +407,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               'cmdname' => 'verbatiminclude',
               'extra' => {
                 'input_perl_encoding' => 'utf-8',
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verb.txt'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -412,7 +426,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -421,9 +435,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -459,7 +475,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   'text' => 'verb.txt'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -469,9 +485,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
           'cmdname' => 'verbatiminclude',
           'extra' => {
             'input_perl_encoding' => 'utf-8',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'verb.txt'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 33,
@@ -495,7 +513,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -521,7 +539,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -548,7 +566,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                           'text' => 'verbatim'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -557,9 +575,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'verbatim'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 42,
@@ -591,7 +611,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -600,9 +620,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -624,7 +646,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -650,7 +672,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -677,7 +699,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                           'text' => 'verbatim'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -686,9 +708,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'verbatim'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 52,
@@ -715,7 +739,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -724,9 +748,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 54,
@@ -748,7 +774,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -774,7 +800,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -796,7 +822,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                           'text' => 'verbatim'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -805,9 +831,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'verbatim'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 61,
@@ -838,7 +866,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -847,9 +875,11 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 63,
diff --git a/tp/t/results/raw/verbatim_in_brace_command.pl 
b/tp/t/results/raw/verbatim_in_brace_command.pl
index 36b816fb6c..676e82eb63 100644
--- a/tp/t/results/raw/verbatim_in_brace_command.pl
+++ b/tp/t/results/raw/verbatim_in_brace_command.pl
@@ -36,7 +36,7 @@ $result_trees{'verbatim_in_brace_command'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -58,7 +58,7 @@ $result_trees{'verbatim_in_brace_command'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -67,9 +67,11 @@ $result_trees{'verbatim_in_brace_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/raw/verbatim_not_closed.pl 
b/tp/t/results/raw/verbatim_not_closed.pl
index 0730814f8e..db3a6ea4eb 100644
--- a/tp/t/results/raw/verbatim_not_closed.pl
+++ b/tp/t/results/raw/verbatim_not_closed.pl
@@ -12,7 +12,7 @@ $result_trees{'verbatim_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index a540e6ad53..dc9770decd 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -24,7 +24,7 @@ $result_trees{'anchor_in_copying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -92,7 +92,7 @@ $result_trees{'anchor_in_copying'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -101,9 +101,11 @@ $result_trees{'anchor_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -136,7 +138,7 @@ $result_trees{'anchor_in_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -163,7 +165,9 @@ $result_trees{'anchor_in_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -180,7 +184,7 @@ $result_trees{'anchor_in_copying'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -288,7 +292,9 @@ $result_trees{'anchor_in_copying'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -344,12 +350,14 @@ $result_nodes{'anchor_in_copying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -363,6 +371,7 @@ $result_menus{'anchor_in_copying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
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 49925f6cfa..beec7dda4b 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -14,7 +14,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -83,7 +83,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                         }
                       ],
                       'cmdname' => 'footnote',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => '
 '
                       },
@@ -113,7 +113,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -122,9 +122,11 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 8,
@@ -157,7 +159,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -184,7 +186,9 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -201,7 +205,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -309,7 +313,9 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -366,12 +372,14 @@ $result_nodes{'anchor_in_copying_in_footnote'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -385,6 +393,7 @@ $result_menus{'anchor_in_copying_in_footnote'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 5c33579240..57d8fda2ff 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -14,7 +14,7 @@ $result_trees{'anchor_in_titlepage'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -68,7 +68,7 @@ $result_trees{'anchor_in_titlepage'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -77,9 +77,11 @@ $result_trees{'anchor_in_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -112,7 +114,7 @@ $result_trees{'anchor_in_titlepage'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +122,8 @@ $result_trees{'anchor_in_titlepage'} = {
         }
       ],
       'cmdname' => 'top',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +140,7 @@ $result_trees{'anchor_in_titlepage'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -164,7 +167,9 @@ $result_trees{'anchor_in_titlepage'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -181,7 +186,7 @@ $result_trees{'anchor_in_titlepage'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -189,7 +194,8 @@ $result_trees{'anchor_in_titlepage'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -206,7 +212,7 @@ $result_trees{'anchor_in_titlepage'} = {
               'text' => 'nchap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -269,7 +275,9 @@ $result_trees{'anchor_in_titlepage'} = {
             'normalized' => 'nchap'
           }
         ],
-        'normalized' => 'nchap',
+        'normalized' => 'nchap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -321,6 +329,7 @@ $result_sectioning{'anchor_in_titlepage'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -331,9 +340,11 @@ $result_sectioning{'anchor_in_titlepage'} = {
                   'extra' => {
                     'normalized' => 'Top'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -362,18 +373,21 @@ $result_nodes{'anchor_in_titlepage'} = {
     'associated_section' => {
       'cmdname' => 'chapter',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'section_number' => 1
       }
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'nchap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -387,6 +401,7 @@ $result_menus{'anchor_in_titlepage'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index ef67a0b87b..b3de38c145 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -14,7 +14,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -68,7 +68,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -77,9 +77,11 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 4,
@@ -112,7 +114,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -120,7 +122,8 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
         }
       ],
       'cmdname' => 'top',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -137,7 +140,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -164,7 +167,9 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -181,7 +186,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -189,7 +194,8 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -206,7 +212,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
               'text' => 'nchap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -269,7 +275,9 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
             'normalized' => 'nchap'
           }
         ],
-        'normalized' => 'nchap',
+        'normalized' => 'nchap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -321,6 +329,7 @@ $result_sectioning{'anchor_in_titlepage_titlepage'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -331,9 +340,11 @@ $result_sectioning{'anchor_in_titlepage_titlepage'} = {
                   'extra' => {
                     'normalized' => 'Top'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -362,18 +373,21 @@ $result_nodes{'anchor_in_titlepage_titlepage'} = {
     'associated_section' => {
       'cmdname' => 'chapter',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'section_number' => 1
       }
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'nchap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -387,6 +401,7 @@ $result_menus{'anchor_in_titlepage_titlepage'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/regions/copying_not_closed.pl 
b/tp/t/results/regions/copying_not_closed.pl
index 4b3cbb9b58..fccc01ea4e 100644
--- a/tp/t/results/regions/copying_not_closed.pl
+++ b/tp/t/results/regions/copying_not_closed.pl
@@ -12,7 +12,7 @@ $result_trees{'copying_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
diff --git a/tp/t/results/regions/double_copying.pl 
b/tp/t/results/regions/double_copying.pl
index c31449dd4c..3bb3641adf 100644
--- a/tp/t/results/regions/double_copying.pl
+++ b/tp/t/results/regions/double_copying.pl
@@ -12,7 +12,7 @@ $result_trees{'double_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'double_copying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -69,7 +69,7 @@ $result_trees{'double_copying'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -78,9 +78,11 @@ $result_trees{'double_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -102,7 +104,7 @@ $result_trees{'double_copying'} = {
                       'text' => 'copying'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -111,9 +113,11 @@ $result_trees{'double_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
diff --git a/tp/t/results/regions/double_titlepage_not_closed.pl 
b/tp/t/results/regions/double_titlepage_not_closed.pl
index e5ce284533..67d63bca10 100644
--- a/tp/t/results/regions/double_titlepage_not_closed.pl
+++ b/tp/t/results/regions/double_titlepage_not_closed.pl
@@ -12,7 +12,7 @@ $result_trees{'double_titlepage_not_closed'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -48,7 +48,7 @@ $result_trees{'double_titlepage_not_closed'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index 173f1bead2..968412667f 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -14,7 +14,7 @@ $result_trees{'format_in_titlepage'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -31,7 +31,7 @@ $result_trees{'format_in_titlepage'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -57,7 +57,7 @@ $result_trees{'format_in_titlepage'} = {
                               'text' => 'format'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -66,9 +66,11 @@ $result_trees{'format_in_titlepage'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'format'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 5,
@@ -95,7 +97,7 @@ $result_trees{'format_in_titlepage'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -104,9 +106,11 @@ $result_trees{'format_in_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -139,7 +143,7 @@ $result_trees{'format_in_titlepage'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -166,7 +170,9 @@ $result_trees{'format_in_titlepage'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -202,14 +208,16 @@ $result_nodes{'format_in_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'format_in_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'format_in_titlepage'} = [];
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 7288802d79..3db442bc8c 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -14,7 +14,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -31,7 +31,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                 {
                   'args' => [
                     {
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -57,7 +57,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                               'text' => 'format'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -66,9 +66,11 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'format'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 5,
@@ -95,7 +97,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                           'text' => 'titlepage'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -104,9 +106,11 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -139,7 +143,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -166,7 +170,9 @@ $result_trees{'format_in_titlepage_titlepage'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -202,14 +208,16 @@ $result_nodes{'format_in_titlepage_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'format_in_titlepage_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'format_in_titlepage_titlepage'} = [];
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index 97499759f6..79e96ea9d2 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -14,7 +14,7 @@ $result_trees{'ref_in_copying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -46,7 +46,7 @@ $result_trees{'ref_in_copying'} = {
                                   'text' => 'GFDL'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -66,7 +66,9 @@ $result_trees{'ref_in_copying'} = {
                                 'normalized' => 'GFDL'
                               }
                             ],
-                            'normalized' => 'GFDL',
+                            'normalized' => 'GFDL'
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -103,7 +105,7 @@ $result_trees{'ref_in_copying'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -112,9 +114,11 @@ $result_trees{'ref_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -147,7 +151,7 @@ $result_trees{'ref_in_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -167,7 +171,9 @@ $result_trees{'ref_in_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +190,7 @@ $result_trees{'ref_in_copying'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -221,7 +227,7 @@ $result_trees{'ref_in_copying'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -287,7 +293,7 @@ $result_trees{'ref_in_copying'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -296,9 +302,11 @@ $result_trees{'ref_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -318,7 +326,8 @@ $result_trees{'ref_in_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -336,7 +345,7 @@ $result_trees{'ref_in_copying'} = {
               'text' => 'GFDL'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -351,7 +360,8 @@ $result_trees{'ref_in_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -414,9 +424,11 @@ $result_sectioning{'ref_in_copying'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -427,9 +439,11 @@ $result_sectioning{'ref_in_copying'} = {
                   'extra' => {
                     'normalized' => 'GFDL'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -458,6 +472,7 @@ $result_nodes{'ref_in_copying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -467,6 +482,7 @@ $result_nodes{'ref_in_copying'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -474,12 +490,14 @@ $result_nodes{'ref_in_copying'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'GFDL'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -497,12 +515,14 @@ $result_menus{'ref_in_copying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'GFDL'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
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 5a1d98d55b..b780090cf8 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
@@ -14,7 +14,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -46,7 +46,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                                   'text' => 'GFDL'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -66,7 +66,9 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                                 'normalized' => 'GFDL'
                               }
                             ],
-                            'normalized' => 'GFDL',
+                            'normalized' => 'GFDL'
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -103,7 +105,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -112,9 +114,11 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -147,7 +151,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -167,7 +171,9 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +190,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -199,7 +205,8 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -216,7 +223,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'text' => 'Intro'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -236,7 +243,9 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
             'normalized' => 'Intro'
           }
         ],
-        'normalized' => 'Intro',
+        'normalized' => 'Intro'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -253,7 +262,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'text' => 'Introduction'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -290,7 +299,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -356,7 +365,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -365,9 +374,11 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -387,7 +398,8 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -405,7 +417,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               'text' => 'GFDL'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -420,7 +432,8 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -491,9 +504,11 @@ $result_sectioning{'ref_in_copying_insert_in_chapter'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -504,9 +519,11 @@ $result_sectioning{'ref_in_copying_insert_in_chapter'} = {
                   'extra' => {
                     'normalized' => 'Intro'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -517,9 +534,11 @@ $result_sectioning{'ref_in_copying_insert_in_chapter'} = {
                         'extra' => {
                           'normalized' => 'GFDL'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -555,10 +574,12 @@ $result_nodes{'ref_in_copying_insert_in_chapter'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -566,6 +587,7 @@ $result_nodes{'ref_in_copying_insert_in_chapter'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -577,6 +599,7 @@ $result_nodes{'ref_in_copying_insert_in_chapter'} = {
         ],
         'normalized' => 'Intro'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -584,12 +607,14 @@ $result_nodes{'ref_in_copying_insert_in_chapter'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
             },
             'normalized' => 'GFDL'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -609,6 +634,7 @@ $result_menus{'ref_in_copying_insert_in_chapter'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 0f72f12da7..415c0b0b41 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -14,7 +14,7 @@ $result_trees{'today_in_copying'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -53,7 +53,7 @@ $result_trees{'today_in_copying'} = {
                           'text' => 'copying'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -62,9 +62,11 @@ $result_trees{'today_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 3,
@@ -97,7 +99,7 @@ $result_trees{'today_in_copying'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -117,7 +119,9 @@ $result_trees{'today_in_copying'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -134,7 +138,7 @@ $result_trees{'today_in_copying'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -149,7 +153,8 @@ $result_trees{'today_in_copying'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -166,7 +171,7 @@ $result_trees{'today_in_copying'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -208,7 +213,9 @@ $result_trees{'today_in_copying'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -256,9 +263,11 @@ $result_sectioning{'today_in_copying'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -276,16 +285,19 @@ $result_nodes{'today_in_copying'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -299,6 +311,7 @@ $result_menus{'today_in_copying'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/a_comma_after_node.pl 
b/tp/t/results/sectioning/a_comma_after_node.pl
index fd8f74f5c0..95f238a763 100644
--- a/tp/t/results/sectioning/a_comma_after_node.pl
+++ b/tp/t/results/sectioning/a_comma_after_node.pl
@@ -26,7 +26,7 @@ $result_trees{'a_comma_after_node'} = {
               'text' => 'Requirements'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -37,7 +37,7 @@ $result_trees{'a_comma_after_node'} = {
               'text' => 'Nodes and Menus'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -86,7 +86,9 @@ $result_trees{'a_comma_after_node'} = {
             'normalized' => 'Nodes-and-Menus'
           }
         ],
-        'normalized' => 'Commands',
+        'normalized' => 'Commands'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -117,14 +119,16 @@ $result_nodes{'a_comma_after_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Commands'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'a_comma_after_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Commands'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'a_comma_after_node'} = [
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl 
b/tp/t/results/sectioning/anchor_in_footnote.pl
index 2c93ccb625..944026fd84 100644
--- a/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -18,7 +18,7 @@ $result_trees{'anchor_in_footnote'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'anchor_in_footnote'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'anchor_in_footnote'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -141,7 +143,7 @@ $result_trees{'anchor_in_footnote'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -207,7 +209,7 @@ $result_trees{'anchor_in_footnote'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -216,9 +218,11 @@ $result_trees{'anchor_in_footnote'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -238,7 +242,8 @@ $result_trees{'anchor_in_footnote'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -255,7 +260,7 @@ $result_trees{'anchor_in_footnote'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -275,7 +280,9 @@ $result_trees{'anchor_in_footnote'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -292,7 +299,7 @@ $result_trees{'anchor_in_footnote'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -343,7 +350,8 @@ $result_trees{'anchor_in_footnote'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -407,9 +415,11 @@ $result_sectioning{'anchor_in_footnote'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -420,9 +430,11 @@ $result_sectioning{'anchor_in_footnote'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -451,6 +463,7 @@ $result_nodes{'anchor_in_footnote'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -460,6 +473,7 @@ $result_nodes{'anchor_in_footnote'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -467,12 +481,14 @@ $result_nodes{'anchor_in_footnote'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -490,12 +506,14 @@ $result_menus{'anchor_in_footnote'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index b6edb93a28..afebfb02d6 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -17,7 +17,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
                   'text' => 'separate'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'anchor_in_footnote_separate'} = {
           'extra' => {
             'misc_args' => [
               'separate'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -48,7 +50,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -68,7 +70,9 @@ $result_trees{'anchor_in_footnote_separate'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -85,7 +89,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -171,7 +175,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -237,7 +241,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -246,9 +250,11 @@ $result_trees{'anchor_in_footnote_separate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -268,7 +274,8 @@ $result_trees{'anchor_in_footnote_separate'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -285,7 +292,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -305,7 +312,9 @@ $result_trees{'anchor_in_footnote_separate'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -322,7 +331,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
               'text' => 'Chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -373,7 +382,8 @@ $result_trees{'anchor_in_footnote_separate'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -438,9 +448,11 @@ $result_sectioning{'anchor_in_footnote_separate'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -451,9 +463,11 @@ $result_sectioning{'anchor_in_footnote_separate'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -482,6 +496,7 @@ $result_nodes{'anchor_in_footnote_separate'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -491,6 +506,7 @@ $result_nodes{'anchor_in_footnote_separate'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -498,12 +514,14 @@ $result_nodes{'anchor_in_footnote_separate'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -521,12 +539,14 @@ $result_menus{'anchor_in_footnote_separate'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/anchor_zero.pl 
b/tp/t/results/sectioning/anchor_zero.pl
index ce1f3bd5a4..1011b550e1 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -18,7 +18,7 @@ $result_trees{'anchor_zero'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -119,7 +119,9 @@ $result_trees{'anchor_zero'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -155,14 +157,16 @@ $result_nodes{'anchor_zero'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'anchor_zero'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'anchor_zero'} = [];
diff --git a/tp/t/results/sectioning/at_commands_in_node.pl 
b/tp/t/results/sectioning/at_commands_in_node.pl
index aae7cf0140..9e0f8ce2f0 100644
--- a/tp/t/results/sectioning/at_commands_in_node.pl
+++ b/tp/t/results/sectioning/at_commands_in_node.pl
@@ -239,7 +239,9 @@ $result_trees{'at_commands_in_node'} = {
             'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
           }
         ],
-        'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
+        'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -289,14 +291,16 @@ $result_nodes{'at_commands_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'at_commands_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'at_commands_in_node'} = [];
diff --git a/tp/t/results/sectioning/automatic_menu_referencing_node.pl 
b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
index 113f9cd748..b23b6f44fb 100644
--- a/tp/t/results/sectioning/automatic_menu_referencing_node.pl
+++ b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
@@ -18,7 +18,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'automatic_menu_referencing_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -70,7 +72,8 @@ $result_trees{'automatic_menu_referencing_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -87,7 +90,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -107,7 +110,9 @@ $result_trees{'automatic_menu_referencing_node'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -124,7 +129,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -139,7 +144,8 @@ $result_trees{'automatic_menu_referencing_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -156,7 +162,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -176,7 +182,9 @@ $result_trees{'automatic_menu_referencing_node'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -193,7 +201,7 @@ $result_trees{'automatic_menu_referencing_node'} = {
               'text' => 'sec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -201,7 +209,8 @@ $result_trees{'automatic_menu_referencing_node'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -252,9 +261,11 @@ $result_sectioning{'automatic_menu_referencing_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -265,9 +276,11 @@ $result_sectioning{'automatic_menu_referencing_node'} = {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -278,9 +291,11 @@ $result_sectioning{'automatic_menu_referencing_node'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -316,10 +331,12 @@ $result_nodes{'automatic_menu_referencing_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -327,12 +344,14 @@ $result_nodes{'automatic_menu_referencing_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -348,6 +367,7 @@ $result_menus{'automatic_menu_referencing_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
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 f7e26edb07..52d1db6f43 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -25,7 +25,7 @@ $result_trees{'chapter_before_and_after_part'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -40,7 +40,8 @@ $result_trees{'chapter_before_and_after_part'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -65,7 +66,7 @@ $result_trees{'chapter_before_and_after_part'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -80,7 +81,8 @@ $result_trees{'chapter_before_and_after_part'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -97,7 +99,7 @@ $result_trees{'chapter_before_and_after_part'} = [
                 'text' => 'chapter 2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -128,7 +130,9 @@ $result_trees{'chapter_before_and_after_part'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -175,6 +179,7 @@ $result_sectioning{'chapter_before_and_after_part'} = {
       {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -192,6 +197,7 @@ $result_sectioning{'chapter_before_and_after_part'} = {
                           'extra' => {
                             'part_associated_section' => {}
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_childs' => [
@@ -202,6 +208,7 @@ $result_sectioning{'chapter_before_and_after_part'} = {
                           }
                         }
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_level' => 1,
@@ -268,6 +275,7 @@ $result_elements{'chapter_before_and_after_part'} = [
       'unit_command' => {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_number' => 1
@@ -284,11 +292,13 @@ $result_elements{'chapter_before_and_after_part'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 2
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index e013881ba1..70a5c07ac6 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -25,7 +25,7 @@ $result_trees{'chapter_before_part'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -40,7 +40,8 @@ $result_trees{'chapter_before_part'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -65,7 +66,7 @@ $result_trees{'chapter_before_part'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +74,8 @@ $result_trees{'chapter_before_part'} = [
           }
         ],
         'cmdname' => 'part',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -111,6 +113,7 @@ $result_sectioning{'chapter_before_part'} = {
       {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -123,6 +126,7 @@ $result_sectioning{'chapter_before_part'} = {
                     'unit_command' => {
                       'cmdname' => 'part',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_level' => 0,
@@ -188,6 +192,7 @@ $result_elements{'chapter_before_part'} = [
       'unit_command' => {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_number' => 1
@@ -201,6 +206,7 @@ $result_elements{'chapter_before_part'} = [
             'unit_command' => {
               'cmdname' => 'part',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {}
               }
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 501080e449..b8964c5f38 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -24,7 +24,7 @@ $result_trees{'chapter_between_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'chapter_between_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'chapter_between_nodes'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -87,7 +89,7 @@ $result_trees{'chapter_between_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -153,7 +155,7 @@ $result_trees{'chapter_between_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -162,9 +164,11 @@ $result_trees{'chapter_between_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -184,7 +188,8 @@ $result_trees{'chapter_between_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -201,7 +206,7 @@ $result_trees{'chapter_between_nodes'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -230,7 +235,8 @@ $result_trees{'chapter_between_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -261,7 +267,7 @@ $result_trees{'chapter_between_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -289,7 +295,9 @@ $result_trees{'chapter_between_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'section-node',
+        'normalized' => 'section-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -306,7 +314,7 @@ $result_trees{'chapter_between_nodes'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -350,7 +358,8 @@ $result_trees{'chapter_between_nodes'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -420,14 +429,17 @@ $result_sectioning{'chapter_between_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -438,9 +450,11 @@ $result_sectioning{'chapter_between_nodes'} = {
                         'extra' => {
                           'normalized' => 'section-node'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -476,6 +490,7 @@ $result_nodes{'chapter_between_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -485,6 +500,7 @@ $result_nodes{'chapter_between_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -492,12 +508,14 @@ $result_nodes{'chapter_between_nodes'} = {
         'associated_section' => {
           'cmdname' => 'section',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => '1.1'
           }
         },
         'normalized' => 'section-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -515,12 +533,14 @@ $result_menus{'chapter_between_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'section-node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
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 edcc5c5acb..12d8dd3645 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
@@ -25,7 +25,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'chapter_node_before_and_after_part'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -79,7 +81,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -145,7 +147,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -154,9 +156,11 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -176,7 +180,8 @@ $result_trees{'chapter_node_before_and_after_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -193,7 +198,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               'text' => 'part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -208,7 +213,8 @@ $result_trees{'chapter_node_before_and_after_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -225,7 +231,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               'text' => 'after'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -245,7 +251,9 @@ $result_trees{'chapter_node_before_and_after_part'} = {
             'normalized' => 'after'
           }
         ],
-        'normalized' => 'after',
+        'normalized' => 'after'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -262,7 +270,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -293,7 +301,9 @@ $result_trees{'chapter_node_before_and_after_part'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -355,9 +365,11 @@ $result_sectioning{'chapter_node_before_and_after_part'} = 
{
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -375,10 +387,12 @@ $result_sectioning{'chapter_node_before_and_after_part'} 
= {
                 'extra' => {
                   'normalized' => 'after'
                 },
+                'info' => {},
                 'structure' => {}
               },
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 2,
@@ -388,6 +402,7 @@ $result_sectioning{'chapter_node_before_and_after_part'} = {
           },
           'part_following_node' => {}
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {}
@@ -414,6 +429,7 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
     'associated_section' => {
       'cmdname' => 'chapter',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'section_number' => 1
       }
@@ -425,6 +441,7 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -435,9 +452,11 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
             'associated_part' => {
               'cmdname' => 'part',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             }
           },
+          'info' => {},
           'structure' => {
             'section_number' => 2
           }
@@ -445,6 +464,7 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
         'node_preceding_part' => {},
         'normalized' => 'after'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -463,12 +483,14 @@ $result_menus{'chapter_node_before_and_after_part'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'after'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/chapter_sections.pl 
b/tp/t/results/sectioning/chapter_sections.pl
index 719447deca..461e27384b 100644
--- a/tp/t/results/sectioning/chapter_sections.pl
+++ b/tp/t/results/sectioning/chapter_sections.pl
@@ -19,7 +19,7 @@ $result_trees{'chapter_sections'} = [
                 'text' => 'unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -34,7 +34,8 @@ $result_trees{'chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -59,7 +60,7 @@ $result_trees{'chapter_sections'} = [
                 'text' => 'First chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -74,7 +75,8 @@ $result_trees{'chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -99,7 +101,7 @@ $result_trees{'chapter_sections'} = [
                 'text' => 'second'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -114,7 +116,8 @@ $result_trees{'chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -139,7 +142,7 @@ $result_trees{'chapter_sections'} = [
                 'text' => 'Chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -154,7 +157,8 @@ $result_trees{'chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -179,7 +183,7 @@ $result_trees{'chapter_sections'} = [
                 'text' => 'Section of chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -194,7 +198,8 @@ $result_trees{'chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -219,7 +224,7 @@ $result_trees{'chapter_sections'} = [
                 'text' => 'subsection 1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -234,7 +239,8 @@ $result_trees{'chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -259,7 +265,7 @@ $result_trees{'chapter_sections'} = [
                 'text' => 'subsection 2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -274,7 +280,8 @@ $result_trees{'chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -299,7 +306,7 @@ $result_trees{'chapter_sections'} = [
                 'text' => 'Chapter 2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -307,7 +314,8 @@ $result_trees{'chapter_sections'} = [
           }
         ],
         'cmdname' => 'chapter',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -381,6 +389,7 @@ $result_sectioning{'chapter_sections'} = {
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -393,12 +402,14 @@ $result_sectioning{'chapter_sections'} = {
                     'unit_command' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_childs' => [
                           {
                             'cmdname' => 'section',
                             'extra' => {},
+                            'info' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -413,12 +424,14 @@ $result_sectioning{'chapter_sections'} = {
                                         'unit_command' => {
                                           'cmdname' => 'chapter',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {
                                             'associated_unit' => {},
                                             'section_childs' => [
                                               {
                                                 'cmdname' => 'section',
                                                 'extra' => {},
+                                                'info' => {},
                                                 'structure' => {
                                                   'associated_unit' => {
                                                     'extra' => {
@@ -433,6 +446,7 @@ $result_sectioning{'chapter_sections'} = {
                                                             'unit_command' => {
                                                               'cmdname' => 
'chapter',
                                                               'extra' => {},
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {},
                                                                 
'section_level' => 1,
@@ -450,6 +464,7 @@ $result_sectioning{'chapter_sections'} = {
                                                                   
'unit_command' => {
                                                                     'cmdname' 
=> 'subsection',
                                                                     'extra' => 
{},
+                                                                    'info' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
                                                                       
'section_level' => 3,
@@ -457,6 +472,7 @@ $result_sectioning{'chapter_sections'} = {
                                                                       
'section_prev' => {
                                                                         
'cmdname' => 'subsection',
                                                                         
'extra' => {},
+                                                                        'info' 
=> {},
                                                                         
'structure' => {
                                                                           
'associated_unit' => {
                                                                             
'extra' => {
@@ -706,6 +722,7 @@ $result_elements{'chapter_sections'} = [
       'unit_command' => {
         'cmdname' => 'unnumbered',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -718,6 +735,7 @@ $result_elements{'chapter_sections'} = [
             'unit_command' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -733,6 +751,7 @@ $result_elements{'chapter_sections'} = [
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 2
@@ -746,6 +765,7 @@ $result_elements{'chapter_sections'} = [
                         'unit_command' => {
                           'cmdname' => 'section',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => '1.1'
@@ -770,6 +790,7 @@ $result_elements{'chapter_sections'} = [
                         'unit_command' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 3
@@ -783,6 +804,7 @@ $result_elements{'chapter_sections'} = [
                               'unit_command' => {
                                 'cmdname' => 'subsection',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_number' => '2.1.2'
@@ -796,6 +818,7 @@ $result_elements{'chapter_sections'} = [
                                     'unit_command' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'section_number' => '2.1.1'
@@ -809,6 +832,7 @@ $result_elements{'chapter_sections'} = [
                                           'unit_command' => {
                                             'cmdname' => 'section',
                                             'extra' => {},
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'section_number' => '2.1'
diff --git a/tp/t/results/sectioning/character_and_spaces_in_node.pl 
b/tp/t/results/sectioning/character_and_spaces_in_node.pl
index 75f1cb3678..65b3413974 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -25,7 +25,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'character_and_spaces_in_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -70,7 +72,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'text' => '!_"#$%&\'()*+-.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -81,7 +83,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -92,7 +94,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -131,7 +133,9 @@ $result_trees{'character_and_spaces_in_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'other-nodes',
+        'normalized' => 'other-nodes'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -156,7 +160,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'text' => '/;<=>?[\\]^_`|~'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -167,7 +171,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'text' => 'other nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -178,7 +182,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'text' => 'other nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -217,7 +221,9 @@ $result_trees{'character_and_spaces_in_node'} = {
             'normalized' => 'other-nodes'
           }
         ],
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -258,7 +264,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'text' => 'other nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -297,7 +303,9 @@ $result_trees{'character_and_spaces_in_node'} = {
             'normalized' => 'other-nodes'
           }
         ],
-        'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+        'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -333,7 +341,7 @@ $result_trees{'character_and_spaces_in_node'} = {
               'text' => 'other nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -366,7 +374,9 @@ $result_trees{'character_and_spaces_in_node'} = {
             'normalized' => 'other-nodes'
           }
         ],
-        'normalized' => 'local-node',
+        'normalized' => 'local-node'
+      },
+      'info' => {
         'spaces_before_argument' => '  '
       },
       'source_info' => {
@@ -417,30 +427,35 @@ $result_nodes{'character_and_spaces_in_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'other-nodes'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'local-node'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_prev' => {},
                     'node_up' => {}
@@ -474,6 +489,7 @@ $result_menus{'character_and_spaces_in_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
index f74829de70..524a8004ab 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -24,7 +24,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'character_and_spaces_in_refs'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'text' => 'Test refs'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -78,7 +80,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -193,7 +195,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -202,9 +204,11 @@ $result_trees{'character_and_spaces_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -224,7 +228,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -241,7 +246,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'text' => 'node to avoid DocBook or LaTeX ignored'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -261,7 +266,9 @@ $result_trees{'character_and_spaces_in_refs'} = {
             'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
           }
         ],
-        'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored',
+        'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -278,7 +285,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'text' => 'first chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -300,7 +307,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'text' => 'Testing distant nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -308,7 +315,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -332,7 +340,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'a  node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -350,7 +358,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -425,7 +433,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -443,7 +451,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'manual'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -530,7 +538,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => '../manual/doc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -570,7 +578,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'text' => 'Testing local nodes'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -578,7 +586,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -623,7 +632,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                           'text' => '/;<=>?[\\]^_`|~'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -634,7 +643,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -645,7 +654,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -691,7 +700,9 @@ $result_trees{'character_and_spaces_in_refs'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -762,7 +773,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 ',
                         'spaces_before_argument' => ' '
@@ -808,7 +819,9 @@ $result_trees{'character_and_spaces_in_refs'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -842,7 +855,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'Top'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -876,7 +889,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'local   node'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'type' => 'brace_command_arg'
@@ -911,7 +924,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                           'text' => 'other nodes'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -951,7 +964,9 @@ $result_trees{'character_and_spaces_in_refs'} = {
                         'normalized' => 'other-nodes'
                       }
                     ],
-                    'normalized' => 'local-node',
+                    'normalized' => 'local-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'source_info' => {
@@ -986,7 +1001,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1011,7 +1027,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'text' => '!_"#$%&\'()*+-.'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1022,7 +1038,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1033,7 +1049,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -1072,7 +1088,9 @@ $result_trees{'character_and_spaces_in_refs'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'other-nodes',
+        'normalized' => 'other-nodes'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1089,7 +1107,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
               'text' => 'Chapter with nodes'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1106,7 +1124,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1270,7 +1288,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1279,9 +1297,11 @@ $result_trees{'character_and_spaces_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -1301,7 +1321,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1468,9 +1489,11 @@ $result_sectioning{'character_and_spaces_in_refs'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1481,9 +1504,11 @@ $result_sectioning{'character_and_spaces_in_refs'} = {
                   'extra' => {
                     'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1500,9 +1525,11 @@ $result_sectioning{'character_and_spaces_in_refs'} = {
                   'extra' => {
                     'normalized' => 'other-nodes'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1536,6 +1563,7 @@ $result_nodes{'character_and_spaces_in_refs'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1545,6 +1573,7 @@ $result_nodes{'character_and_spaces_in_refs'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1552,12 +1581,14 @@ $result_nodes{'character_and_spaces_in_refs'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1565,6 +1596,7 @@ $result_nodes{'character_and_spaces_in_refs'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
@@ -1576,24 +1608,28 @@ $result_nodes{'character_and_spaces_in_refs'} = {
             ],
             'normalized' => 'other-nodes'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'local-node'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_prev' => {},
                         'node_up' => {}
@@ -1637,36 +1673,42 @@ $result_menus{'character_and_spaces_in_refs'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'other-nodes'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'local-node'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_prev' => {},
                         'menu_up' => {},
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
index c80d23951d..e2a7422d0a 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
@@ -19,7 +19,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'text' => 'Test refs'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -188,7 +190,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -197,9 +199,11 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 7,
@@ -219,7 +223,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -244,7 +249,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'text' => 'node to avoid DocBook or LaTeX ignored'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -264,7 +269,9 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
             }
           ],
-          'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored',
+          'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -281,7 +288,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'text' => 'first chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -303,7 +310,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'text' => 'Testing distant nodes'
                   }
                 ],
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -311,7 +318,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               }
             ],
             'cmdname' => 'subheading',
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'source_info' => {
@@ -335,7 +342,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'a  node'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => ' ',
                       'spaces_before_argument' => ' '
                     },
@@ -353,7 +360,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'manual'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'type' => 'brace_command_arg'
@@ -428,7 +435,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'top'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => ' ',
                       'spaces_before_argument' => ' '
                     },
@@ -446,7 +453,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'manual'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'type' => 'brace_command_arg'
@@ -533,7 +540,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => '../manual/doc'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'type' => 'brace_command_arg'
@@ -573,7 +580,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'text' => 'Testing local nodes'
                   }
                 ],
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -581,7 +588,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               }
             ],
             'cmdname' => 'subheading',
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'source_info' => {
@@ -626,7 +633,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                             'text' => '/;<=>?[\\]^_`|~'
                           }
                         ],
-                        'extra' => {
+                        'info' => {
                           'spaces_before_argument' => ' '
                         },
                         'type' => 'line_arg'
@@ -637,7 +644,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                             'text' => 'other nodes'
                           }
                         ],
-                        'extra' => {
+                        'info' => {
                           'spaces_before_argument' => ' '
                         },
                         'type' => 'line_arg'
@@ -648,7 +655,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                             'text' => 'other nodes'
                           }
                         ],
-                        'extra' => {
+                        'info' => {
                           'spaces_after_argument' => '
 ',
                           'spaces_before_argument' => ' '
@@ -694,7 +701,9 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                           'normalized' => 'other-nodes'
                         }
                       ],
-                      'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+                      'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                    },
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'source_info' => {
@@ -765,7 +774,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                             'text' => 'other nodes'
                           }
                         ],
-                        'extra' => {
+                        'info' => {
                           'spaces_after_argument' => '
 ',
                           'spaces_before_argument' => ' '
@@ -811,7 +820,9 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                           'normalized' => 'other-nodes'
                         }
                       ],
-                      'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                      'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                    },
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'source_info' => {
@@ -845,7 +856,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'Top'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'type' => 'brace_command_arg'
@@ -879,7 +890,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'local   node'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => '  '
                     },
                     'type' => 'brace_command_arg'
@@ -914,7 +925,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                             'text' => 'other nodes'
                           }
                         ],
-                        'extra' => {
+                        'info' => {
                           'spaces_after_argument' => '
 '
                         },
@@ -954,7 +965,9 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                           'normalized' => 'other-nodes'
                         }
                       ],
-                      'normalized' => 'local-node',
+                      'normalized' => 'local-node'
+                    },
+                    'info' => {
                       'spaces_before_argument' => '  '
                     },
                     'source_info' => {
@@ -989,7 +1002,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1022,7 +1036,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'text' => '!_"#$%&\'()*+-.'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -1033,7 +1047,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -1044,7 +1058,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -1083,7 +1097,9 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'other-nodes',
+          'normalized' => 'other-nodes'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1100,7 +1116,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 'text' => 'Chapter with nodes'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1117,7 +1133,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -1281,7 +1297,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -1290,9 +1306,11 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 34,
@@ -1312,7 +1330,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1513,6 +1532,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -1527,6 +1547,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                           'extra' => {
                             'normalized' => 
'node-to-avoid-DocBook-or-LaTeX-ignored'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -1543,6 +1564,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                                 'extra' => {
                                   'normalized' => 'other-nodes'
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {}
                                 }
@@ -1559,6 +1581,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                                       'extra' => {
                                         'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {}
                                       }
@@ -1575,6 +1598,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                                             'extra' => {
                                               'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
                                             },
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {}
                                             }
@@ -1591,6 +1615,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                                                   'extra' => {
                                                     'normalized' => 
'local-node'
                                                   },
+                                                  'info' => {},
                                                   'structure' => {
                                                     'associated_unit' => {}
                                                   }
@@ -1675,6 +1700,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_childs' => [
@@ -1683,6 +1709,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
               'extra' => {
                 'associated_node' => {}
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_level' => 1,
@@ -1697,6 +1724,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
               'extra' => {
                 'associated_node' => {}
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_level' => 1,
@@ -1800,6 +1828,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -1815,6 +1844,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                       'associated_section' => {
                         'cmdname' => 'chapter',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'section_number' => 1
@@ -1822,6 +1852,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                       },
                       'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_next' => {
@@ -1830,6 +1861,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                           'associated_section' => {
                             'cmdname' => 'chapter',
                             'extra' => {},
+                            'info' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -1846,6 +1878,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                                           'extra' => {
                                             'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'associated_unit' => {},
                                             'node_next' => {
@@ -1853,6 +1886,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                                               'extra' => {
                                                 'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
                                               },
+                                              'info' => {},
                                               'structure' => {
                                                 'associated_unit' => {
                                                   'extra' => {
@@ -1869,6 +1903,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                                                             'extra' => {
                                                               'normalized' => 
'local-node'
                                                             },
+                                                            'info' => {},
                                                             'structure' => {
                                                               
'associated_unit' => {},
                                                               'node_prev' => 
{},
@@ -1953,6 +1988,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                           ],
                           'normalized' => 'other-nodes'
                         },
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'menu_child' => {},
@@ -2004,6 +2040,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {},
@@ -2100,6 +2137,7 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -2114,6 +2152,7 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
                 'extra' => {
                   'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
@@ -2121,6 +2160,7 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
                     'extra' => {
                       'normalized' => 'other-nodes'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {
                         'extra' => {
@@ -2137,6 +2177,7 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
                                   'extra' => {
                                     'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'associated_unit' => {},
                                     'menu_next' => {
@@ -2144,6 +2185,7 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
                                       'extra' => {
                                         'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {
                                           'extra' => {
@@ -2160,6 +2202,7 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
                                                     'extra' => {
                                                       'normalized' => 
'local-node'
                                                     },
+                                                    'info' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'menu_prev' => {},
@@ -2381,6 +2424,7 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -2388,6 +2432,7 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
             'extra' => {
               'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -2404,6 +2449,7 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                           'extra' => {
                             'normalized' => 'other-nodes'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'menu_child' => {
@@ -2411,6 +2457,7 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                               'extra' => {
                                 'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {
                                   'extra' => {
@@ -2427,6 +2474,7 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                                             'extra' => {
                                               'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
                                             },
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'menu_next' => {
@@ -2434,6 +2482,7 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                                                 'extra' => {
                                                   'normalized' => 'local-node'
                                                 },
+                                                'info' => {},
                                                 'structure' => {
                                                   'associated_unit' => {
                                                     'extra' => {
diff --git a/tp/t/results/sectioning/complex.pl 
b/tp/t/results/sectioning/complex.pl
index f9106f4c8d..0e859cda8d 100644
--- a/tp/t/results/sectioning/complex.pl
+++ b/tp/t/results/sectioning/complex.pl
@@ -41,7 +41,7 @@ $result_trees{'complex'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -72,7 +72,9 @@ $result_trees{'complex'} = [
               ]
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -84,7 +86,7 @@ $result_trees{'complex'} = [
       {
         'args' => [
           {
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -96,7 +98,7 @@ $result_trees{'complex'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -407,7 +409,7 @@ $result_trees{'complex'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -416,9 +418,11 @@ $result_trees{'complex'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 10,
@@ -480,7 +484,7 @@ $result_trees{'complex'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -513,7 +517,9 @@ $result_trees{'complex'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'First-node',
+          'normalized' => 'First-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -530,7 +536,7 @@ $result_trees{'complex'} = [
                 'text' => 'first node chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -556,7 +562,7 @@ $result_trees{'complex'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -735,7 +741,7 @@ $result_trees{'complex'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -744,9 +750,11 @@ $result_trees{'complex'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 21,
@@ -766,7 +774,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -791,7 +800,7 @@ $result_trees{'complex'} = [
                 'text' => 'unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -811,7 +820,9 @@ $result_trees{'complex'} = [
               'normalized' => 'unnumbered'
             }
           ],
-          'normalized' => 'unnumbered',
+          'normalized' => 'unnumbered'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -828,7 +839,7 @@ $result_trees{'complex'} = [
                 'text' => 'unnumbered section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -845,7 +856,7 @@ $result_trees{'complex'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -1058,7 +1069,7 @@ $result_trees{'complex'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -1067,9 +1078,11 @@ $result_trees{'complex'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 31,
@@ -1089,7 +1102,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1114,7 +1128,7 @@ $result_trees{'complex'} = [
                 'text' => 'unnumbered sub'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1134,7 +1148,9 @@ $result_trees{'complex'} = [
               'normalized' => 'unnumbered-sub'
             }
           ],
-          'normalized' => 'unnumbered-sub',
+          'normalized' => 'unnumbered-sub'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1151,7 +1167,7 @@ $result_trees{'complex'} = [
                 'text' => 'unnumbered subsection'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1166,7 +1182,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1191,7 +1208,7 @@ $result_trees{'complex'} = [
                 'text' => 'numbered sub'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1211,7 +1228,9 @@ $result_trees{'complex'} = [
               'normalized' => 'numbered-sub'
             }
           ],
-          'normalized' => 'numbered-sub',
+          'normalized' => 'numbered-sub'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1228,7 +1247,7 @@ $result_trees{'complex'} = [
                 'text' => 'numbered subsection'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1243,7 +1262,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1268,7 +1288,7 @@ $result_trees{'complex'} = [
                 'text' => 'unnumbered sub2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1288,7 +1308,9 @@ $result_trees{'complex'} = [
               'normalized' => 'unnumbered-sub2'
             }
           ],
-          'normalized' => 'unnumbered-sub2',
+          'normalized' => 'unnumbered-sub2'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1305,7 +1327,7 @@ $result_trees{'complex'} = [
                 'text' => 'unnumbered subsection2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1320,7 +1342,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1345,7 +1368,7 @@ $result_trees{'complex'} = [
                 'text' => 'numbered sub2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1365,7 +1388,9 @@ $result_trees{'complex'} = [
               'normalized' => 'numbered-sub2'
             }
           ],
-          'normalized' => 'numbered-sub2',
+          'normalized' => 'numbered-sub2'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1382,7 +1407,7 @@ $result_trees{'complex'} = [
                 'text' => 'numbered subsection2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1397,7 +1422,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1422,7 +1448,7 @@ $result_trees{'complex'} = [
                 'text' => 'unnumbered2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1442,7 +1468,9 @@ $result_trees{'complex'} = [
               'normalized' => 'unnumbered2'
             }
           ],
-          'normalized' => 'unnumbered2',
+          'normalized' => 'unnumbered2'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1459,7 +1487,7 @@ $result_trees{'complex'} = [
                 'text' => 'unnumbered section2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1476,7 +1504,7 @@ $result_trees{'complex'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -1542,7 +1570,7 @@ $result_trees{'complex'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -1551,9 +1579,11 @@ $result_trees{'complex'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 50,
@@ -1573,7 +1603,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1598,7 +1629,7 @@ $result_trees{'complex'} = [
                 'text' => 'numbered sub3'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1618,7 +1649,9 @@ $result_trees{'complex'} = [
               'normalized' => 'numbered-sub3'
             }
           ],
-          'normalized' => 'numbered-sub3',
+          'normalized' => 'numbered-sub3'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1635,7 +1668,7 @@ $result_trees{'complex'} = [
                 'text' => 'numbered subsection3'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1655,7 +1688,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1680,7 +1714,7 @@ $result_trees{'complex'} = [
                 'text' => 'numbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1700,7 +1734,9 @@ $result_trees{'complex'} = [
               'normalized' => 'numbered'
             }
           ],
-          'normalized' => 'numbered',
+          'normalized' => 'numbered'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1717,7 +1753,7 @@ $result_trees{'complex'} = [
                 'text' => 'numbered section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1732,7 +1768,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => '  '
         },
         'source_info' => {
@@ -1763,7 +1800,7 @@ $result_trees{'complex'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1812,7 +1849,9 @@ $result_trees{'complex'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'between-node',
+          'normalized' => 'between-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1856,7 +1895,7 @@ $result_trees{'complex'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1910,7 +1949,9 @@ $result_trees{'complex'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Second-node',
+          'normalized' => 'Second-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1927,7 +1968,7 @@ $result_trees{'complex'} = [
                 'text' => 'second node chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1956,7 +1997,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1981,7 +2023,7 @@ $result_trees{'complex'} = [
                 'text' => 'Third node unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -2001,7 +2043,9 @@ $result_trees{'complex'} = [
               'normalized' => 'Third-node-unnumbered'
             }
           ],
-          'normalized' => 'Third-node-unnumbered',
+          'normalized' => 'Third-node-unnumbered'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -2018,7 +2062,7 @@ $result_trees{'complex'} = [
                 'text' => 'unnumbered chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -2047,7 +2091,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -2080,7 +2125,7 @@ $result_trees{'complex'} = [
                 'text' => 'Third node unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => '  '
             },
             'type' => 'line_arg'
@@ -2091,7 +2136,7 @@ $result_trees{'complex'} = [
                 'text' => 'Last node no description'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -2102,7 +2147,7 @@ $result_trees{'complex'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -2141,7 +2186,9 @@ $result_trees{'complex'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'continuity',
+          'normalized' => 'continuity'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -2158,7 +2205,7 @@ $result_trees{'complex'} = [
                 'text' => 'unnumbered continuity'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -2191,7 +2238,8 @@ $result_trees{'complex'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -2227,7 +2275,7 @@ $result_trees{'complex'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -2282,7 +2330,9 @@ $result_trees{'complex'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Last-node-no-description',
+          'normalized' => 'Last-node-no-description'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -2564,6 +2614,7 @@ $result_sectioning{'complex'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -2581,11 +2632,13 @@ $result_sectioning{'complex'} = {
                               'extra' => {
                                 'normalized' => 'First-node'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_childs' => [
@@ -2597,6 +2650,7 @@ $result_sectioning{'complex'} = {
                                     'extra' => {
                                       'normalized' => 'unnumbered'
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {
                                         'extra' => {
@@ -2616,11 +2670,13 @@ $result_sectioning{'complex'} = {
                                                       'extra' => {
                                                         'normalized' => 
'Second-node'
                                                       },
+                                                      'info' => {},
                                                       'structure' => {
                                                         'associated_unit' => {}
                                                       }
                                                     }
                                                   },
+                                                  'info' => {},
                                                   'structure' => {
                                                     'associated_unit' => {},
                                                     'section_level' => 1,
@@ -2644,11 +2700,13 @@ $result_sectioning{'complex'} = {
                                                             'extra' => {
                                                               'normalized' => 
'numbered'
                                                             },
+                                                            'info' => {},
                                                             'structure' => {
                                                               
'associated_unit' => {}
                                                             }
                                                           }
                                                         },
+                                                        'info' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{},
                                                           'section_level' => 2,
@@ -2661,6 +2719,7 @@ $result_sectioning{'complex'} = {
                                                                 'extra' => {
                                                                   'normalized' 
=> 'unnumbered2'
                                                                 },
+                                                                'info' => {},
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {
                                                                     'extra' => 
{
@@ -2678,11 +2737,13 @@ $result_sectioning{'complex'} = {
                                                                                
   'extra' => {
                                                                                
     'normalized' => 'numbered-sub2'
                                                                                
   },
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'associated_unit' => {}
                                                                                
   }
                                                                                
 }
                                                                               
},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {},
                                                                                
 'section_level' => 3,
@@ -2694,6 +2755,7 @@ $result_sectioning{'complex'} = {
                                                                                
       'extra' => {
                                                                                
         'normalized' => 'unnumbered-sub2'
                                                                                
       },
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'associated_unit' => {
                                                                                
           'extra' => {
@@ -2711,11 +2773,13 @@ $result_sectioning{'complex'} = {
                                                                                
                         'extra' => {
                                                                                
                           'normalized' => 'numbered-sub'
                                                                                
                         },
+                                                                               
                         'info' => {},
                                                                                
                         'structure' => {
                                                                                
                           'associated_unit' => {}
                                                                                
                         }
                                                                                
                       }
                                                                                
                     },
+                                                                               
                     'info' => {},
                                                                                
                     'structure' => {
                                                                                
                       'associated_unit' => {},
                                                                                
                       'section_level' => 3,
@@ -2727,6 +2791,7 @@ $result_sectioning{'complex'} = {
                                                                                
                             'extra' => {
                                                                                
                               'normalized' => 'unnumbered-sub'
                                                                                
                             },
+                                                                               
                             'info' => {},
                                                                                
                             'structure' => {
                                                                                
                               'associated_unit' => {
                                                                                
                                 'extra' => {
@@ -2754,6 +2819,7 @@ $result_sectioning{'complex'} = {
                                                                                
                             }
                                                                                
                           }
                                                                                
                         },
+                                                                               
                         'info' => {},
                                                                                
                         'structure' => {
                                                                                
                           'associated_unit' => {},
                                                                                
                           'section_level' => 3,
@@ -2806,6 +2872,7 @@ $result_sectioning{'complex'} = {
                                                                                
       }
                                                                                
     }
                                                                                
   },
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'associated_unit' => {},
                                                                                
     'section_level' => 3,
@@ -2848,11 +2915,13 @@ $result_sectioning{'complex'} = {
                                                                                
   'extra' => {
                                                                                
     'normalized' => 'numbered-sub3'
                                                                                
   },
+                                                                               
   'info' => {},
                                                                                
   'structure' => {
                                                                                
     'associated_unit' => {}
                                                                                
   }
                                                                                
 }
                                                                               
},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {},
                                                                                
 'section_level' => 3,
@@ -2895,6 +2964,7 @@ $result_sectioning{'complex'} = {
                                                                 }
                                                               }
                                                             },
+                                                            'info' => {},
                                                             'structure' => {
                                                               
'associated_unit' => {},
                                                               'section_childs' 
=> [
@@ -2938,11 +3008,13 @@ $result_sectioning{'complex'} = {
                                                             'extra' => {
                                                               'normalized' => 
'Third-node-unnumbered'
                                                             },
+                                                            'info' => {},
                                                             'structure' => {
                                                               
'associated_unit' => {}
                                                             }
                                                           }
                                                         },
+                                                        'info' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{},
                                                           'section_level' => 1,
@@ -2967,11 +3039,13 @@ $result_sectioning{'complex'} = {
                                                                   'extra' => {
                                                                     
'normalized' => 'continuity'
                                                                   },
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'associated_unit' => {}
                                                                   }
                                                                 }
                                                               },
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {},
                                                                 
'section_level' => 1,
@@ -3046,6 +3120,7 @@ $result_sectioning{'complex'} = {
                                     }
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_childs' => [
@@ -3359,6 +3434,7 @@ $result_nodes{'complex'} = {
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -3374,6 +3450,7 @@ $result_nodes{'complex'} = {
                         'unit_command' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 2
@@ -3387,6 +3464,7 @@ $result_nodes{'complex'} = {
                               'unit_command' => {
                                 'cmdname' => 'section',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_number' => '1.1'
@@ -3400,6 +3478,7 @@ $result_nodes{'complex'} = {
                                     'unit_command' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {}
                                       }
@@ -3412,6 +3491,7 @@ $result_nodes{'complex'} = {
                                           'unit_command' => {
                                             'cmdname' => 'unnumberedsec',
                                             'extra' => {},
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {}
                                             }
@@ -3424,6 +3504,7 @@ $result_nodes{'complex'} = {
                                                 'unit_command' => {
                                                   'cmdname' => 'subsection',
                                                   'extra' => {},
+                                                  'info' => {},
                                                   'structure' => {
                                                     'associated_unit' => {}
                                                   }
@@ -3436,6 +3517,7 @@ $result_nodes{'complex'} = {
                                                       'unit_command' => {
                                                         'cmdname' => 
'unnumberedsubsec',
                                                         'extra' => {},
+                                                        'info' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{}
                                                         }
@@ -3448,6 +3530,7 @@ $result_nodes{'complex'} = {
                                                             'unit_command' => {
                                                               'cmdname' => 
'subsection',
                                                               'extra' => {},
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {}
                                                               }
@@ -3460,6 +3543,7 @@ $result_nodes{'complex'} = {
                                                                   
'unit_command' => {
                                                                     'cmdname' 
=> 'unnumberedsubsec',
                                                                     'extra' => 
{},
+                                                                    'info' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {}
                                                                     }
@@ -3472,6 +3556,7 @@ $result_nodes{'complex'} = {
                                                                         
'unit_command' => {
                                                                           
'cmdname' => 'unnumberedsec',
                                                                           
'extra' => {},
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {}
                                                                           }
@@ -3617,6 +3702,7 @@ $result_nodes{'complex'} = {
                               'unit_command' => {
                                 'cmdname' => 'unnumbered',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {}
                                 }
@@ -3631,6 +3717,7 @@ $result_nodes{'complex'} = {
                                     'unit_command' => {
                                       'cmdname' => 'unnumbered',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {}
                                       }
@@ -3725,6 +3812,7 @@ $result_nodes{'complex'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -3738,6 +3826,7 @@ $result_nodes{'complex'} = {
         ],
         'normalized' => 'First-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_child' => {
@@ -3751,6 +3840,7 @@ $result_nodes{'complex'} = {
             ],
             'normalized' => 'unnumbered'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_child' => {
@@ -3759,6 +3849,7 @@ $result_nodes{'complex'} = {
                 'associated_section' => {},
                 'normalized' => 'unnumbered-sub'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'node_next' => {
@@ -3767,6 +3858,7 @@ $result_nodes{'complex'} = {
                     'associated_section' => {},
                     'normalized' => 'numbered-sub'
                   },
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {},
                     'node_next' => {
@@ -3775,6 +3867,7 @@ $result_nodes{'complex'} = {
                         'associated_section' => {},
                         'normalized' => 'unnumbered-sub2'
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'node_next' => {
@@ -3783,6 +3876,7 @@ $result_nodes{'complex'} = {
                             'associated_section' => {},
                             'normalized' => 'numbered-sub2'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'node_prev' => {},
@@ -3811,6 +3905,7 @@ $result_nodes{'complex'} = {
                 ],
                 'normalized' => 'unnumbered2'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'menu_child' => {
@@ -3819,6 +3914,7 @@ $result_nodes{'complex'} = {
                     'associated_section' => {},
                     'normalized' => 'numbered-sub3'
                   },
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {},
                     'node_up' => {}
@@ -3830,6 +3926,7 @@ $result_nodes{'complex'} = {
                     'associated_section' => {},
                     'normalized' => 'numbered'
                   },
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {},
                     'node_prev' => {},
@@ -4063,6 +4160,7 @@ $result_menus{'complex'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -4081,6 +4179,7 @@ $result_menus{'complex'} = {
               'unit_command' => {
                 'cmdname' => 'chapter',
                 'extra' => {},
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -4096,6 +4195,7 @@ $result_menus{'complex'} = {
                     'unit_command' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_number' => 2
@@ -4109,6 +4209,7 @@ $result_menus{'complex'} = {
                           'unit_command' => {
                             'cmdname' => 'section',
                             'extra' => {},
+                            'info' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'section_number' => '1.1'
@@ -4122,6 +4223,7 @@ $result_menus{'complex'} = {
                                 'unit_command' => {
                                   'cmdname' => 'subsection',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {
                                     'associated_unit' => {}
                                   }
@@ -4134,6 +4236,7 @@ $result_menus{'complex'} = {
                                       'unit_command' => {
                                         'cmdname' => 'unnumberedsec',
                                         'extra' => {},
+                                        'info' => {},
                                         'structure' => {
                                           'associated_unit' => {}
                                         }
@@ -4146,6 +4249,7 @@ $result_menus{'complex'} = {
                                             'unit_command' => {
                                               'cmdname' => 'subsection',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {
                                                 'associated_unit' => {}
                                               }
@@ -4158,6 +4262,7 @@ $result_menus{'complex'} = {
                                                   'unit_command' => {
                                                     'cmdname' => 
'unnumberedsubsec',
                                                     'extra' => {},
+                                                    'info' => {},
                                                     'structure' => {
                                                       'associated_unit' => {}
                                                     }
@@ -4170,6 +4275,7 @@ $result_menus{'complex'} = {
                                                         'unit_command' => {
                                                           'cmdname' => 
'subsection',
                                                           'extra' => {},
+                                                          'info' => {},
                                                           'structure' => {
                                                             'associated_unit' 
=> {}
                                                           }
@@ -4182,6 +4288,7 @@ $result_menus{'complex'} = {
                                                               'unit_command' 
=> {
                                                                 'cmdname' => 
'unnumberedsubsec',
                                                                 'extra' => {},
+                                                                'info' => {},
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {}
                                                                 }
@@ -4194,6 +4301,7 @@ $result_menus{'complex'} = {
                                                                     
'unit_command' => {
                                                                       
'cmdname' => 'unnumberedsec',
                                                                       'extra' 
=> {},
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'associated_unit' => {}
                                                                       }
@@ -4339,6 +4447,7 @@ $result_menus{'complex'} = {
                           'unit_command' => {
                             'cmdname' => 'unnumbered',
                             'extra' => {},
+                            'info' => {},
                             'structure' => {
                               'associated_unit' => {}
                             }
@@ -4353,6 +4462,7 @@ $result_menus{'complex'} = {
                                 'unit_command' => {
                                   'cmdname' => 'unnumbered',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {
                                     'associated_unit' => {}
                                   }
@@ -4443,6 +4553,7 @@ $result_menus{'complex'} = {
       'extra' => {
         'normalized' => 'First-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_child' => {
@@ -4450,6 +4561,7 @@ $result_menus{'complex'} = {
           'extra' => {
             'normalized' => 'unnumbered'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_child' => {
@@ -4457,6 +4569,7 @@ $result_menus{'complex'} = {
               'extra' => {
                 'normalized' => 'unnumbered-sub'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'menu_next' => {
@@ -4464,6 +4577,7 @@ $result_menus{'complex'} = {
                   'extra' => {
                     'normalized' => 'numbered-sub'
                   },
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {},
                     'menu_next' => {
@@ -4471,6 +4585,7 @@ $result_menus{'complex'} = {
                       'extra' => {
                         'normalized' => 'unnumbered-sub2'
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'menu_next' => {
@@ -4478,6 +4593,7 @@ $result_menus{'complex'} = {
                           'extra' => {
                             'normalized' => 'numbered-sub2'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'menu_prev' => {},
@@ -4512,6 +4628,7 @@ $result_menus{'complex'} = {
               'extra' => {
                 'normalized' => 'unnumbered2'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'menu_child' => {
@@ -4519,6 +4636,7 @@ $result_menus{'complex'} = {
                   'extra' => {
                     'normalized' => 'numbered-sub3'
                   },
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {},
                     'menu_up' => {},
@@ -4532,6 +4650,7 @@ $result_menus{'complex'} = {
                   'extra' => {
                     'normalized' => 'numbered'
                   },
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {},
                     'menu_prev' => {},
@@ -4559,6 +4678,7 @@ $result_menus{'complex'} = {
           'extra' => {
             'normalized' => 'between-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_next' => {
@@ -4566,6 +4686,7 @@ $result_menus{'complex'} = {
               'extra' => {
                 'normalized' => 'Second-node'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'menu_next' => {
@@ -4573,6 +4694,7 @@ $result_menus{'complex'} = {
                   'extra' => {
                     'normalized' => 'Third-node-unnumbered'
                   },
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {},
                     'menu_next' => {
@@ -4580,6 +4702,7 @@ $result_menus{'complex'} = {
                       'extra' => {
                         'normalized' => 'continuity'
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'menu_next' => {
@@ -4587,6 +4710,7 @@ $result_menus{'complex'} = {
                           'extra' => {
                             'normalized' => 'Last-node-no-description'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'menu_prev' => {},
@@ -4861,6 +4985,7 @@ $result_elements{'complex'} = [
             'unit_command' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -4876,6 +5001,7 @@ $result_elements{'complex'} = [
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 2
@@ -4889,6 +5015,7 @@ $result_elements{'complex'} = [
                         'unit_command' => {
                           'cmdname' => 'section',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => '1.1'
@@ -4902,6 +5029,7 @@ $result_elements{'complex'} = [
                               'unit_command' => {
                                 'cmdname' => 'subsection',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {}
                                 }
@@ -4914,6 +5042,7 @@ $result_elements{'complex'} = [
                                     'unit_command' => {
                                       'cmdname' => 'unnumberedsec',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {}
                                       }
@@ -4926,6 +5055,7 @@ $result_elements{'complex'} = [
                                           'unit_command' => {
                                             'cmdname' => 'subsection',
                                             'extra' => {},
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {}
                                             }
@@ -4938,6 +5068,7 @@ $result_elements{'complex'} = [
                                                 'unit_command' => {
                                                   'cmdname' => 
'unnumberedsubsec',
                                                   'extra' => {},
+                                                  'info' => {},
                                                   'structure' => {
                                                     'associated_unit' => {}
                                                   }
@@ -4950,6 +5081,7 @@ $result_elements{'complex'} = [
                                                       'unit_command' => {
                                                         'cmdname' => 
'subsection',
                                                         'extra' => {},
+                                                        'info' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{}
                                                         }
@@ -4962,6 +5094,7 @@ $result_elements{'complex'} = [
                                                             'unit_command' => {
                                                               'cmdname' => 
'unnumberedsubsec',
                                                               'extra' => {},
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {}
                                                               }
@@ -4974,6 +5107,7 @@ $result_elements{'complex'} = [
                                                                   
'unit_command' => {
                                                                     'cmdname' 
=> 'unnumberedsec',
                                                                     'extra' => 
{},
+                                                                    'info' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {}
                                                                     }
@@ -5103,6 +5237,7 @@ $result_elements{'complex'} = [
                         'unit_command' => {
                           'cmdname' => 'unnumbered',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -5117,6 +5252,7 @@ $result_elements{'complex'} = [
                               'unit_command' => {
                                 'cmdname' => 'unnumbered',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {}
                                 }
diff --git a/tp/t/results/sectioning/complex_split_at_node.pl 
b/tp/t/results/sectioning/complex_split_at_node.pl
index 525793eed5..c68e95acda 100644
--- a/tp/t/results/sectioning/complex_split_at_node.pl
+++ b/tp/t/results/sectioning/complex_split_at_node.pl
@@ -41,7 +41,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -72,7 +72,9 @@ $result_trees{'complex_split_at_node'} = [
               ]
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -84,7 +86,7 @@ $result_trees{'complex_split_at_node'} = [
       {
         'args' => [
           {
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -96,7 +98,7 @@ $result_trees{'complex_split_at_node'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -407,7 +409,7 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -416,9 +418,11 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 10,
@@ -480,7 +484,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -513,7 +517,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'First-node',
+          'normalized' => 'First-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -530,7 +536,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'first node chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -556,7 +562,7 @@ $result_trees{'complex_split_at_node'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -735,7 +741,7 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -744,9 +750,11 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 21,
@@ -766,7 +774,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -791,7 +800,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -811,7 +820,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'unnumbered'
             }
           ],
-          'normalized' => 'unnumbered',
+          'normalized' => 'unnumbered'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -828,7 +839,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'unnumbered section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -845,7 +856,7 @@ $result_trees{'complex_split_at_node'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -1058,7 +1069,7 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -1067,9 +1078,11 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 31,
@@ -1089,7 +1102,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1114,7 +1128,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'unnumbered sub'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1134,7 +1148,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'unnumbered-sub'
             }
           ],
-          'normalized' => 'unnumbered-sub',
+          'normalized' => 'unnumbered-sub'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1151,7 +1167,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'unnumbered subsection'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1166,7 +1182,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1191,7 +1208,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'numbered sub'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1211,7 +1228,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'numbered-sub'
             }
           ],
-          'normalized' => 'numbered-sub',
+          'normalized' => 'numbered-sub'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1228,7 +1247,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'numbered subsection'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1243,7 +1262,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1268,7 +1288,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'unnumbered sub2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1288,7 +1308,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'unnumbered-sub2'
             }
           ],
-          'normalized' => 'unnumbered-sub2',
+          'normalized' => 'unnumbered-sub2'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1305,7 +1327,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'unnumbered subsection2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1320,7 +1342,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1345,7 +1368,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'numbered sub2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1365,7 +1388,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'numbered-sub2'
             }
           ],
-          'normalized' => 'numbered-sub2',
+          'normalized' => 'numbered-sub2'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1382,7 +1407,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'numbered subsection2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1397,7 +1422,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1422,7 +1448,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'unnumbered2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1442,7 +1468,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'unnumbered2'
             }
           ],
-          'normalized' => 'unnumbered2',
+          'normalized' => 'unnumbered2'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1459,7 +1487,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'unnumbered section2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1476,7 +1504,7 @@ $result_trees{'complex_split_at_node'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -1542,7 +1570,7 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -1551,9 +1579,11 @@ $result_trees{'complex_split_at_node'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 50,
@@ -1573,7 +1603,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1598,7 +1629,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'numbered sub3'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1618,7 +1649,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'numbered-sub3'
             }
           ],
-          'normalized' => 'numbered-sub3',
+          'normalized' => 'numbered-sub3'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1635,7 +1668,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'numbered subsection3'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1655,7 +1688,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1680,7 +1714,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'numbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1700,7 +1734,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'numbered'
             }
           ],
-          'normalized' => 'numbered',
+          'normalized' => 'numbered'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1717,7 +1753,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'numbered section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1732,7 +1768,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => '  '
         },
         'source_info' => {
@@ -1771,7 +1808,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1820,7 +1857,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'between-node',
+          'normalized' => 'between-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1864,7 +1903,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1918,7 +1957,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Second-node',
+          'normalized' => 'Second-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1935,7 +1976,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'second node chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -1964,7 +2005,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -1989,7 +2031,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'Third node unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -2009,7 +2051,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'Third-node-unnumbered'
             }
           ],
-          'normalized' => 'Third-node-unnumbered',
+          'normalized' => 'Third-node-unnumbered'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -2026,7 +2070,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'unnumbered chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -2055,7 +2099,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -2088,7 +2133,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'Third node unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => '  '
             },
             'type' => 'line_arg'
@@ -2099,7 +2144,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'Last node no description'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -2110,7 +2155,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -2149,7 +2194,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'continuity',
+          'normalized' => 'continuity'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -2166,7 +2213,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'unnumbered continuity'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -2199,7 +2246,8 @@ $result_trees{'complex_split_at_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -2243,7 +2291,7 @@ $result_trees{'complex_split_at_node'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -2298,7 +2346,9 @@ $result_trees{'complex_split_at_node'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Last-node-no-description',
+          'normalized' => 'Last-node-no-description'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -2582,6 +2632,7 @@ $result_sectioning{'complex_split_at_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -2596,6 +2647,7 @@ $result_sectioning{'complex_split_at_node'} = {
                           'extra' => {
                             'normalized' => 'First-node'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -2612,6 +2664,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                 'extra' => {
                                   'normalized' => 'Second-node'
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {}
                                 }
@@ -2626,6 +2679,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                       'extra' => {
                                         'normalized' => 'between-node'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {}
                                       }
@@ -2640,6 +2694,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                             'extra' => {
                                               'normalized' => 'numbered'
                                             },
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {}
                                             }
@@ -2654,6 +2709,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                   'extra' => {
                                                     'normalized' => 
'numbered-sub3'
                                                   },
+                                                  'info' => {},
                                                   'structure' => {
                                                     'associated_unit' => {}
                                                   }
@@ -2668,6 +2724,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                         'extra' => {
                                                           'normalized' => 
'unnumbered2'
                                                         },
+                                                        'info' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{}
                                                         }
@@ -2682,6 +2739,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                               'extra' => {
                                                                 'normalized' 
=> 'numbered-sub2'
                                                               },
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {}
                                                               }
@@ -2696,6 +2754,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                     'extra' => 
{
                                                                       
'normalized' => 'unnumbered-sub2'
                                                                     },
+                                                                    'info' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {}
                                                                     }
@@ -2710,6 +2769,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                           
'extra' => {
                                                                             
'normalized' => 'numbered-sub'
                                                                           },
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {}
                                                                           }
@@ -2724,6 +2784,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
 'extra' => {
                                                                                
   'normalized' => 'unnumbered-sub'
                                                                                
 },
+                                                                               
 'info' => {},
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {}
                                                                                
 }
@@ -2738,6 +2799,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
       'extra' => {
                                                                                
         'normalized' => 'unnumbered'
                                                                                
       },
+                                                                               
       'info' => {},
                                                                                
       'structure' => {
                                                                                
         'associated_unit' => {}
                                                                                
       }
@@ -2895,6 +2957,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                       'extra' => {
                                         'normalized' => 'Third-node-unnumbered'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {}
                                       }
@@ -2911,6 +2974,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                             'extra' => {
                                               'normalized' => 'continuity'
                                             },
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {}
                                             }
@@ -2927,6 +2991,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                   'extra' => {
                                                     'normalized' => 
'Last-node-no-description'
                                                   },
+                                                  'info' => {},
                                                   'structure' => {
                                                     'associated_unit' => {}
                                                   }
@@ -3026,6 +3091,7 @@ $result_sectioning{'complex_split_at_node'} = {
               'extra' => {
                 'associated_node' => {}
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_childs' => [
@@ -3034,6 +3100,7 @@ $result_sectioning{'complex_split_at_node'} = {
                     'extra' => {
                       'associated_node' => {}
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_childs' => [
@@ -3042,6 +3109,7 @@ $result_sectioning{'complex_split_at_node'} = {
                           'extra' => {
                             'associated_node' => {}
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 3,
@@ -3053,6 +3121,7 @@ $result_sectioning{'complex_split_at_node'} = {
                           'extra' => {
                             'associated_node' => {}
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 3,
@@ -3065,6 +3134,7 @@ $result_sectioning{'complex_split_at_node'} = {
                           'extra' => {
                             'associated_node' => {}
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 3,
@@ -3077,6 +3147,7 @@ $result_sectioning{'complex_split_at_node'} = {
                           'extra' => {
                             'associated_node' => {}
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 3,
@@ -3094,6 +3165,7 @@ $result_sectioning{'complex_split_at_node'} = {
                     'extra' => {
                       'associated_node' => {}
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_childs' => [
@@ -3102,6 +3174,7 @@ $result_sectioning{'complex_split_at_node'} = {
                           'extra' => {
                             'associated_node' => {}
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 3,
@@ -3119,6 +3192,7 @@ $result_sectioning{'complex_split_at_node'} = {
                     'extra' => {
                       'associated_node' => {}
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_level' => 2,
@@ -3140,6 +3214,7 @@ $result_sectioning{'complex_split_at_node'} = {
               'extra' => {
                 'associated_node' => {}
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_level' => 1,
@@ -3155,6 +3230,7 @@ $result_sectioning{'complex_split_at_node'} = {
               'extra' => {
                 'associated_node' => {}
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_level' => 1,
@@ -3169,6 +3245,7 @@ $result_sectioning{'complex_split_at_node'} = {
               'extra' => {
                 'associated_node' => {}
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_level' => 1,
@@ -3444,6 +3521,7 @@ $result_nodes{'complex_split_at_node'} = {
                       'associated_section' => {
                         'cmdname' => 'chapter',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'section_number' => 1
@@ -3456,6 +3534,7 @@ $result_nodes{'complex_split_at_node'} = {
                       ],
                       'normalized' => 'First-node'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'menu_child' => {
@@ -3464,6 +3543,7 @@ $result_nodes{'complex_split_at_node'} = {
                           'associated_section' => {
                             'cmdname' => 'unnumberedsec',
                             'extra' => {},
+                            'info' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -3481,6 +3561,7 @@ $result_nodes{'complex_split_at_node'} = {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'section_number' => 2
@@ -3488,6 +3569,7 @@ $result_nodes{'complex_split_at_node'} = {
                                             },
                                             'normalized' => 'Second-node'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'associated_unit' => {},
                                             'node_next' => {
@@ -3496,6 +3578,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                 'associated_section' => {
                                                   'cmdname' => 'unnumbered',
                                                   'extra' => {},
+                                                  'info' => {},
                                                   'structure' => {
                                                     'associated_unit' => {
                                                       'extra' => {
@@ -3513,12 +3596,14 @@ $result_nodes{'complex_split_at_node'} = {
                                                                   
'associated_section' => {
                                                                     'cmdname' 
=> 'unnumbered',
                                                                     'extra' => 
{},
+                                                                    'info' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {}
                                                                     }
                                                                   },
                                                                   'normalized' 
=> 'continuity'
                                                                 },
+                                                                'info' => {},
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {},
                                                                   'node_next' 
=> {},
@@ -3527,6 +3612,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                     'extra' => 
{
                                                                       
'normalized' => 'Last-node-no-description'
                                                                     },
+                                                                    'info' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {
                                                                         
'extra' => {
@@ -3591,6 +3677,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                 },
                                                 'normalized' => 
'Third-node-unnumbered'
                                               },
+                                              'info' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'node_next' => {},
@@ -3611,6 +3698,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                 'extra' => {
                                                   'normalized' => 
'between-node'
                                                 },
+                                                'info' => {},
                                                 'structure' => {
                                                   'associated_unit' => {},
                                                   'node_up' => {}
@@ -3627,6 +3715,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                         'associated_section' 
=> {
                                                           'cmdname' => 
'section',
                                                           'extra' => {},
+                                                          'info' => {},
                                                           'structure' => {
                                                             'associated_unit' 
=> {},
                                                             'section_number' 
=> '1.1'
@@ -3634,6 +3723,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                         },
                                                         'normalized' => 
'numbered'
                                                       },
+                                                      'info' => {},
                                                       'structure' => {
                                                         'associated_unit' => 
{},
                                                         'node_prev' => {
@@ -3642,6 +3732,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                             
'associated_section' => {
                                                               'cmdname' => 
'unnumberedsec',
                                                               'extra' => {},
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {
                                                                   'extra' => {
@@ -3657,12 +3748,14 @@ $result_nodes{'complex_split_at_node'} = {
                                                                               
'associated_section' => {
                                                                                
 'cmdname' => 'subsection',
                                                                                
 'extra' => {},
+                                                                               
 'info' => {},
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {}
                                                                                
 }
                                                                               
},
                                                                               
'normalized' => 'numbered-sub2'
                                                                             },
+                                                                            
'info' => {},
                                                                             
'structure' => {
                                                                               
'associated_unit' => {},
                                                                               
'node_prev' => {
@@ -3671,6 +3764,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
   'associated_section' => {
                                                                                
     'cmdname' => 'unnumberedsubsec',
                                                                                
     'extra' => {},
+                                                                               
     'info' => {},
                                                                                
     'structure' => {
                                                                                
       'associated_unit' => {
                                                                                
         'extra' => {
@@ -3686,12 +3780,14 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
                     'associated_section' => {
                                                                                
                       'cmdname' => 'subsection',
                                                                                
                       'extra' => {},
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'associated_unit' => {}
                                                                                
                       }
                                                                                
                     },
                                                                                
                     'normalized' => 'numbered-sub'
                                                                                
                   },
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'associated_unit' => {},
                                                                                
                     'node_next' => {},
@@ -3701,6 +3797,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
                         'associated_section' => {
                                                                                
                           'cmdname' => 'unnumberedsubsec',
                                                                                
                           'extra' => {},
+                                                                               
                           'info' => {},
                                                                                
                           'structure' => {
                                                                                
                             'associated_unit' => {
                                                                                
                               'extra' => {
@@ -3729,6 +3826,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
                         },
                                                                                
                         'normalized' => 'unnumbered-sub'
                                                                                
                       },
+                                                                               
                       'info' => {},
                                                                                
                       'structure' => {
                                                                                
                         'associated_unit' => {},
                                                                                
                         'node_next' => {},
@@ -3782,6 +3880,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
   },
                                                                                
   'normalized' => 'unnumbered-sub2'
                                                                                
 },
+                                                                               
 'info' => {},
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {},
                                                                                
   'node_next' => {},
@@ -3822,12 +3921,14 @@ $result_nodes{'complex_split_at_node'} = {
                                                                               
'associated_section' => {
                                                                                
 'cmdname' => 'subsection',
                                                                                
 'extra' => {},
+                                                                               
 'info' => {},
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {}
                                                                                
 }
                                                                               
},
                                                                               
'normalized' => 'numbered-sub3'
                                                                             },
+                                                                            
'info' => {},
                                                                             
'structure' => {
                                                                               
'associated_unit' => {},
                                                                               
'node_up' => {}
@@ -3875,6 +3976,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                             ],
                                                             'normalized' => 
'unnumbered2'
                                                           },
+                                                          'info' => {},
                                                           'structure' => {
                                                             'associated_unit' 
=> {},
                                                             'menu_child' => {},
@@ -3954,6 +4056,7 @@ $result_nodes{'complex_split_at_node'} = {
                           ],
                           'normalized' => 'unnumbered'
                         },
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'menu_child' => {},
@@ -4013,6 +4116,7 @@ $result_nodes{'complex_split_at_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {},
@@ -4261,6 +4365,7 @@ $result_menus{'complex_split_at_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -4275,6 +4380,7 @@ $result_menus{'complex_split_at_node'} = {
                 'extra' => {
                   'normalized' => 'First-node'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_child' => {
@@ -4282,6 +4388,7 @@ $result_menus{'complex_split_at_node'} = {
                     'extra' => {
                       'normalized' => 'unnumbered'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {
                         'extra' => {
@@ -4298,6 +4405,7 @@ $result_menus{'complex_split_at_node'} = {
                                   'extra' => {
                                     'normalized' => 'Second-node'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'associated_unit' => {},
                                     'menu_next' => {
@@ -4305,6 +4413,7 @@ $result_menus{'complex_split_at_node'} = {
                                       'extra' => {
                                         'normalized' => 'Third-node-unnumbered'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {
                                           'extra' => {
@@ -4321,6 +4430,7 @@ $result_menus{'complex_split_at_node'} = {
                                                     'extra' => {
                                                       'normalized' => 
'continuity'
                                                     },
+                                                    'info' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'menu_next' => {
@@ -4328,6 +4438,7 @@ $result_menus{'complex_split_at_node'} = {
                                                         'extra' => {
                                                           'normalized' => 
'Last-node-no-description'
                                                         },
+                                                        'info' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{
                                                             'extra' => {
@@ -4408,6 +4519,7 @@ $result_menus{'complex_split_at_node'} = {
                                       'extra' => {
                                         'normalized' => 'between-node'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {
                                           'extra' => {
@@ -4422,6 +4534,7 @@ $result_menus{'complex_split_at_node'} = {
                                                     'extra' => {
                                                       'normalized' => 
'numbered'
                                                     },
+                                                    'info' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'menu_prev' => {
@@ -4429,6 +4542,7 @@ $result_menus{'complex_split_at_node'} = {
                                                         'extra' => {
                                                           'normalized' => 
'unnumbered2'
                                                         },
+                                                        'info' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{
                                                             'extra' => {
@@ -4443,6 +4557,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                       'extra' 
=> {
                                                                         
'normalized' => 'numbered-sub2'
                                                                       },
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'associated_unit' => {},
                                                                         
'menu_prev' => {
@@ -4450,6 +4565,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                           
'extra' => {
                                                                             
'normalized' => 'unnumbered-sub2'
                                                                           },
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {
                                                                               
'extra' => {
@@ -4464,6 +4580,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                                
         'extra' => {
                                                                                
           'normalized' => 'numbered-sub'
                                                                                
         },
+                                                                               
         'info' => {},
                                                                                
         'structure' => {
                                                                                
           'associated_unit' => {},
                                                                                
           'menu_next' => {},
@@ -4472,6 +4589,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                                
             'extra' => {
                                                                                
               'normalized' => 'unnumbered-sub'
                                                                                
             },
+                                                                               
             'info' => {},
                                                                                
             'structure' => {
                                                                                
               'associated_unit' => {
                                                                                
                 'extra' => {
@@ -4592,6 +4710,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                       'extra' 
=> {
                                                                         
'normalized' => 'numbered-sub3'
                                                                       },
+                                                                      'info' 
=> {},
                                                                       
'structure' => {
                                                                         
'associated_unit' => {},
                                                                         
'menu_up' => {},
@@ -5016,6 +5135,7 @@ $result_elements{'complex_split_at_node'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -5023,6 +5143,7 @@ $result_elements{'complex_split_at_node'} = [
             'extra' => {
               'normalized' => 'First-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -5039,6 +5160,7 @@ $result_elements{'complex_split_at_node'} = [
                           'extra' => {
                             'normalized' => 'Second-node'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'menu_next' => {
@@ -5046,6 +5168,7 @@ $result_elements{'complex_split_at_node'} = [
                               'extra' => {
                                 'normalized' => 'Third-node-unnumbered'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {
                                   'extra' => {
@@ -5062,6 +5185,7 @@ $result_elements{'complex_split_at_node'} = [
                                             'extra' => {
                                               'normalized' => 'continuity'
                                             },
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'menu_next' => {
@@ -5069,6 +5193,7 @@ $result_elements{'complex_split_at_node'} = [
                                                 'extra' => {
                                                   'normalized' => 
'Last-node-no-description'
                                                 },
+                                                'info' => {},
                                                 'structure' => {
                                                   'associated_unit' => {
                                                     'extra' => {
@@ -5144,6 +5269,7 @@ $result_elements{'complex_split_at_node'} = [
                               'extra' => {
                                 'normalized' => 'between-node'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {
                                   'extra' => {
@@ -5158,6 +5284,7 @@ $result_elements{'complex_split_at_node'} = [
                                             'extra' => {
                                               'normalized' => 'numbered'
                                             },
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'menu_prev' => {
@@ -5165,6 +5292,7 @@ $result_elements{'complex_split_at_node'} = [
                                                 'extra' => {
                                                   'normalized' => 'unnumbered2'
                                                 },
+                                                'info' => {},
                                                 'structure' => {
                                                   'associated_unit' => {
                                                     'extra' => {
@@ -5179,6 +5307,7 @@ $result_elements{'complex_split_at_node'} = [
                                                               'extra' => {
                                                                 'normalized' 
=> 'numbered-sub2'
                                                               },
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {},
                                                                 'menu_prev' => 
{
@@ -5186,6 +5315,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                   'extra' => {
                                                                     
'normalized' => 'unnumbered-sub2'
                                                                   },
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'associated_unit' => {
                                                                       'extra' 
=> {
@@ -5200,6 +5330,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                                
 'extra' => {
                                                                                
   'normalized' => 'numbered-sub'
                                                                                
 },
+                                                                               
 'info' => {},
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {},
                                                                                
   'menu_next' => {},
@@ -5208,6 +5339,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                                
     'extra' => {
                                                                                
       'normalized' => 'unnumbered-sub'
                                                                                
     },
+                                                                               
     'info' => {},
                                                                                
     'structure' => {
                                                                                
       'associated_unit' => {
                                                                                
         'extra' => {
@@ -5222,6 +5354,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                                
                   'extra' => {
                                                                                
                     'normalized' => 'unnumbered'
                                                                                
                   },
+                                                                               
                   'info' => {},
                                                                                
                   'structure' => {
                                                                                
                     'associated_unit' => {},
                                                                                
                     'menu_child' => {},
@@ -5354,6 +5487,7 @@ $result_elements{'complex_split_at_node'} = [
                                                               'extra' => {
                                                                 'normalized' 
=> 'numbered-sub3'
                                                               },
+                                                              'info' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {},
                                                                 'menu_up' => 
{},
diff --git a/tp/t/results/sectioning/contents.pl 
b/tp/t/results/sectioning/contents.pl
index 7808bd7df2..35ba21f08b 100644
--- a/tp/t/results/sectioning/contents.pl
+++ b/tp/t/results/sectioning/contents.pl
@@ -24,7 +24,7 @@ $result_trees{'contents'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -39,7 +39,8 @@ $result_trees{'contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +57,7 @@ $result_trees{'contents'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -71,7 +72,7 @@ $result_trees{'contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -88,7 +89,7 @@ $result_trees{'contents'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -103,7 +104,7 @@ $result_trees{'contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -120,7 +121,7 @@ $result_trees{'contents'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -135,7 +136,7 @@ $result_trees{'contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -152,7 +153,7 @@ $result_trees{'contents'} = {
               'text' => 'subsubsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -167,7 +168,7 @@ $result_trees{'contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +185,7 @@ $result_trees{'contents'} = {
               'text' => 'part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -199,7 +200,8 @@ $result_trees{'contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -216,7 +218,7 @@ $result_trees{'contents'} = {
               'text' => 'chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -232,7 +234,9 @@ $result_trees{'contents'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -249,7 +253,7 @@ $result_trees{'contents'} = {
               'text' => 'second chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +268,7 @@ $result_trees{'contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +285,7 @@ $result_trees{'contents'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -296,7 +300,7 @@ $result_trees{'contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -313,7 +317,7 @@ $result_trees{'contents'} = {
               'text' => 'appendix'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -328,7 +332,7 @@ $result_trees{'contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -345,7 +349,7 @@ $result_trees{'contents'} = {
               'text' => 'appendixsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -375,7 +379,7 @@ $result_trees{'contents'} = {
           }
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -456,26 +460,27 @@ $result_sectioning{'contents'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
-                                'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.1',
@@ -515,6 +520,7 @@ $result_sectioning{'contents'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 2,
@@ -524,12 +530,13 @@ $result_sectioning{'contents'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -541,7 +548,7 @@ $result_sectioning{'contents'} = {
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -558,12 +565,12 @@ $result_sectioning{'contents'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => 'A.1',
diff --git a/tp/t/results/sectioning/contents_and_shortcontents.pl 
b/tp/t/results/sectioning/contents_and_shortcontents.pl
index b762b8ec7c..356829ae1f 100644
--- a/tp/t/results/sectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/sectioning/contents_and_shortcontents.pl
@@ -24,7 +24,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -39,7 +39,8 @@ $result_trees{'contents_and_shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +57,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -71,7 +72,7 @@ $result_trees{'contents_and_shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -88,7 +89,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -103,7 +104,7 @@ $result_trees{'contents_and_shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -120,7 +121,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -135,7 +136,7 @@ $result_trees{'contents_and_shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -152,7 +153,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'subsubsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -167,7 +168,7 @@ $result_trees{'contents_and_shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +185,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -199,7 +200,8 @@ $result_trees{'contents_and_shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -216,7 +218,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -232,7 +234,9 @@ $result_trees{'contents_and_shortcontents'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -249,7 +253,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'second chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +268,7 @@ $result_trees{'contents_and_shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +285,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -296,7 +300,7 @@ $result_trees{'contents_and_shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -313,7 +317,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'appendix'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -328,7 +332,7 @@ $result_trees{'contents_and_shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -345,7 +349,7 @@ $result_trees{'contents_and_shortcontents'} = {
               'text' => 'appendixsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -395,7 +399,7 @@ $result_trees{'contents_and_shortcontents'} = {
           }
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -479,26 +483,27 @@ $result_sectioning{'contents_and_shortcontents'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
-                                'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.1',
@@ -538,6 +543,7 @@ $result_sectioning{'contents_and_shortcontents'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 2,
@@ -547,12 +553,13 @@ $result_sectioning{'contents_and_shortcontents'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -564,7 +571,7 @@ $result_sectioning{'contents_and_shortcontents'} = {
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -581,12 +588,12 @@ $result_sectioning{'contents_and_shortcontents'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => 'A.1',
diff --git a/tp/t/results/sectioning/contents_at_document_begin.pl 
b/tp/t/results/sectioning/contents_at_document_begin.pl
index 8681af4a37..c5f3f34a16 100644
--- a/tp/t/results/sectioning/contents_at_document_begin.pl
+++ b/tp/t/results/sectioning/contents_at_document_begin.pl
@@ -39,7 +39,7 @@ $result_trees{'contents_at_document_begin'} = {
                       'text' => 'contents_at_document_begin.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'contents_at_document_begin'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'contents_at_document_begin.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
                 'line_nr' => 3,
@@ -96,7 +98,7 @@ $result_trees{'contents_at_document_begin'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -116,7 +118,9 @@ $result_trees{'contents_at_document_begin'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -133,7 +137,7 @@ $result_trees{'contents_at_document_begin'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -148,7 +152,8 @@ $result_trees{'contents_at_document_begin'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -165,7 +170,7 @@ $result_trees{'contents_at_document_begin'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -180,7 +185,7 @@ $result_trees{'contents_at_document_begin'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -240,14 +245,16 @@ $result_sectioning{'contents_at_document_begin'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -276,17 +283,20 @@ $result_nodes{'contents_at_document_begin'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'contents_at_document_begin'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'contents_at_document_begin'} = [];
diff --git a/tp/t/results/sectioning/contents_at_end_document.pl 
b/tp/t/results/sectioning/contents_at_end_document.pl
index 3e836ba154..7c6f41b238 100644
--- a/tp/t/results/sectioning/contents_at_end_document.pl
+++ b/tp/t/results/sectioning/contents_at_end_document.pl
@@ -39,7 +39,7 @@ $result_trees{'contents_at_end_document'} = {
                       'text' => 'contents_at_end_document.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'contents_at_end_document'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'contents_at_end_document.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'contents_at_end_document.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'contents_at_end_document'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'contents_at_end_document'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'contents_at_end_document'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -128,7 +132,8 @@ $result_trees{'contents_at_end_document'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -145,7 +150,7 @@ $result_trees{'contents_at_end_document'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -180,7 +185,7 @@ $result_trees{'contents_at_end_document'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -240,14 +245,16 @@ $result_sectioning{'contents_at_end_document'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -276,17 +283,20 @@ $result_nodes{'contents_at_end_document'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'contents_at_end_document'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'contents_at_end_document'} = [];
diff --git a/tp/t/results/sectioning/contents_at_end_document_after_node.pl 
b/tp/t/results/sectioning/contents_at_end_document_after_node.pl
index 77e832b2bb..fc7e76fcc9 100644
--- a/tp/t/results/sectioning/contents_at_end_document_after_node.pl
+++ b/tp/t/results/sectioning/contents_at_end_document_after_node.pl
@@ -39,7 +39,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
                       'text' => 'contents_at_end_document_after_node.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'contents_at_end_document_after_node'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'contents_at_end_document_after_node.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'contents_at_end_document_after_node.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'contents_at_end_document_after_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +134,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -196,7 +200,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -205,9 +209,11 @@ $result_trees{'contents_at_end_document_after_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'contents_at_end_document_after_node.texi',
                 'line_nr' => 10,
@@ -227,7 +233,8 @@ $result_trees{'contents_at_end_document_after_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -244,7 +251,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -259,7 +266,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -290,7 +297,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -345,7 +352,9 @@ $result_trees{'contents_at_end_document_after_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'a-node',
+        'normalized' => 'a-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -420,14 +429,16 @@ $result_sectioning{'contents_at_end_document_after_node'} 
= {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -456,6 +467,7 @@ $result_nodes{'contents_at_end_document_after_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -465,12 +477,14 @@ $result_nodes{'contents_at_end_document_after_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'a-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -488,12 +502,14 @@ $result_menus{'contents_at_end_document_after_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'a-node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/contents_in_document.pl 
b/tp/t/results/sectioning/contents_in_document.pl
index 337d238f30..2fc7e1fda8 100644
--- a/tp/t/results/sectioning/contents_in_document.pl
+++ b/tp/t/results/sectioning/contents_in_document.pl
@@ -39,7 +39,7 @@ $result_trees{'contents_in_document'} = {
                       'text' => 'contents_in_document.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'contents_in_document'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'contents_in_document.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'contents_in_document.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'contents_in_document'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -96,7 +98,9 @@ $result_trees{'contents_in_document'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -113,7 +117,7 @@ $result_trees{'contents_in_document'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -148,7 +152,8 @@ $result_trees{'contents_in_document'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -165,7 +170,7 @@ $result_trees{'contents_in_document'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -180,7 +185,7 @@ $result_trees{'contents_in_document'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -240,14 +245,16 @@ $result_sectioning{'contents_in_document'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -276,17 +283,20 @@ $result_nodes{'contents_in_document'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'contents_in_document'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'contents_in_document'} = [];
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index e8fec038ac..1fc45ecce0 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -18,7 +18,7 @@ $result_trees{'contents_in_html_text'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -33,7 +33,7 @@ $result_trees{'contents_in_html_text'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +50,7 @@ $result_trees{'contents_in_html_text'} = {
               'text' => 'Chap1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -65,7 +65,7 @@ $result_trees{'contents_in_html_text'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -82,7 +82,7 @@ $result_trees{'contents_in_html_text'} = {
               'text' => 'Sec 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -97,7 +97,7 @@ $result_trees{'contents_in_html_text'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -114,7 +114,7 @@ $result_trees{'contents_in_html_text'} = {
               'text' => 'Chap2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -159,7 +159,7 @@ $result_trees{'contents_in_html_text'} = {
           }
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -204,17 +204,17 @@ $result_sectioning{'contents_in_html_text'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -231,7 +231,7 @@ $result_sectioning{'contents_in_html_text'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
diff --git a/tp/t/results/sectioning/contents_no_section.pl 
b/tp/t/results/sectioning/contents_no_section.pl
index 973ba2bf7a..2f545da5d5 100644
--- a/tp/t/results/sectioning/contents_no_section.pl
+++ b/tp/t/results/sectioning/contents_no_section.pl
@@ -39,7 +39,7 @@ $result_trees{'contents_no_section'} = {
                       'text' => 'contents_no_section.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -48,9 +48,11 @@ $result_trees{'contents_no_section'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'contents_no_section.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'contents_no_section.texi',
                 'line_nr' => 3,
@@ -76,7 +78,7 @@ $result_trees{'contents_no_section'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -123,7 +125,9 @@ $result_trees{'contents_no_section'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -169,14 +173,16 @@ $result_nodes{'contents_no_section'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'contents_no_section'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'contents_no_section'} = [];
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 e83a28a49b..d45dc12e9a 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -34,7 +34,7 @@ $result_trees{'contents_with_only_top_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +76,9 @@ $result_trees{'contents_with_only_top_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -105,14 +107,16 @@ $result_nodes{'contents_with_only_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'contents_with_only_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'contents_with_only_top_node'} = [];
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 8d2e649d83..1dec2054aa 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -18,7 +18,7 @@ $result_trees{'double_node_anchor_float'} = {
               'text' => 'node1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'double_node_anchor_float'} = {
             'normalized' => 'node1'
           }
         ],
-        'normalized' => 'node1',
+        'normalized' => 'node1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'double_node_anchor_float'} = {
               'text' => 'node1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -148,7 +150,9 @@ $result_trees{'double_node_anchor_float'} = {
             ],
             'normalized' => 'node1'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -165,7 +169,7 @@ $result_trees{'double_node_anchor_float'} = {
               'text' => 'anchor1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -195,7 +199,7 @@ $result_trees{'double_node_anchor_float'} = {
                   'text' => 'node1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -213,7 +217,7 @@ $result_trees{'double_node_anchor_float'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -222,9 +226,11 @@ $result_trees{'double_node_anchor_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -233,7 +239,6 @@ $result_trees{'double_node_anchor_float'} = {
             }
           ],
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -241,6 +246,9 @@ $result_trees{'double_node_anchor_float'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 11,
@@ -268,7 +276,7 @@ $result_trees{'double_node_anchor_float'} = {
                   'text' => 'anchor1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -286,7 +294,7 @@ $result_trees{'double_node_anchor_float'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -295,9 +303,11 @@ $result_trees{'double_node_anchor_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -306,7 +316,6 @@ $result_trees{'double_node_anchor_float'} = {
             }
           ],
           'extra' => {
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -314,6 +323,9 @@ $result_trees{'double_node_anchor_float'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 14,
@@ -341,7 +353,7 @@ $result_trees{'double_node_anchor_float'} = {
                   'text' => 'float1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -359,7 +371,7 @@ $result_trees{'double_node_anchor_float'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -368,9 +380,11 @@ $result_trees{'double_node_anchor_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -383,7 +397,6 @@ $result_trees{'double_node_anchor_float'} = {
               {}
             ],
             'normalized' => 'float1',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -391,6 +404,9 @@ $result_trees{'double_node_anchor_float'} = {
               'normalized' => 'Text'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 17,
@@ -411,7 +427,9 @@ $result_trees{'double_node_anchor_float'} = {
             ],
             'normalized' => 'anchor1'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -428,7 +446,7 @@ $result_trees{'double_node_anchor_float'} = {
               'text' => 'float1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -444,7 +462,9 @@ $result_trees{'double_node_anchor_float'} = {
             ],
             'normalized' => 'float1'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -507,14 +527,16 @@ $result_nodes{'double_node_anchor_float'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'node1'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'double_node_anchor_float'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'node1'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'double_node_anchor_float'} = [
@@ -642,7 +664,8 @@ $result_floats{'double_node_anchor_float'} = {
           ],
           'normalized' => 'Text'
         }
-      }
+      },
+      'info' => {}
     },
     {
       'cmdname' => 'float',
@@ -655,7 +678,8 @@ $result_floats{'double_node_anchor_float'} = {
           ],
           'normalized' => 'Text'
         }
-      }
+      },
+      'info' => {}
     },
     {
       'cmdname' => 'float',
@@ -670,6 +694,7 @@ $result_floats{'double_node_anchor_float'} = {
           'normalized' => 'Text'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index 9958861793..19fcc04f5d 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -25,7 +25,7 @@ $result_trees{'double_part'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -45,7 +45,9 @@ $result_trees{'double_part'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'double_part'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -79,7 +81,7 @@ $result_trees{'double_part'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -145,7 +147,7 @@ $result_trees{'double_part'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -154,9 +156,11 @@ $result_trees{'double_part'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -176,7 +180,8 @@ $result_trees{'double_part'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -202,7 +207,7 @@ $result_trees{'double_part'} = [
                 'text' => 'part first'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -226,7 +231,8 @@ $result_trees{'double_part'} = [
             'type' => 'paragraph'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -252,7 +258,7 @@ $result_trees{'double_part'} = [
                 'text' => 'part second'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -276,7 +282,8 @@ $result_trees{'double_part'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -293,7 +300,7 @@ $result_trees{'double_part'} = [
                 'text' => 'node chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -313,7 +320,9 @@ $result_trees{'double_part'} = [
               'normalized' => 'node-chapter'
             }
           ],
-          'normalized' => 'node-chapter',
+          'normalized' => 'node-chapter'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -330,7 +339,7 @@ $result_trees{'double_part'} = [
                 'text' => 'chapter after 2 parts'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -346,7 +355,9 @@ $result_trees{'double_part'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -425,6 +436,7 @@ $result_sectioning{'double_part'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -444,6 +456,7 @@ $result_sectioning{'double_part'} = {
                               'extra' => {
                                 'normalized' => 'node-chapter'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
@@ -454,6 +467,7 @@ $result_sectioning{'double_part'} = {
                                 'part_associated_section' => {},
                                 'part_following_node' => {}
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'section_childs' => [
@@ -463,6 +477,7 @@ $result_sectioning{'double_part'} = {
                                 'section_prev' => {
                                   'cmdname' => 'part',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {
                                     'associated_unit' => {
                                       'extra' => {
@@ -492,6 +507,7 @@ $result_sectioning{'double_part'} = {
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -528,6 +544,7 @@ $result_sectioning{'double_part'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -589,6 +606,7 @@ $result_nodes{'double_part'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -606,11 +624,13 @@ $result_nodes{'double_part'} = {
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -625,6 +645,7 @@ $result_nodes{'double_part'} = {
                         'unit_command' => {
                           'cmdname' => 'part',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -673,6 +694,7 @@ $result_nodes{'double_part'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -682,6 +704,7 @@ $result_nodes{'double_part'} = {
         'node_preceding_part' => {},
         'normalized' => 'node-chapter'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_prev' => {},
@@ -731,6 +754,7 @@ $result_menus{'double_part'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -738,6 +762,7 @@ $result_menus{'double_part'} = {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -754,11 +779,13 @@ $result_menus{'double_part'} = {
                   'associated_part' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
                   }
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -773,6 +800,7 @@ $result_menus{'double_part'} = {
                     'unit_command' => {
                       'cmdname' => 'part',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {}
                       }
@@ -817,6 +845,7 @@ $result_menus{'double_part'} = {
       'extra' => {
         'normalized' => 'node-chapter'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_up' => {},
@@ -898,6 +927,7 @@ $result_elements{'double_part'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -914,11 +944,13 @@ $result_elements{'double_part'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -933,6 +965,7 @@ $result_elements{'double_part'} = [
                   'unit_command' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
diff --git a/tp/t/results/sectioning/double_top.pl 
b/tp/t/results/sectioning/double_top.pl
index a8c433fbc6..3d3e87067d 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -26,7 +26,7 @@ $result_trees{'double_top'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -60,7 +60,9 @@ $result_trees{'double_top'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -96,7 +98,7 @@ $result_trees{'double_top'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -160,7 +162,9 @@ $result_trees{'double_top'} = {
             ],
             'normalized' => 'Top'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -197,6 +201,7 @@ $result_nodes{'double_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {}
   }
@@ -208,6 +213,7 @@ $result_menus{'double_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/double_top_in_menu.pl 
b/tp/t/results/sectioning/double_top_in_menu.pl
index 8a270e2425..6a20c5c2d2 100644
--- a/tp/t/results/sectioning/double_top_in_menu.pl
+++ b/tp/t/results/sectioning/double_top_in_menu.pl
@@ -26,7 +26,7 @@ $result_trees{'double_top_in_menu'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -53,7 +53,7 @@ $result_trees{'double_top_in_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -168,7 +168,7 @@ $result_trees{'double_top_in_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -177,9 +177,11 @@ $result_trees{'double_top_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -217,7 +219,9 @@ $result_trees{'double_top_in_menu'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -253,7 +257,7 @@ $result_trees{'double_top_in_menu'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -293,7 +297,9 @@ $result_trees{'double_top_in_menu'} = {
             ],
             'normalized' => 'Top'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -347,6 +353,7 @@ $result_nodes{'double_top_in_menu'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {},
     'node_next' => {}
@@ -360,6 +367,7 @@ $result_menus{'double_top_in_menu'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {},
     'menu_next' => {},
diff --git a/tp/t/results/sectioning/double_top_section.pl 
b/tp/t/results/sectioning/double_top_section.pl
index f1fbfbec80..ca1e689b87 100644
--- a/tp/t/results/sectioning/double_top_section.pl
+++ b/tp/t/results/sectioning/double_top_section.pl
@@ -18,7 +18,7 @@ $result_trees{'double_top_section'} = {
               'text' => 'First top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -47,7 +47,7 @@ $result_trees{'double_top_section'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -64,7 +64,7 @@ $result_trees{'double_top_section'} = {
               'text' => 'Second top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +88,7 @@ $result_trees{'double_top_section'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -127,7 +127,7 @@ $result_sectioning{'double_top_section'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -135,7 +135,7 @@ $result_sectioning{'double_top_section'} = {
       },
       {
         'cmdname' => 'top',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_prev' => {},
diff --git a/tp/t/results/sectioning/email_in_node.pl 
b/tp/t/results/sectioning/email_in_node.pl
index ee13f9ad55..0fb1862234 100644
--- a/tp/t/results/sectioning/email_in_node.pl
+++ b/tp/t/results/sectioning/email_in_node.pl
@@ -22,7 +22,7 @@ $result_trees{'email_in_node'} = {
                       'text' => 'a'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
@@ -47,7 +47,7 @@ $result_trees{'email_in_node'} = {
                       'text' => 'c'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -58,7 +58,7 @@ $result_trees{'email_in_node'} = {
                       'text' => 'd'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -77,7 +77,7 @@ $result_trees{'email_in_node'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -88,7 +88,7 @@ $result_trees{'email_in_node'} = {
                       'text' => 'e'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -102,7 +102,7 @@ $result_trees{'email_in_node'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -130,7 +130,9 @@ $result_trees{'email_in_node'} = {
             'normalized' => 'a-c-'
           }
         ],
-        'normalized' => 'a-c-',
+        'normalized' => 'a-c-'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -163,14 +165,16 @@ $result_nodes{'email_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'a-c-'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'email_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'a-c-'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'email_in_node'} = [];
diff --git a/tp/t/results/sectioning/empty_anchor.pl 
b/tp/t/results/sectioning/empty_anchor.pl
index f1dc5f7920..d683e014b7 100644
--- a/tp/t/results/sectioning/empty_anchor.pl
+++ b/tp/t/results/sectioning/empty_anchor.pl
@@ -31,7 +31,7 @@ $result_trees{'empty_anchor'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => '   '
                   },
                   'type' => 'brace_command_arg'
diff --git a/tp/t/results/sectioning/empty_node.pl 
b/tp/t/results/sectioning/empty_node.pl
index 2621c4348a..780c73a351 100644
--- a/tp/t/results/sectioning/empty_node.pl
+++ b/tp/t/results/sectioning/empty_node.pl
@@ -13,7 +13,7 @@ $result_trees{'empty_node'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -50,7 +50,7 @@ $result_trees{'empty_node'} = {
               'text' => 'next'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -61,7 +61,7 @@ $result_trees{'empty_node'} = {
               'text' => 'prev'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -72,7 +72,7 @@ $result_trees{'empty_node'} = {
               'text' => 'up'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -102,7 +102,9 @@ $result_trees{'empty_node'} = {
             ],
             'normalized' => 'up'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
diff --git a/tp/t/results/sectioning/empty_nodes_with_commands.pl 
b/tp/t/results/sectioning/empty_nodes_with_commands.pl
index 9fc10bb652..4551578de7 100644
--- a/tp/t/results/sectioning/empty_nodes_with_commands.pl
+++ b/tp/t/results/sectioning/empty_nodes_with_commands.pl
@@ -52,7 +52,9 @@ $result_trees{'empty_nodes_with_commands'} = {
       'extra' => {
         'nodes_manuals' => [
           undef
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -82,7 +84,9 @@ $result_trees{'empty_nodes_with_commands'} = {
             ],
             'normalized' => '-'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -99,7 +103,7 @@ $result_trees{'empty_nodes_with_commands'} = {
               'cmdname' => ':'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -115,7 +119,9 @@ $result_trees{'empty_nodes_with_commands'} = {
             ],
             'normalized' => ''
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -147,7 +153,7 @@ $result_trees{'empty_nodes_with_commands'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -163,7 +169,9 @@ $result_trees{'empty_nodes_with_commands'} = {
             ],
             'normalized' => '-'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl 
b/tp/t/results/sectioning/empty_ref_arg.pl
index 5ab25b5531..8ce53b889b 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -18,7 +18,7 @@ $result_trees{'empty_ref_arg'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -50,7 +50,7 @@ $result_trees{'empty_ref_arg'} = {
                       'cmdname' => ' '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -87,7 +87,7 @@ $result_trees{'empty_ref_arg'} = {
                   'type' => 'brace_command_arg'
                 },
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -98,7 +98,7 @@ $result_trees{'empty_ref_arg'} = {
                       'cmdname' => ' '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -140,7 +140,7 @@ $result_trees{'empty_ref_arg'} = {
                       'cmdname' => ' '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -151,7 +151,7 @@ $result_trees{'empty_ref_arg'} = {
                       'cmdname' => ':'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -228,7 +228,9 @@ $result_trees{'empty_ref_arg'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => '
 ',
                     'spaces_before_argument' => ' '
@@ -270,7 +272,9 @@ $result_trees{'empty_ref_arg'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -312,7 +316,9 @@ $result_trees{'empty_ref_arg'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -360,14 +366,16 @@ $result_nodes{'empty_ref_arg'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'empty_ref_arg'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'empty_ref_arg'} = [
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl 
b/tp/t/results/sectioning/empty_top_node_up.pl
index caf8a57fa4..ea0163da6d 100644
--- a/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/tp/t/results/sectioning/empty_top_node_up.pl
@@ -18,7 +18,7 @@ $result_trees{'empty_top_node_up'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'empty_top_node_up'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'empty_top_node_up'} = {
               'text' => 'empty top node up'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'empty_top_node_up'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -138,7 +140,7 @@ $result_trees{'empty_top_node_up'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -147,9 +149,11 @@ $result_trees{'empty_top_node_up'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -169,7 +173,8 @@ $result_trees{'empty_top_node_up'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -186,7 +191,7 @@ $result_trees{'empty_top_node_up'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -206,7 +211,9 @@ $result_trees{'empty_top_node_up'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -254,9 +261,11 @@ $result_sectioning{'empty_top_node_up'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -274,6 +283,7 @@ $result_nodes{'empty_top_node_up'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -283,12 +293,14 @@ $result_nodes{'empty_top_node_up'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -306,12 +318,14 @@ $result_menus{'empty_top_node_up'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index fb0696217e..97098320eb 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -18,7 +18,7 @@ $result_trees{'equivalent_labels'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -101,7 +101,7 @@ $result_trees{'equivalent_labels'} = {
                   'text' => 'floa'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -128,7 +128,7 @@ $result_trees{'equivalent_labels'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -137,9 +137,11 @@ $result_trees{'equivalent_labels'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -152,7 +154,6 @@ $result_trees{'equivalent_labels'} = {
               {}
             ],
             'normalized' => 'floa',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -160,6 +161,9 @@ $result_trees{'equivalent_labels'} = {
               'normalized' => 'truc'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 5,
@@ -174,7 +178,7 @@ $result_trees{'equivalent_labels'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -304,7 +308,7 @@ $result_trees{'equivalent_labels'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -313,9 +317,11 @@ $result_trees{'equivalent_labels'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -342,7 +348,9 @@ $result_trees{'equivalent_labels'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -399,6 +407,7 @@ $result_nodes{'equivalent_labels'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'anchor',
@@ -420,6 +429,7 @@ $result_menus{'equivalent_labels'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'anchor',
@@ -440,6 +450,7 @@ $result_menus{'equivalent_labels'} = {
               'normalized' => 'truc'
             }
           },
+          'info' => {},
           'structure' => {
             'float_number' => 1,
             'menu_prev' => {},
@@ -498,6 +509,7 @@ $result_floats{'equivalent_labels'} = {
           'normalized' => 'truc'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index f3f183627f..20fd0c94aa 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -41,7 +41,7 @@ $result_trees{'equivalent_nodes'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -59,7 +59,7 @@ $result_trees{'equivalent_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -140,7 +140,7 @@ $result_trees{'equivalent_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -149,9 +149,11 @@ $result_trees{'equivalent_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -189,7 +191,9 @@ $result_trees{'equivalent_nodes'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -221,7 +225,7 @@ $result_trees{'equivalent_nodes'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -284,7 +288,9 @@ $result_trees{'equivalent_nodes'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -335,12 +341,14 @@ $result_nodes{'equivalent_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'node_up' => {}
       }
@@ -356,12 +364,14 @@ $result_menus{'equivalent_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index 1e91578667..b95583ef8d 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -19,7 +19,7 @@ $result_trees{'explicit_node_directions'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -40,7 +40,7 @@ $result_trees{'explicit_node_directions'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -155,7 +155,7 @@ $result_trees{'explicit_node_directions'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -164,9 +164,11 @@ $result_trees{'explicit_node_directions'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -198,7 +200,9 @@ $result_trees{'explicit_node_directions'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -231,7 +235,7 @@ $result_trees{'explicit_node_directions'} = [
                 'text' => 'third node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -250,7 +254,7 @@ $result_trees{'explicit_node_directions'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -309,7 +313,9 @@ $result_trees{'explicit_node_directions'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'second-node',
+          'normalized' => 'second-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -353,7 +359,7 @@ $result_trees{'explicit_node_directions'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -386,7 +392,9 @@ $result_trees{'explicit_node_directions'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'third-node',
+          'normalized' => 'third-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -455,6 +463,7 @@ $result_nodes{'explicit_node_directions'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -469,6 +478,7 @@ $result_nodes{'explicit_node_directions'} = {
                 'extra' => {
                   'normalized' => 'second-node'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'node_next' => {
@@ -476,6 +486,7 @@ $result_nodes{'explicit_node_directions'} = {
                     'extra' => {
                       'normalized' => 'third-node'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {
                         'extra' => {
@@ -565,6 +576,7 @@ $result_menus{'explicit_node_directions'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -579,6 +591,7 @@ $result_menus{'explicit_node_directions'} = {
                 'extra' => {
                   'normalized' => 'second-node'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
@@ -586,6 +599,7 @@ $result_menus{'explicit_node_directions'} = {
                     'extra' => {
                       'normalized' => 'third-node'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {
                         'extra' => {
@@ -686,6 +700,7 @@ $result_elements{'explicit_node_directions'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -693,6 +708,7 @@ $result_elements{'explicit_node_directions'} = [
             'extra' => {
               'normalized' => 'second-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -708,6 +724,7 @@ $result_elements{'explicit_node_directions'} = [
                           'extra' => {
                             'normalized' => 'third-node'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'menu_prev' => {},
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index 8286f742a8..7f92c7b9bd 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -18,7 +18,7 @@ $result_trees{'external_node_in_menu'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'external_node_in_menu'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'external_node_in_menu'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'external_node_in_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -248,7 +250,7 @@ $result_trees{'external_node_in_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -257,9 +259,11 @@ $result_trees{'external_node_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -279,7 +283,8 @@ $result_trees{'external_node_in_menu'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -296,7 +301,7 @@ $result_trees{'external_node_in_menu'} = {
               'text' => 'nchapter1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -316,7 +321,9 @@ $result_trees{'external_node_in_menu'} = {
             'normalized' => 'nchapter1'
           }
         ],
-        'normalized' => 'nchapter1',
+        'normalized' => 'nchapter1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -333,7 +340,7 @@ $result_trees{'external_node_in_menu'} = {
               'text' => 'chap1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -348,7 +355,8 @@ $result_trees{'external_node_in_menu'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -365,7 +373,7 @@ $result_trees{'external_node_in_menu'} = {
               'text' => 'nchapter2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -385,7 +393,9 @@ $result_trees{'external_node_in_menu'} = {
             'normalized' => 'nchapter2'
           }
         ],
-        'normalized' => 'nchapter2',
+        'normalized' => 'nchapter2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -402,7 +412,7 @@ $result_trees{'external_node_in_menu'} = {
               'text' => 'chap2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -410,7 +420,8 @@ $result_trees{'external_node_in_menu'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -478,9 +489,11 @@ $result_sectioning{'external_node_in_menu'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -491,9 +504,11 @@ $result_sectioning{'external_node_in_menu'} = {
                   'extra' => {
                     'normalized' => 'nchapter1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -510,9 +525,11 @@ $result_sectioning{'external_node_in_menu'} = {
                   'extra' => {
                     'normalized' => 'nchapter2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -546,6 +563,7 @@ $result_nodes{'external_node_in_menu'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -555,6 +573,7 @@ $result_nodes{'external_node_in_menu'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -562,12 +581,14 @@ $result_nodes{'external_node_in_menu'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'nchapter1'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -575,12 +596,14 @@ $result_nodes{'external_node_in_menu'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'nchapter2'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -604,12 +627,14 @@ $result_menus{'external_node_in_menu'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'nchapter1'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'extra' => {
diff --git a/tp/t/results/sectioning/hole_in_sectioning.pl 
b/tp/t/results/sectioning/hole_in_sectioning.pl
index c61434c305..c4188df906 100644
--- a/tp/t/results/sectioning/hole_in_sectioning.pl
+++ b/tp/t/results/sectioning/hole_in_sectioning.pl
@@ -18,7 +18,7 @@ $result_trees{'hole_in_sectioning'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -33,7 +33,7 @@ $result_trees{'hole_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +50,7 @@ $result_trees{'hole_in_sectioning'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -65,7 +65,7 @@ $result_trees{'hole_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -82,7 +82,7 @@ $result_trees{'hole_in_sectioning'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -97,7 +97,7 @@ $result_trees{'hole_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -114,7 +114,7 @@ $result_trees{'hole_in_sectioning'} = {
               'text' => 'subsubsection with no subsection above'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -129,7 +129,7 @@ $result_trees{'hole_in_sectioning'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -146,7 +146,7 @@ $result_trees{'hole_in_sectioning'} = {
               'text' => 'the subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -154,7 +154,7 @@ $result_trees{'hole_in_sectioning'} = {
         }
       ],
       'cmdname' => 'subsection',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -200,22 +200,22 @@ $result_sectioning{'hole_in_sectioning'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'subsubsection',
-                          'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -224,7 +224,7 @@ $result_sectioning{'hole_in_sectioning'} = {
                         },
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.2',
diff --git a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl 
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
index 6d507a6154..3eb9f24749 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
@@ -24,7 +24,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               "text" => "Top"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -43,7 +43,9 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
             "normalized" => "Top"
           }
         ],
-        "normalized" => "Top",
+        "normalized" => "Top"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -60,7 +62,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               "text" => "top"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -75,7 +77,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
         {
           "args" => [
             {
-              "extra" => {
+              "info" => {
                 "spaces_after_argument" => "\n"
               },
               "type" => "block_line_arg"
@@ -165,7 +167,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
                       "text" => "menu"
                     }
                   ],
-                  "extra" => {
+                  "info" => {
                     "spaces_after_argument" => "\n"
                   },
                   "type" => "line_arg"
@@ -173,9 +175,11 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               ],
               "cmdname" => "end",
               "extra" => {
-                "spaces_before_argument" => " ",
                 "text_arg" => "menu"
               },
+              "info" => {
+                "spaces_before_argument" => " "
+              },
               "source_info" => {
                 "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
                 "line_nr" => 7,
@@ -194,7 +198,8 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -206,7 +211,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
     {
       "args" => [
         {
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => " \r\n"
           },
           "type" => "line_arg"
@@ -232,7 +237,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               "text" => "CARRIAGE RETURN|\r|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -245,7 +250,8 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -257,7 +263,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
     {
       "args" => [
         {
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => " \t\f\n"
           },
           "type" => "line_arg"
@@ -283,7 +289,7 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
               "text" => "CHARACTER TABULATION|\t| FORM FEED|\f|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -296,7 +302,8 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -355,9 +362,11 @@ 
$result_sectioning{'in_menu_only_special_ascii_spaces_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -369,6 +378,7 @@ 
$result_sectioning{'in_menu_only_special_ascii_spaces_node'} = {
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -385,6 +395,7 @@ 
$result_sectioning{'in_menu_only_special_ascii_spaces_node'} = {
                   'extra' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -418,6 +429,7 @@ $result_nodes{'in_menu_only_special_ascii_spaces_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -427,6 +439,7 @@ $result_nodes{'in_menu_only_special_ascii_spaces_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -434,6 +447,7 @@ $result_nodes{'in_menu_only_special_ascii_spaces_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -452,6 +466,7 @@ $result_menus{'in_menu_only_special_ascii_spaces_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl 
b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
index 4e8e4fb659..c764b034bf 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
@@ -33,7 +33,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "Top"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -52,7 +52,9 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
             "normalized" => "Top"
           }
         ],
-        "normalized" => "Top",
+        "normalized" => "Top"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -69,7 +71,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "top"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -84,7 +86,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
         {
           "args" => [
             {
-              "extra" => {
+              "info" => {
                 "spaces_after_argument" => "\n"
               },
               "type" => "block_line_arg"
@@ -366,7 +368,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
                       "text" => "menu"
                     }
                   ],
-                  "extra" => {
+                  "info" => {
                     "spaces_after_argument" => "\n"
                   },
                   "type" => "line_arg"
@@ -374,9 +376,11 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               ],
               "cmdname" => "end",
               "extra" => {
-                "spaces_before_argument" => " ",
                 "text_arg" => "menu"
               },
+              "info" => {
+                "spaces_before_argument" => " "
+              },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
                 "line_nr" => 12,
@@ -399,7 +403,8 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -416,7 +421,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "\x{2000}\x{2001}\x{2002}"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -435,7 +440,9 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
             "normalized" => "_2002_2003_2002"
           }
         ],
-        "normalized" => "_2002_2003_2002",
+        "normalized" => "_2002_2003_2002"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -452,7 +459,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -465,7 +472,8 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -477,7 +485,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
     {
       "args" => [
         {
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => " \t\f\13\n"
           },
           "type" => "line_arg"
@@ -503,7 +511,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -516,7 +524,8 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -528,7 +537,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
     {
       "args" => [
         {
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => " \r\n"
           },
           "type" => "line_arg"
@@ -554,7 +563,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "CARRIAGE RETURN|\r|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -567,7 +576,8 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -584,7 +594,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "\x{85}\x{a0}\x{1680}"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -603,7 +613,9 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
             "normalized" => "_0085_00a0_1680"
           }
         ],
-        "normalized" => "_0085_00a0_1680",
+        "normalized" => "_0085_00a0_1680"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -620,7 +632,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| OGHAM 
SPACE MARK|\x{1680}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -633,7 +645,8 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -650,7 +663,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "\x{180e}\x{2003}"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -669,7 +682,9 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
             "normalized" => "_180e_2003"
           }
         ],
-        "normalized" => "_180e_2003",
+        "normalized" => "_180e_2003"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -686,7 +701,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -699,7 +714,8 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -716,7 +732,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => 
"\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200a}\x{2028}\x{2029}\x{202f}\x{205f}\x{3000}"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -741,7 +757,9 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
             "normalized" => 
"_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000"
           }
         ],
-        "normalized" => 
"_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000",
+        "normalized" => 
"_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -758,7 +776,7 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}| FIGURE SPACE|\x{2007}| PUNCTUATION 
SPACE|\x{2008}| THIN SPACE|\x{2009}| HAIR SPACE|\x{200a}| LINE 
SEPARATOR|\x{2028}| PARAGRAPH SEPARATOR|\x{2029}| NARROW NO-BREAK 
SPACE|\x{202f}| MEDIUM MATHEMATICAL SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -771,7 +789,8 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -893,9 +912,11 @@ $result_sectioning{'in_menu_only_special_spaces_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -906,9 +927,11 @@ $result_sectioning{'in_menu_only_special_spaces_node'} = {
                   'extra' => {
                     'normalized' => '_2002_2003_2002'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -925,6 +948,7 @@ $result_sectioning{'in_menu_only_special_spaces_node'} = {
                   'extra' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -942,6 +966,7 @@ $result_sectioning{'in_menu_only_special_spaces_node'} = {
                   'extra' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -959,9 +984,11 @@ $result_sectioning{'in_menu_only_special_spaces_node'} = {
                   'extra' => {
                     'normalized' => '_0085_00a0_1680'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -979,9 +1006,11 @@ $result_sectioning{'in_menu_only_special_spaces_node'} = {
                   'extra' => {
                     'normalized' => '_180e_2003'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 5,
@@ -999,9 +1028,11 @@ $result_sectioning{'in_menu_only_special_spaces_node'} = {
                   'extra' => {
                     'normalized' => 
'_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 6,
@@ -1051,6 +1082,7 @@ $result_nodes{'in_menu_only_special_spaces_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1060,6 +1092,7 @@ $result_nodes{'in_menu_only_special_spaces_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1067,12 +1100,14 @@ $result_nodes{'in_menu_only_special_spaces_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => '_2002_2003_2002'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1080,6 +1115,7 @@ $result_nodes{'in_menu_only_special_spaces_node'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
@@ -1102,30 +1138,35 @@ $result_menus{'in_menu_only_special_spaces_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_2002_2003_2002'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => '_0085_00a0_1680'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_180e_2003'
               },
+              'info' => {},
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 
'_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_prev' => {},
                     'menu_up' => {},
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl 
b/tp/t/results/sectioning/internal_top_node_up.pl
index dbf2b3198d..0a62da389d 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -19,7 +19,7 @@ $result_trees{'internal_top_node_up'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'internal_top_node_up'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'internal_top_node_up'} = [
                 'text' => 'internal top node up'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'internal_top_node_up'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -139,7 +141,7 @@ $result_trees{'internal_top_node_up'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -148,9 +150,11 @@ $result_trees{'internal_top_node_up'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -170,7 +174,8 @@ $result_trees{'internal_top_node_up'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -195,7 +200,7 @@ $result_trees{'internal_top_node_up'} = [
                 'text' => 'first'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -215,7 +220,9 @@ $result_trees{'internal_top_node_up'} = [
               'normalized' => 'first'
             }
           ],
-          'normalized' => 'first',
+          'normalized' => 'first'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -269,6 +276,7 @@ $result_sectioning{'internal_top_node_up'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -283,6 +291,7 @@ $result_sectioning{'internal_top_node_up'} = {
                           'extra' => {
                             'normalized' => 'first'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -312,6 +321,7 @@ $result_sectioning{'internal_top_node_up'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -344,6 +354,7 @@ $result_nodes{'internal_top_node_up'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -358,6 +369,7 @@ $result_nodes{'internal_top_node_up'} = {
                     'extra' => {
                       'normalized' => 'first'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_prev' => {},
@@ -395,6 +407,7 @@ $result_nodes{'internal_top_node_up'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {},
@@ -425,6 +438,7 @@ $result_menus{'internal_top_node_up'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -439,6 +453,7 @@ $result_menus{'internal_top_node_up'} = {
                 'extra' => {
                   'normalized' => 'first'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_up' => {},
@@ -502,6 +517,7 @@ $result_elements{'internal_top_node_up'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -509,6 +525,7 @@ $result_elements{'internal_top_node_up'} = [
             'extra' => {
               'normalized' => 'first'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index f4e235db61..96615b8eec 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -20,7 +20,7 @@ $result_trees{'lone_Top_node'} = [
                         'text' => 'lone_Top_node.info'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -29,9 +29,11 @@ $result_trees{'lone_Top_node'} = [
                 ],
                 'cmdname' => 'setfilename',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'lone_Top_node.info'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 1,
@@ -57,7 +59,7 @@ $result_trees{'lone_Top_node'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -74,7 +76,7 @@ $result_trees{'lone_Top_node'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -140,7 +142,7 @@ $result_trees{'lone_Top_node'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -149,9 +151,11 @@ $result_trees{'lone_Top_node'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 7,
@@ -183,7 +187,9 @@ $result_trees{'lone_Top_node'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -200,7 +206,7 @@ $result_trees{'lone_Top_node'} = [
                 'text' => 'First'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -220,7 +226,9 @@ $result_trees{'lone_Top_node'} = [
               'normalized' => 'First'
             }
           ],
-          'normalized' => 'First',
+          'normalized' => 'First'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -237,7 +245,7 @@ $result_trees{'lone_Top_node'} = [
                 'text' => 'chap'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -245,7 +253,8 @@ $result_trees{'lone_Top_node'} = [
           }
         ],
         'cmdname' => 'chapter',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -301,6 +310,7 @@ $result_sectioning{'lone_Top_node'} = {
             'extra' => {
               'normalized' => 'First'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -318,6 +328,7 @@ $result_sectioning{'lone_Top_node'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 1,
@@ -346,12 +357,14 @@ $result_nodes{'lone_Top_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'section_number' => 1
@@ -373,6 +386,7 @@ $result_nodes{'lone_Top_node'} = {
         'associated_section' => {},
         'normalized' => 'First'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_prev' => {},
@@ -397,12 +411,14 @@ $result_menus{'lone_Top_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'section_number' => 1
@@ -423,6 +439,7 @@ $result_menus{'lone_Top_node'} = {
       'extra' => {
         'normalized' => 'First'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_up' => {},
@@ -462,6 +479,7 @@ $result_elements{'lone_Top_node'} = [
       'unit_command' => {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_number' => 1
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index bc4d6cd8fd..0c45dc5466 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -19,7 +19,7 @@ $result_trees{'loop_nodes'} = {
                       'text' => 'loop_nodes.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'loop_nodes'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'loop_nodes.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'loop_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,9 @@ $result_trees{'loop_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +97,7 @@ $result_trees{'loop_nodes'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -110,7 +114,7 @@ $result_trees{'loop_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -176,7 +180,7 @@ $result_trees{'loop_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -185,9 +189,11 @@ $result_trees{'loop_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -207,7 +213,8 @@ $result_trees{'loop_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -238,7 +245,7 @@ $result_trees{'loop_nodes'} = {
               'text' => 'node down'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -255,7 +262,7 @@ $result_trees{'loop_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -321,7 +328,7 @@ $result_trees{'loop_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -330,9 +337,11 @@ $result_trees{'loop_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -372,7 +381,9 @@ $result_trees{'loop_nodes'} = {
             'normalized' => 'node-down'
           }
         ],
-        'normalized' => 'node-up',
+        'normalized' => 'node-up'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -403,7 +414,7 @@ $result_trees{'loop_nodes'} = {
               'text' => 'node up'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -420,7 +431,7 @@ $result_trees{'loop_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -486,7 +497,7 @@ $result_trees{'loop_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -495,9 +506,11 @@ $result_trees{'loop_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -537,7 +550,9 @@ $result_trees{'loop_nodes'} = {
             'normalized' => 'node-up'
           }
         ],
-        'normalized' => 'node-middle',
+        'normalized' => 'node-middle'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -554,7 +569,7 @@ $result_trees{'loop_nodes'} = {
               'text' => 'node down'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -574,7 +589,9 @@ $result_trees{'loop_nodes'} = {
             'normalized' => 'node-down'
           }
         ],
-        'normalized' => 'node-down',
+        'normalized' => 'node-down'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -653,9 +670,11 @@ $result_sectioning{'loop_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -673,6 +692,7 @@ $result_nodes{'loop_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -682,6 +702,7 @@ $result_nodes{'loop_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -693,6 +714,7 @@ $result_nodes{'loop_nodes'} = {
         ],
         'normalized' => 'node-up'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -704,12 +726,14 @@ $result_nodes{'loop_nodes'} = {
             ],
             'normalized' => 'node-middle'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'node-down'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -735,24 +759,28 @@ $result_menus{'loop_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node-up'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'node-middle'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'node-down'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/lowered_subsubsection.pl 
b/tp/t/results/sectioning/lowered_subsubsection.pl
index 0d9dafda4d..e6548c6b3e 100644
--- a/tp/t/results/sectioning/lowered_subsubsection.pl
+++ b/tp/t/results/sectioning/lowered_subsubsection.pl
@@ -18,7 +18,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'lowered_subsubsection'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +52,7 @@ $result_trees{'lowered_subsubsection'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -67,7 +69,7 @@ $result_trees{'lowered_subsubsection'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -133,7 +135,7 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -142,9 +144,11 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -179,7 +183,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -199,7 +203,9 @@ $result_trees{'lowered_subsubsection'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -216,7 +222,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -233,7 +239,7 @@ $result_trees{'lowered_subsubsection'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -299,7 +305,7 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -308,9 +314,11 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -330,7 +338,8 @@ $result_trees{'lowered_subsubsection'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -347,7 +356,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -367,7 +376,9 @@ $result_trees{'lowered_subsubsection'} = {
             'normalized' => 'Section'
           }
         ],
-        'normalized' => 'Section',
+        'normalized' => 'Section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -384,7 +395,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -401,7 +412,7 @@ $result_trees{'lowered_subsubsection'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -467,7 +478,7 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -476,9 +487,11 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -498,7 +511,8 @@ $result_trees{'lowered_subsubsection'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -515,7 +529,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -535,7 +549,9 @@ $result_trees{'lowered_subsubsection'} = {
             'normalized' => 'Subsection'
           }
         ],
-        'normalized' => 'Subsection',
+        'normalized' => 'Subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -552,7 +568,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -569,7 +585,7 @@ $result_trees{'lowered_subsubsection'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -684,7 +700,7 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -693,9 +709,11 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -715,7 +733,8 @@ $result_trees{'lowered_subsubsection'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -732,7 +751,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Subsubsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -752,7 +771,9 @@ $result_trees{'lowered_subsubsection'} = {
             'normalized' => 'Subsubsection'
           }
         ],
-        'normalized' => 'Subsubsection',
+        'normalized' => 'Subsubsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -769,7 +790,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Subsubsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -794,7 +815,8 @@ $result_trees{'lowered_subsubsection'} = {
           'cmdname' => 'lowersections'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -811,7 +833,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Lowered subsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -831,7 +853,9 @@ $result_trees{'lowered_subsubsection'} = {
             'normalized' => 'Lowered-subsec'
           }
         ],
-        'normalized' => 'Lowered-subsec',
+        'normalized' => 'Lowered-subsec'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -848,7 +872,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Lowered subsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -865,7 +889,7 @@ $result_trees{'lowered_subsubsection'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -931,7 +955,7 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -940,9 +964,11 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 39,
@@ -963,7 +989,9 @@ $result_trees{'lowered_subsubsection'} = {
         }
       ],
       'extra' => {
-        'sections_level' => -1,
+        'sections_level' => -1
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -980,7 +1008,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Lowered subsubsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1000,7 +1028,9 @@ $result_trees{'lowered_subsubsection'} = {
             'normalized' => 'Lowered-subsubsection'
           }
         ],
-        'normalized' => 'Lowered-subsubsection',
+        'normalized' => 'Lowered-subsubsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1017,7 +1047,7 @@ $result_trees{'lowered_subsubsection'} = {
               'text' => 'Lowered subsubsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1058,7 +1088,9 @@ $result_trees{'lowered_subsubsection'} = {
         }
       ],
       'extra' => {
-        'sections_level' => -1,
+        'sections_level' => -1
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1199,6 +1231,7 @@ $result_sectioning{'lowered_subsubsection'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -1212,9 +1245,11 @@ $result_sectioning{'lowered_subsubsection'} = {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1225,9 +1260,11 @@ $result_sectioning{'lowered_subsubsection'} = {
                         'extra' => {
                           'normalized' => 'Section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1238,9 +1275,11 @@ $result_sectioning{'lowered_subsubsection'} = {
                               'extra' => {
                                 'normalized' => 'Subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
@@ -1251,9 +1290,11 @@ $result_sectioning{'lowered_subsubsection'} = {
                                     'extra' => {
                                       'normalized' => 'Subsubsection'
                                     },
+                                    'info' => {},
                                     'structure' => {}
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.1',
@@ -1268,10 +1309,12 @@ $result_sectioning{'lowered_subsubsection'} = {
                                     'extra' => {
                                       'normalized' => 'Lowered-subsec'
                                     },
+                                    'info' => {},
                                     'structure' => {}
                                   },
                                   'sections_level' => -1
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.2',
@@ -1287,10 +1330,12 @@ $result_sectioning{'lowered_subsubsection'} = {
                                     'extra' => {
                                       'normalized' => 'Lowered-subsubsection'
                                     },
+                                    'info' => {},
                                     'structure' => {}
                                   },
                                   'sections_level' => -1
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.3',
@@ -1354,6 +1399,7 @@ $result_nodes{'lowered_subsubsection'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1361,6 +1407,7 @@ $result_nodes{'lowered_subsubsection'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1372,6 +1419,7 @@ $result_nodes{'lowered_subsubsection'} = {
         ],
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1379,6 +1427,7 @@ $result_nodes{'lowered_subsubsection'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1390,6 +1439,7 @@ $result_nodes{'lowered_subsubsection'} = {
             ],
             'normalized' => 'Section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1397,6 +1447,7 @@ $result_nodes{'lowered_subsubsection'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
@@ -1408,6 +1459,7 @@ $result_nodes{'lowered_subsubsection'} = {
                 ],
                 'normalized' => 'Subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
@@ -1415,12 +1467,14 @@ $result_nodes{'lowered_subsubsection'} = {
                     'associated_section' => {
                       'cmdname' => 'subsubsection',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => '1.1.1.1'
                       }
                     },
                     'normalized' => 'Subsubsection'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -1430,6 +1484,7 @@ $result_nodes{'lowered_subsubsection'} = {
                           'extra' => {
                             'sections_level' => -1
                           },
+                          'info' => {},
                           'structure' => {
                             'section_number' => '1.1.1.2'
                           }
@@ -1441,6 +1496,7 @@ $result_nodes{'lowered_subsubsection'} = {
                         ],
                         'normalized' => 'Lowered-subsec'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
@@ -1450,12 +1506,14 @@ $result_nodes{'lowered_subsubsection'} = {
                               'extra' => {
                                 'sections_level' => -1
                               },
+                              'info' => {},
                               'structure' => {
                                 'section_number' => '1.1.1.3'
                               }
                             },
                             'normalized' => 'Lowered-subsubsection'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_prev' => {},
                             'node_up' => {}
@@ -1499,42 +1557,49 @@ $result_menus{'lowered_subsubsection'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'Subsubsection'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'Lowered-subsec'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'Lowered-subsubsection'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_up' => {},
                             'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/loweredheading.pl 
b/tp/t/results/sectioning/loweredheading.pl
index e32cba1654..48570c6e2a 100644
--- a/tp/t/results/sectioning/loweredheading.pl
+++ b/tp/t/results/sectioning/loweredheading.pl
@@ -30,7 +30,7 @@ $result_trees{'loweredheading'} = {
               'text' => 'Foo'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -47,7 +47,7 @@ $result_trees{'loweredheading'} = {
                   'text' => 'Bar'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -56,7 +56,9 @@ $result_trees{'loweredheading'} = {
           ],
           'cmdname' => 'heading',
           'extra' => {
-            'sections_level' => -1,
+            'sections_level' => -1
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -67,7 +69,9 @@ $result_trees{'loweredheading'} = {
         }
       ],
       'extra' => {
-        'sections_level' => -1,
+        'sections_level' => -1
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -111,6 +115,7 @@ $result_sectioning{'loweredheading'} = {
         'extra' => {
           'sections_level' => -1
         },
+        'info' => {},
         'structure' => {
           'section_level' => 3,
           'section_number' => 1,
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 8178a94aa7..ac7d56261d 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -12,7 +12,7 @@ $result_trees{'menutextorder'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -127,7 +127,7 @@ $result_trees{'menutextorder'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -136,9 +136,11 @@ $result_trees{'menutextorder'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -168,7 +170,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'bar'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -188,7 +190,9 @@ $result_trees{'menutextorder'} = {
             'normalized' => 'bar'
           }
         ],
-        'normalized' => 'bar',
+        'normalized' => 'bar'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -205,7 +209,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'bar'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -222,7 +226,7 @@ $result_trees{'menutextorder'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -288,7 +292,7 @@ $result_trees{'menutextorder'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -297,9 +301,11 @@ $result_trees{'menutextorder'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -319,7 +325,8 @@ $result_trees{'menutextorder'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -336,7 +343,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'onesub1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -356,7 +363,9 @@ $result_trees{'menutextorder'} = {
             'normalized' => 'onesub1'
           }
         ],
-        'normalized' => 'onesub1',
+        'normalized' => 'onesub1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -373,7 +382,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'One sub 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -388,7 +397,8 @@ $result_trees{'menutextorder'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -405,7 +415,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'onesub2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -425,7 +435,9 @@ $result_trees{'menutextorder'} = {
             'normalized' => 'onesub2'
           }
         ],
-        'normalized' => 'onesub2',
+        'normalized' => 'onesub2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -442,7 +454,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'One sub 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -462,7 +474,8 @@ $result_trees{'menutextorder'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -479,7 +492,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'foo'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -499,7 +512,9 @@ $result_trees{'menutextorder'} = {
             'normalized' => 'foo'
           }
         ],
-        'normalized' => 'foo',
+        'normalized' => 'foo'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -516,7 +531,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'foo'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -533,7 +548,7 @@ $result_trees{'menutextorder'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -697,7 +712,7 @@ $result_trees{'menutextorder'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -706,9 +721,11 @@ $result_trees{'menutextorder'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -728,7 +745,8 @@ $result_trees{'menutextorder'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -745,7 +763,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'sub1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -765,7 +783,9 @@ $result_trees{'menutextorder'} = {
             'normalized' => 'sub1'
           }
         ],
-        'normalized' => 'sub1',
+        'normalized' => 'sub1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -782,7 +802,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'Sub1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -797,7 +817,8 @@ $result_trees{'menutextorder'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -814,7 +835,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'sub2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -834,7 +855,9 @@ $result_trees{'menutextorder'} = {
             'normalized' => 'sub2'
           }
         ],
-        'normalized' => 'sub2',
+        'normalized' => 'sub2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -851,7 +874,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'Sub2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -866,7 +889,8 @@ $result_trees{'menutextorder'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -883,7 +907,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'sub3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -903,7 +927,9 @@ $result_trees{'menutextorder'} = {
             'normalized' => 'sub3'
           }
         ],
-        'normalized' => 'sub3',
+        'normalized' => 'sub3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -920,7 +946,7 @@ $result_trees{'menutextorder'} = {
               'text' => 'Sub3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -928,7 +954,8 @@ $result_trees{'menutextorder'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1049,9 +1076,11 @@ $result_sectioning{'menutextorder'} = {
             'extra' => {
               'normalized' => 'bar'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1062,9 +1091,11 @@ $result_sectioning{'menutextorder'} = {
                   'extra' => {
                     'normalized' => 'onesub1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => '1.1',
@@ -1079,9 +1110,11 @@ $result_sectioning{'menutextorder'} = {
                   'extra' => {
                     'normalized' => 'onesub2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => '1.2',
@@ -1103,9 +1136,11 @@ $result_sectioning{'menutextorder'} = {
             'extra' => {
               'normalized' => 'foo'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1116,9 +1151,11 @@ $result_sectioning{'menutextorder'} = {
                   'extra' => {
                     'normalized' => 'sub1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => '2.1',
@@ -1133,9 +1170,11 @@ $result_sectioning{'menutextorder'} = {
                   'extra' => {
                     'normalized' => 'sub2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => '2.2',
@@ -1151,9 +1190,11 @@ $result_sectioning{'menutextorder'} = {
                   'extra' => {
                     'normalized' => 'sub3'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => '2.3',
@@ -1192,6 +1233,7 @@ $result_nodes{'menutextorder'} = {
     'associated_section' => {
       'cmdname' => 'chapter',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'section_number' => 1
       }
@@ -1203,6 +1245,7 @@ $result_nodes{'menutextorder'} = {
     ],
     'normalized' => 'bar'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1210,12 +1253,14 @@ $result_nodes{'menutextorder'} = {
         'associated_section' => {
           'cmdname' => 'section',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => '1.2'
           }
         },
         'normalized' => 'onesub2'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {
           'cmdname' => 'node',
@@ -1223,12 +1268,14 @@ $result_nodes{'menutextorder'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
             },
             'normalized' => 'onesub1'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {},
             'node_up' => {}
@@ -1243,6 +1290,7 @@ $result_nodes{'menutextorder'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 2
           }
@@ -1254,6 +1302,7 @@ $result_nodes{'menutextorder'} = {
         ],
         'normalized' => 'foo'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1261,12 +1310,14 @@ $result_nodes{'menutextorder'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '2.1'
               }
             },
             'normalized' => 'sub1'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -1274,12 +1325,14 @@ $result_nodes{'menutextorder'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '2.2'
                   }
                 },
                 'normalized' => 'sub2'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
@@ -1287,12 +1340,14 @@ $result_nodes{'menutextorder'} = {
                     'associated_section' => {
                       'cmdname' => 'section',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => '2.3'
                       }
                     },
                     'normalized' => 'sub3'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {},
                     'node_prev' => {},
@@ -1327,12 +1382,14 @@ $result_menus{'menutextorder'} = {
   'extra' => {
     'normalized' => 'bar'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'onesub2'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/more_sections_than_nodes.pl 
b/tp/t/results/sectioning/more_sections_than_nodes.pl
index f9b315b1e2..4a0e905170 100644
--- a/tp/t/results/sectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/sectioning/more_sections_than_nodes.pl
@@ -18,7 +18,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'more_sections_than_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'more_sections_than_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -236,7 +238,7 @@ $result_trees{'more_sections_than_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -245,9 +247,11 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -267,7 +271,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -284,7 +289,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -299,7 +304,7 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -316,7 +321,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'n c2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -336,7 +341,9 @@ $result_trees{'more_sections_than_nodes'} = {
             'normalized' => 'n-c2'
           }
         ],
-        'normalized' => 'n-c2',
+        'normalized' => 'n-c2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -353,7 +360,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -368,7 +375,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -385,7 +393,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 's1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -400,7 +408,7 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -425,7 +433,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'n c3 s1 s2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -436,7 +444,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'n c2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -447,7 +455,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -486,7 +494,9 @@ $result_trees{'more_sections_than_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'n-c3',
+        'normalized' => 'n-c3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -503,7 +513,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -520,7 +530,7 @@ $result_trees{'more_sections_than_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -586,7 +596,7 @@ $result_trees{'more_sections_than_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -595,9 +605,11 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -617,7 +629,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -634,7 +647,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'C3 s1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -649,7 +662,7 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -666,7 +679,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'n c3 s 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -686,7 +699,9 @@ $result_trees{'more_sections_than_nodes'} = {
             'normalized' => 'n-c3-s-2'
           }
         ],
-        'normalized' => 'n-c3-s-2',
+        'normalized' => 'n-c3-s-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -703,7 +718,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3 s2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -718,7 +733,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -735,7 +751,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3 s3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -750,7 +766,7 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -767,7 +783,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -782,7 +798,7 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -799,7 +815,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3 s1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -814,7 +830,7 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -831,7 +847,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3 s1 s1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -846,7 +862,7 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -882,7 +898,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -915,7 +931,9 @@ $result_trees{'more_sections_than_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'n-c3-s1-s2',
+        'normalized' => 'n-c3-s1-s2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -932,7 +950,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'c3 s1 s2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -947,7 +965,8 @@ $result_trees{'more_sections_than_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -964,7 +983,7 @@ $result_trees{'more_sections_than_nodes'} = {
               'text' => 'appendix'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -972,7 +991,7 @@ $result_trees{'more_sections_than_nodes'} = {
         }
       ],
       'cmdname' => 'appendix',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1108,14 +1127,16 @@ $result_sectioning{'more_sections_than_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1132,14 +1153,16 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   'extra' => {
                     'normalized' => 'n-c2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '2.1',
@@ -1163,14 +1186,16 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   'extra' => {
                     'normalized' => 'n-c3'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '3.1',
@@ -1185,9 +1210,11 @@ $result_sectioning{'more_sections_than_nodes'} = {
                         'extra' => {
                           'normalized' => 'n-c3-s-2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '3.2',
@@ -1197,7 +1224,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '3.3',
@@ -1216,17 +1243,17 @@ $result_sectioning{'more_sections_than_nodes'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '4.1.1',
@@ -1241,9 +1268,11 @@ $result_sectioning{'more_sections_than_nodes'} = {
                               'extra' => {
                                 'normalized' => 'n-c3-s1-s2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '4.1.2',
@@ -1268,7 +1297,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
             },
             {
               'cmdname' => 'appendix',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 'A',
@@ -1324,6 +1353,7 @@ $result_nodes{'more_sections_than_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1333,6 +1363,7 @@ $result_nodes{'more_sections_than_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1340,12 +1371,14 @@ $result_nodes{'more_sections_than_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 2
           }
         },
         'normalized' => 'n-c2'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -1353,6 +1386,7 @@ $result_nodes{'more_sections_than_nodes'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 3
               }
@@ -1364,6 +1398,7 @@ $result_nodes{'more_sections_than_nodes'} = {
             ],
             'normalized' => 'n-c3'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1371,12 +1406,14 @@ $result_nodes{'more_sections_than_nodes'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '3.2'
                   }
                 },
                 'normalized' => 'n-c3-s-2'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -1387,12 +1424,14 @@ $result_nodes{'more_sections_than_nodes'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '4.1.2'
                   }
                 },
                 'normalized' => 'n-c3-s1-s2'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -1423,24 +1462,28 @@ $result_menus{'more_sections_than_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'n-c2'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'n-c3'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'n-c3-s-2'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
@@ -1453,6 +1496,7 @@ $result_menus{'more_sections_than_nodes'} = {
               'extra' => {
                 'normalized' => 'n-c3-s1-s2'
               },
+              'info' => {},
               'structure' => {
                 'menu_prev' => {},
                 'menu_up' => {},
diff --git a/tp/t/results/sectioning/next_in_menu_is_below.pl 
b/tp/t/results/sectioning/next_in_menu_is_below.pl
index fc513a072a..97dbc37cbb 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -18,7 +18,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'next_in_menu_is_below'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'next_in_menu_is_below'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -138,7 +140,7 @@ $result_trees{'next_in_menu_is_below'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -147,9 +149,11 @@ $result_trees{'next_in_menu_is_below'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -169,7 +173,8 @@ $result_trees{'next_in_menu_is_below'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -186,7 +191,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -206,7 +211,9 @@ $result_trees{'next_in_menu_is_below'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -223,7 +230,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -240,7 +247,7 @@ $result_trees{'next_in_menu_is_below'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -355,7 +362,7 @@ $result_trees{'next_in_menu_is_below'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -364,9 +371,11 @@ $result_trees{'next_in_menu_is_below'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -386,7 +395,8 @@ $result_trees{'next_in_menu_is_below'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -403,7 +413,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -423,7 +433,9 @@ $result_trees{'next_in_menu_is_below'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -440,7 +452,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -457,7 +469,7 @@ $result_trees{'next_in_menu_is_below'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -523,7 +535,7 @@ $result_trees{'next_in_menu_is_below'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -532,9 +544,11 @@ $result_trees{'next_in_menu_is_below'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -554,7 +568,8 @@ $result_trees{'next_in_menu_is_below'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -571,7 +586,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -591,7 +606,9 @@ $result_trees{'next_in_menu_is_below'} = {
             'normalized' => 'subsection'
           }
         ],
-        'normalized' => 'subsection',
+        'normalized' => 'subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -608,7 +625,7 @@ $result_trees{'next_in_menu_is_below'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -616,7 +633,8 @@ $result_trees{'next_in_menu_is_below'} = {
         }
       ],
       'cmdname' => 'subsection',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -703,9 +721,11 @@ $result_sectioning{'next_in_menu_is_below'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -716,9 +736,11 @@ $result_sectioning{'next_in_menu_is_below'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -729,9 +751,11 @@ $result_sectioning{'next_in_menu_is_below'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -742,9 +766,11 @@ $result_sectioning{'next_in_menu_is_below'} = {
                               'extra' => {
                                 'normalized' => 'subsection'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '1.1.1',
@@ -787,6 +813,7 @@ $result_nodes{'next_in_menu_is_below'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -796,6 +823,7 @@ $result_nodes{'next_in_menu_is_below'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -803,6 +831,7 @@ $result_nodes{'next_in_menu_is_below'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -814,6 +843,7 @@ $result_nodes{'next_in_menu_is_below'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -821,6 +851,7 @@ $result_nodes{'next_in_menu_is_below'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -832,6 +863,7 @@ $result_nodes{'next_in_menu_is_below'} = {
             ],
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -839,12 +871,14 @@ $result_nodes{'next_in_menu_is_below'} = {
                 'associated_section' => {
                   'cmdname' => 'subsection',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -874,24 +908,28 @@ $result_menus{'next_in_menu_is_below'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'subsection'
               },
+              'info' => {},
               'structure' => {
                 'menu_prev' => {},
                 'menu_up' => {},
diff --git a/tp/t/results/sectioning/next_no_prev_to_node.pl 
b/tp/t/results/sectioning/next_no_prev_to_node.pl
index 15be17ac5b..d8d0049935 100644
--- a/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -18,7 +18,7 @@ $result_trees{'next_no_prev_to_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'next_no_prev_to_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -150,7 +150,7 @@ $result_trees{'next_no_prev_to_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -159,9 +159,11 @@ $result_trees{'next_no_prev_to_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -193,7 +195,9 @@ $result_trees{'next_no_prev_to_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -218,7 +222,7 @@ $result_trees{'next_no_prev_to_node'} = {
               'text' => 'no return'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -232,7 +236,7 @@ $result_trees{'next_no_prev_to_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -273,7 +277,9 @@ $result_trees{'next_no_prev_to_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'first-node',
+        'normalized' => 'first-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -304,7 +310,7 @@ $result_trees{'next_no_prev_to_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 ',
             'spaces_before_argument' => ' '
@@ -333,7 +339,9 @@ $result_trees{'next_no_prev_to_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'no-return',
+        'normalized' => 'no-return'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -389,18 +397,21 @@ $result_nodes{'next_no_prev_to_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first-node'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'no-return'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -422,18 +433,21 @@ $result_menus{'next_no_prev_to_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first-node'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'no-return'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index 5dc6b2873c..b41b4450cd 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -45,7 +45,7 @@ $result_trees{'no_argument_and_contents'} = {
               'text' => 'for example'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -60,7 +60,8 @@ $result_trees{'no_argument_and_contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -87,7 +88,7 @@ $result_trees{'no_argument_and_contents'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -102,7 +103,7 @@ $result_trees{'no_argument_and_contents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -139,11 +140,12 @@ $result_sectioning{'no_argument_and_contents'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
diff --git a/tp/t/results/sectioning/no_element.pl 
b/tp/t/results/sectioning/no_element.pl
index 8c19c5192d..c6e7b454fa 100644
--- a/tp/t/results/sectioning/no_element.pl
+++ b/tp/t/results/sectioning/no_element.pl
@@ -17,7 +17,7 @@ $result_trees{'no_element'} = {
                   'text' => 'no_element test'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -25,7 +25,8 @@ $result_trees{'no_element'} = {
             }
           ],
           'cmdname' => 'settitle',
-          'extra' => {
+          'extra' => {},
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -42,7 +43,7 @@ $result_trees{'no_element'} = {
                   'text' => 'ISO-8859-1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -53,9 +54,11 @@ $result_trees{'no_element'} = {
           'extra' => {
             'input_encoding_name' => 'iso-8859-1',
             'input_perl_encoding' => 'iso-8859-1',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ISO-8859-1'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
@@ -324,7 +327,7 @@ $result_trees{'no_element'} = {
                   'text' => 'float anchor'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -351,7 +354,7 @@ $result_trees{'no_element'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -360,9 +363,11 @@ $result_trees{'no_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -375,11 +380,13 @@ $result_trees{'no_element'} = {
               {}
             ],
             'normalized' => 'float-anchor',
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 21,
@@ -439,7 +446,7 @@ $result_trees{'no_element'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -505,7 +512,7 @@ $result_trees{'no_element'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -514,9 +521,11 @@ $result_trees{'no_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -543,7 +552,7 @@ $result_trees{'no_element'} = {
                   'text' => 'index entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -562,7 +571,9 @@ $result_trees{'no_element'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -674,6 +685,7 @@ $result_floats{'no_element'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index 01210b0ba7..5e3799eaf4 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -18,7 +18,7 @@ $result_trees{'no_menu'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'no_menu'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +52,7 @@ $result_trees{'no_menu'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -80,7 +82,7 @@ $result_trees{'no_menu'} = {
               'text' => 'c1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -100,7 +102,9 @@ $result_trees{'no_menu'} = {
             'normalized' => 'c1'
           }
         ],
-        'normalized' => 'c1',
+        'normalized' => 'c1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -117,7 +121,7 @@ $result_trees{'no_menu'} = {
               'text' => 'c1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -132,7 +136,8 @@ $result_trees{'no_menu'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -149,7 +154,7 @@ $result_trees{'no_menu'} = {
               'text' => 'c2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -169,7 +174,9 @@ $result_trees{'no_menu'} = {
             'normalized' => 'c2'
           }
         ],
-        'normalized' => 'c2',
+        'normalized' => 'c2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -186,7 +193,7 @@ $result_trees{'no_menu'} = {
               'text' => 'c2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -201,7 +208,8 @@ $result_trees{'no_menu'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -218,7 +226,7 @@ $result_trees{'no_menu'} = {
               'text' => 'c3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -238,7 +246,9 @@ $result_trees{'no_menu'} = {
             'normalized' => 'c3'
           }
         ],
-        'normalized' => 'c3',
+        'normalized' => 'c3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -255,7 +265,7 @@ $result_trees{'no_menu'} = {
               'text' => 'c3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -263,7 +273,8 @@ $result_trees{'no_menu'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -320,6 +331,7 @@ $result_sectioning{'no_menu'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -333,9 +345,11 @@ $result_sectioning{'no_menu'} = {
                   'extra' => {
                     'normalized' => 'c1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -352,9 +366,11 @@ $result_sectioning{'no_menu'} = {
                   'extra' => {
                     'normalized' => 'c2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -372,9 +388,11 @@ $result_sectioning{'no_menu'} = {
                   'extra' => {
                     'normalized' => 'c3'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -416,6 +434,7 @@ $result_nodes{'no_menu'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -423,12 +442,14 @@ $result_nodes{'no_menu'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'c1'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -436,12 +457,14 @@ $result_nodes{'no_menu'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'c2'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -449,12 +472,14 @@ $result_nodes{'no_menu'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => 'c3'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -482,6 +507,7 @@ $result_menus{'no_menu'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/node.pl b/tp/t/results/sectioning/node.pl
index 48b546a928..c46658264b 100644
--- a/tp/t/results/sectioning/node.pl
+++ b/tp/t/results/sectioning/node.pl
@@ -34,7 +34,9 @@ $result_trees{'node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -58,14 +60,16 @@ $result_nodes{'node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'node'} = [];
diff --git a/tp/t/results/sectioning/node_empty_direction.pl 
b/tp/t/results/sectioning/node_empty_direction.pl
index 633c0e4b57..8919a36239 100644
--- a/tp/t/results/sectioning/node_empty_direction.pl
+++ b/tp/t/results/sectioning/node_empty_direction.pl
@@ -21,7 +21,7 @@ $result_trees{'node_empty_direction'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' '
           },
           'type' => 'line_arg'
@@ -41,7 +41,9 @@ $result_trees{'node_empty_direction'} = {
           },
           undef
         ],
-        'normalized' => 'name',
+        'normalized' => 'name'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -65,14 +67,16 @@ $result_nodes{'node_empty_direction'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'name'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'node_empty_direction'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'name'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'node_empty_direction'} = [];
diff --git a/tp/t/results/sectioning/node_line_arguments.pl 
b/tp/t/results/sectioning/node_line_arguments.pl
index aee2e0d99a..915c7cd35c 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -25,7 +25,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'one arg1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'node_line_arguments'} = {
             'normalized' => 'one-arg1'
           }
         ],
-        'normalized' => 'one-arg1',
+        'normalized' => 'one-arg1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -70,7 +72,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'two arg'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -97,7 +99,9 @@ $result_trees{'node_line_arguments'} = {
             'normalized' => 'two-arg'
           }
         ],
-        'normalized' => 'one-arg2',
+        'normalized' => 'one-arg2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -122,7 +126,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'two arg'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -133,7 +137,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'three arg'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -166,7 +170,9 @@ $result_trees{'node_line_arguments'} = {
             'normalized' => 'three-arg'
           }
         ],
-        'normalized' => 'one-arg3',
+        'normalized' => 'one-arg3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -191,7 +197,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'two arg'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -202,7 +208,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'three arg'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -213,7 +219,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'four arg'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -252,7 +258,9 @@ $result_trees{'node_line_arguments'} = {
             'normalized' => 'four-arg'
           }
         ],
-        'normalized' => 'one-arg4',
+        'normalized' => 'one-arg4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -277,7 +285,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'two arg'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -288,7 +296,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'three arg'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -299,7 +307,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'four arg five arg'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -345,7 +353,9 @@ $result_trees{'node_line_arguments'} = {
             'normalized' => 'four-arg-five-arg'
           }
         ],
-        'normalized' => 'one-arg5',
+        'normalized' => 'one-arg5'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -378,7 +388,9 @@ $result_trees{'node_line_arguments'} = {
 '
                 ]
               }
-            },
+            }
+          },
+          'info' => {
             'spaces_after_argument' => ' '
           },
           'type' => 'line_arg'
@@ -404,7 +416,9 @@ $result_trees{'node_line_arguments'} = {
             'normalized' => 'comment'
           }
         ],
-        'normalized' => 'comment',
+        'normalized' => 'comment'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -463,7 +477,7 @@ $result_trees{'node_line_arguments'} = {
               'text' => 'edilla'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -505,7 +519,9 @@ $result_trees{'node_line_arguments'} = {
 '
                 ]
               }
-            },
+            }
+          },
+          'info' => {
             'spaces_after_argument' => ' ',
             'spaces_before_argument' => ' '
           },
@@ -542,7 +558,9 @@ $result_trees{'node_line_arguments'} = {
             'normalized' => 'comma-in-strong_002c'
           }
         ],
-        'normalized' => 'arg1-_002c-arg2',
+        'normalized' => 'arg1-_002c-arg2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -607,14 +625,16 @@ $result_nodes{'node_line_arguments'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'one-arg1'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'node_line_arguments'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'one-arg1'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'node_line_arguments'} = [
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index a51c1b58ff..c463ffb026 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -18,7 +18,7 @@ $result_trees{'node_nested_parentheses'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'node_nested_parentheses'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -318,7 +318,7 @@ $result_trees{'node_nested_parentheses'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -327,9 +327,11 @@ $result_trees{'node_nested_parentheses'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -356,7 +358,9 @@ $result_trees{'node_nested_parentheses'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -411,6 +415,7 @@ $result_nodes{'node_nested_parentheses'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
@@ -431,6 +436,7 @@ $result_menus{'node_nested_parentheses'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'extra' => {
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 f3040189c7..34f33bf905 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -19,7 +19,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'node_part_chapter_after_chapter'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -188,7 +190,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -197,9 +199,11 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 7,
@@ -219,7 +223,8 @@ $result_trees{'node_part_chapter_after_chapter'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -244,7 +249,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 'text' => 'chapter node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -271,7 +276,9 @@ $result_trees{'node_part_chapter_after_chapter'} = [
               'normalized' => 'chapter-node'
             }
           ],
-          'normalized' => 'chapter-node',
+          'normalized' => 'chapter-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -288,7 +295,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 'text' => 'chapter node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -303,7 +310,8 @@ $result_trees{'node_part_chapter_after_chapter'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -328,7 +336,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 'text' => 'part chapter node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -348,7 +356,9 @@ $result_trees{'node_part_chapter_after_chapter'} = [
               'normalized' => 'part-chapter-node'
             }
           ],
-          'normalized' => 'part-chapter-node',
+          'normalized' => 'part-chapter-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -365,7 +375,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -380,7 +390,8 @@ $result_trees{'node_part_chapter_after_chapter'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -397,7 +408,7 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                 'text' => 'chapter with part node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -428,7 +439,9 @@ $result_trees{'node_part_chapter_after_chapter'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -509,6 +522,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -526,11 +540,13 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                               'extra' => {
                                 'normalized' => 'chapter-node'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -555,6 +571,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                                     'extra' => {
                                       'normalized' => 'part-chapter-node'
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {}
                                     }
@@ -564,6 +581,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                                     'extra' => {
                                       'part_associated_section' => {}
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {},
                                       'section_childs' => [
@@ -575,6 +593,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                                     }
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_level' => 1,
@@ -625,6 +644,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_childs' => [
@@ -691,6 +711,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -703,6 +724,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -721,11 +743,13 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 2
@@ -778,6 +802,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -786,6 +811,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
         'associated_section' => {},
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_next' => {
@@ -794,6 +820,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
             'associated_section' => {},
             'normalized' => 'part-chapter-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'node_prev' => {},
@@ -852,12 +879,14 @@ $result_menus{'node_part_chapter_after_chapter'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -870,6 +899,7 @@ $result_menus{'node_part_chapter_after_chapter'} = {
               'unit_command' => {
                 'cmdname' => 'chapter',
                 'extra' => {},
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -888,11 +918,13 @@ $result_menus{'node_part_chapter_after_chapter'} = {
                         'associated_part' => {
                           'cmdname' => 'part',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
                         }
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_number' => 2
@@ -941,6 +973,7 @@ $result_menus{'node_part_chapter_after_chapter'} = {
       'extra' => {
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_next' => {
@@ -948,6 +981,7 @@ $result_menus{'node_part_chapter_after_chapter'} = {
           'extra' => {
             'normalized' => 'part-chapter-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_prev' => {},
@@ -1022,6 +1056,7 @@ $result_elements{'node_part_chapter_after_chapter'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -1034,6 +1069,7 @@ $result_elements{'node_part_chapter_after_chapter'} = [
             'unit_command' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -1052,11 +1088,13 @@ $result_elements{'node_part_chapter_after_chapter'} = [
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 2
diff --git a/tp/t/results/sectioning/node_part_chapter_after_top.pl 
b/tp/t/results/sectioning/node_part_chapter_after_top.pl
index b9635b462a..05643f3ad0 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -19,7 +19,7 @@ $result_trees{'node_part_chapter_after_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'node_part_chapter_after_top'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'node_part_chapter_after_top'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'node_part_chapter_after_top'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -139,7 +141,7 @@ $result_trees{'node_part_chapter_after_top'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -148,9 +150,11 @@ $result_trees{'node_part_chapter_after_top'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -170,7 +174,8 @@ $result_trees{'node_part_chapter_after_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -195,7 +200,7 @@ $result_trees{'node_part_chapter_after_top'} = [
                 'text' => 'chapter node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -215,7 +220,9 @@ $result_trees{'node_part_chapter_after_top'} = [
               'normalized' => 'chapter-node'
             }
           ],
-          'normalized' => 'chapter-node',
+          'normalized' => 'chapter-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -232,7 +239,7 @@ $result_trees{'node_part_chapter_after_top'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -247,7 +254,8 @@ $result_trees{'node_part_chapter_after_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -264,7 +272,7 @@ $result_trees{'node_part_chapter_after_top'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => ' 
 '
             },
@@ -273,7 +281,9 @@ $result_trees{'node_part_chapter_after_top'} = [
         ],
         'cmdname' => 'chapter',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -336,6 +346,7 @@ $result_sectioning{'node_part_chapter_after_top'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -353,6 +364,7 @@ $result_sectioning{'node_part_chapter_after_top'} = {
                               'extra' => {
                                 'normalized' => 'chapter-node'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
@@ -362,6 +374,7 @@ $result_sectioning{'node_part_chapter_after_top'} = {
                               'extra' => {
                                 'part_associated_section' => {}
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'section_childs' => [
@@ -373,6 +386,7 @@ $result_sectioning{'node_part_chapter_after_top'} = {
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -409,6 +423,7 @@ $result_sectioning{'node_part_chapter_after_top'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -454,6 +469,7 @@ $result_nodes{'node_part_chapter_after_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -469,11 +485,13 @@ $result_nodes{'node_part_chapter_after_top'} = {
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -512,6 +530,7 @@ $result_nodes{'node_part_chapter_after_top'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -520,6 +539,7 @@ $result_nodes{'node_part_chapter_after_top'} = {
         'associated_section' => {},
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_prev' => {},
@@ -557,12 +577,14 @@ $result_menus{'node_part_chapter_after_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -578,11 +600,13 @@ $result_menus{'node_part_chapter_after_top'} = {
                   'associated_part' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
                   }
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -617,6 +641,7 @@ $result_menus{'node_part_chapter_after_top'} = {
       'extra' => {
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_up' => {},
@@ -668,6 +693,7 @@ $result_elements{'node_part_chapter_after_top'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -683,11 +709,13 @@ $result_elements{'node_part_chapter_after_top'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl 
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index e468c53ce9..295f65a546 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -18,7 +18,7 @@ $result_trees{'node_referenced_in_ref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'node_referenced_in_ref'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +101,7 @@ $result_trees{'node_referenced_in_ref'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -110,9 +110,11 @@ $result_trees{'node_referenced_in_ref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -154,7 +156,7 @@ $result_trees{'node_referenced_in_ref'} = {
                           'text' => 'second level node'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -174,7 +176,9 @@ $result_trees{'node_referenced_in_ref'} = {
                         'normalized' => 'second-level-node'
                       }
                     ],
-                    'normalized' => 'second-level-node',
+                    'normalized' => 'second-level-node'
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -221,7 +225,9 @@ $result_trees{'node_referenced_in_ref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -238,7 +244,7 @@ $result_trees{'node_referenced_in_ref'} = {
               'text' => 'first level node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -265,7 +271,9 @@ $result_trees{'node_referenced_in_ref'} = {
             'normalized' => 'first-level-node'
           }
         ],
-        'normalized' => 'first-level-node',
+        'normalized' => 'first-level-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -321,12 +329,14 @@ $result_nodes{'node_referenced_in_ref'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first-level-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -344,12 +354,14 @@ $result_menus{'node_referenced_in_ref'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'first-level-node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
index 6493c3d2b4..10686e2d6e 100644
--- a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
@@ -19,7 +19,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
                       'text' => 'node_sectop_before_chapter_no_node.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'node_sectop_before_chapter_no_node.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,9 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +97,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -108,7 +112,8 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -125,7 +130,7 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -133,7 +138,8 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -175,14 +181,17 @@ $result_sectioning{'node_sectop_before_chapter_no_node'} 
= {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -211,17 +220,20 @@ $result_nodes{'node_sectop_before_chapter_no_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'node_sectop_before_chapter_no_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'node_sectop_before_chapter_no_node'} = [];
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index e158f09d85..9f89505929 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -19,7 +19,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
                       'text' => 'node_sectop_before_lone_node_Top.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'node_sectop_before_lone_node_Top.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               'text' => 'node before'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,9 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
             'normalized' => 'node-before'
           }
         ],
-        'normalized' => 'node-before',
+        'normalized' => 'node-before'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +97,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               'text' => 'top sectionning'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -122,7 +126,8 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -139,7 +144,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -180,7 +185,9 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -197,7 +204,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -217,7 +224,9 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -234,7 +243,7 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -258,7 +267,8 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -321,9 +331,11 @@ $result_sectioning{'node_sectop_before_lone_node_Top'} = {
             'extra' => {
               'normalized' => 'node-before'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -334,9 +346,11 @@ $result_sectioning{'node_sectop_before_lone_node_Top'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -364,6 +378,7 @@ $result_nodes{'node_sectop_before_lone_node_Top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -371,10 +386,12 @@ $result_nodes{'node_sectop_before_lone_node_Top'} = {
         'associated_section' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'normalized' => 'node-before'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -382,12 +399,14 @@ $result_nodes{'node_sectop_before_lone_node_Top'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 1
               }
             },
             'normalized' => 'chap'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -405,6 +424,7 @@ $result_menus{'node_sectop_before_lone_node_Top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/node_too_much_args.pl 
b/tp/t/results/sectioning/node_too_much_args.pl
index 8a50131ede..5c4a3cf0f7 100644
--- a/tp/t/results/sectioning/node_too_much_args.pl
+++ b/tp/t/results/sectioning/node_too_much_args.pl
@@ -21,13 +21,13 @@ $result_trees{'node_too_much_args'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -44,7 +44,7 @@ $result_trees{'node_too_much_args'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'type' => 'line_arg'
@@ -70,7 +70,9 @@ $result_trees{'node_too_much_args'} = {
             ]
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -96,6 +98,7 @@ $result_nodes{'node_too_much_args'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_up' => {
       'extra' => {
@@ -114,6 +117,7 @@ $result_menus{'node_too_much_args'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl 
b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
index 6d6da29d67..82030da1ae 100644
--- a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
+++ b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
@@ -41,7 +41,7 @@ $result_trees{'node_up_direction_for_top_with_manual'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +72,9 @@ $result_trees{'node_up_direction_for_top_with_manual'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -100,6 +102,7 @@ $result_nodes{'node_up_direction_for_top_with_manual'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_up' => {
       'extra' => {
@@ -119,6 +122,7 @@ $result_menus{'node_up_direction_for_top_with_manual'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index b10ff86809..3d8936c28d 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -25,7 +25,7 @@ $result_trees{'node_up_external_node'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -42,7 +42,7 @@ $result_trees{'node_up_external_node'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -108,7 +108,7 @@ $result_trees{'node_up_external_node'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -117,9 +117,11 @@ $result_trees{'node_up_external_node'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -151,7 +153,9 @@ $result_trees{'node_up_external_node'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -190,7 +194,7 @@ $result_trees{'node_up_external_node'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -207,7 +211,7 @@ $result_trees{'node_up_external_node'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => ' ',
               'spaces_before_argument' => ' '
             },
@@ -225,7 +229,7 @@ $result_trees{'node_up_external_node'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -261,7 +265,9 @@ $result_trees{'node_up_external_node'} = [
               ]
             }
           ],
-          'normalized' => 'first',
+          'normalized' => 'first'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -314,6 +320,7 @@ $result_nodes{'node_up_external_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -328,6 +335,7 @@ $result_nodes{'node_up_external_node'} = {
                 'extra' => {
                   'normalized' => 'first'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'node_next' => {
@@ -428,6 +436,7 @@ $result_menus{'node_up_external_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -442,6 +451,7 @@ $result_menus{'node_up_external_node'} = {
                 'extra' => {
                   'normalized' => 'first'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_up' => {},
@@ -536,6 +546,7 @@ $result_elements{'node_up_external_node'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -543,6 +554,7 @@ $result_elements{'node_up_external_node'} = [
             'extra' => {
               'normalized' => 'first'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index 0743835c2c..c664d46b71 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -18,7 +18,7 @@ $result_trees{'nodename_parentheses'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'nodename_parentheses'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'nodename_parentheses'} = {
               'text' => 'The top node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'nodename_parentheses'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -248,7 +250,7 @@ $result_trees{'nodename_parentheses'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -257,9 +259,11 @@ $result_trees{'nodename_parentheses'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -279,7 +283,8 @@ $result_trees{'nodename_parentheses'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -296,7 +301,7 @@ $result_trees{'nodename_parentheses'} = {
               'text' => 'Node (with parentheses)'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -316,7 +321,9 @@ $result_trees{'nodename_parentheses'} = {
             'normalized' => 'Node-_0028with-parentheses_0029'
           }
         ],
-        'normalized' => 'Node-_0028with-parentheses_0029',
+        'normalized' => 'Node-_0028with-parentheses_0029'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -333,7 +340,7 @@ $result_trees{'nodename_parentheses'} = {
               'text' => 'Section (nodename with parentheses)'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -362,7 +369,8 @@ $result_trees{'nodename_parentheses'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -379,7 +387,7 @@ $result_trees{'nodename_parentheses'} = {
               'text' => 'Other node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -399,7 +407,9 @@ $result_trees{'nodename_parentheses'} = {
             'normalized' => 'Other-node'
           }
         ],
-        'normalized' => 'Other-node',
+        'normalized' => 'Other-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -416,7 +426,7 @@ $result_trees{'nodename_parentheses'} = {
               'text' => 'Section (nodename without parentheses)'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -529,7 +539,8 @@ $result_trees{'nodename_parentheses'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -555,7 +566,7 @@ $result_trees{'nodename_parentheses'} = {
               'text' => 'node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -578,7 +589,9 @@ $result_trees{'nodename_parentheses'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node',
+        'normalized' => 'node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -595,7 +608,7 @@ $result_trees{'nodename_parentheses'} = {
               'text' => '(manual)node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -671,7 +684,8 @@ $result_trees{'nodename_parentheses'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -775,9 +789,11 @@ $result_sectioning{'nodename_parentheses'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -788,9 +804,11 @@ $result_sectioning{'nodename_parentheses'} = {
                   'extra' => {
                     'normalized' => 'Node-_0028with-parentheses_0029'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -807,9 +825,11 @@ $result_sectioning{'nodename_parentheses'} = {
                   'extra' => {
                     'normalized' => 'Other-node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -827,9 +847,11 @@ $result_sectioning{'nodename_parentheses'} = {
                   'extra' => {
                     'normalized' => 'node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -867,6 +889,7 @@ $result_nodes{'nodename_parentheses'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -876,6 +899,7 @@ $result_nodes{'nodename_parentheses'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -883,12 +907,14 @@ $result_nodes{'nodename_parentheses'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'Node-_0028with-parentheses_0029'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -896,12 +922,14 @@ $result_nodes{'nodename_parentheses'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'Other-node'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -909,12 +937,14 @@ $result_nodes{'nodename_parentheses'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 3
                   }
                 },
                 'normalized' => 'node'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -944,18 +974,21 @@ $result_menus{'nodename_parentheses'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Node-_0028with-parentheses_0029'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Other-node'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'extra' => {
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index 3e48e05769..8100220067 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
@@ -19,7 +19,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -40,7 +40,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -155,7 +155,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -164,9 +164,11 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -198,7 +200,9 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -231,7 +235,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                 'text' => 'third node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -250,7 +254,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -309,7 +313,9 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'second-node',
+          'normalized' => 'second-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -353,7 +359,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -386,7 +392,9 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'third-node',
+          'normalized' => 'third-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -403,7 +411,7 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -411,7 +419,8 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
           }
         ],
         'cmdname' => 'chapter',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -484,6 +493,7 @@ $result_sectioning{'nodes_after_top_before_chapter_nodes'} 
= {
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -498,6 +508,7 @@ $result_sectioning{'nodes_after_top_before_chapter_nodes'} 
= {
                           'extra' => {
                             'normalized' => 'second-node'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -512,6 +523,7 @@ $result_sectioning{'nodes_after_top_before_chapter_nodes'} 
= {
                                 'extra' => {
                                   'normalized' => 'Top'
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {}
                                 }
@@ -553,6 +565,7 @@ $result_sectioning{'nodes_after_top_before_chapter_nodes'} 
= {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 1,
@@ -599,6 +612,7 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -613,6 +627,7 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
                 'extra' => {
                   'normalized' => 'second-node'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'node_next' => {
@@ -621,6 +636,7 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
                       'associated_section' => {
                         'cmdname' => 'chapter',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {
                             'extra' => {
@@ -643,6 +659,7 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
                       },
                       'normalized' => 'third-node'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_prev' => {},
@@ -718,6 +735,7 @@ $result_menus{'nodes_after_top_before_chapter_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -732,6 +750,7 @@ $result_menus{'nodes_after_top_before_chapter_nodes'} = {
                 'extra' => {
                   'normalized' => 'second-node'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
@@ -739,6 +758,7 @@ $result_menus{'nodes_after_top_before_chapter_nodes'} = {
                     'extra' => {
                       'normalized' => 'third-node'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {
                         'extra' => {
@@ -839,6 +859,7 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -846,6 +867,7 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} = [
             'extra' => {
               'normalized' => 'second-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -861,6 +883,7 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} = [
                           'extra' => {
                             'normalized' => 'third-node'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'menu_prev' => {},
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
index bd84a5011b..03ae7ad32e 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
@@ -24,7 +24,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -160,7 +160,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -169,9 +169,11 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -203,7 +205,9 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -228,7 +232,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               'text' => 'third node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -247,7 +251,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -306,7 +310,9 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'second-node',
+        'normalized' => 'second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -342,7 +348,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -375,7 +381,9 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'third-node',
+        'normalized' => 'third-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -392,7 +400,7 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -400,7 +408,8 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -466,9 +475,11 @@ 
$result_sectioning{'nodes_after_top_before_chapter_not_split'} = {
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -491,12 +502,14 @@ $result_nodes{'nodes_after_top_before_chapter_not_split'} 
= {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -504,12 +517,14 @@ $result_nodes{'nodes_after_top_before_chapter_not_split'} 
= {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 1
               }
             },
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -533,18 +548,21 @@ $result_menus{'nodes_after_top_before_chapter_not_split'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
index a98346c36e..b7d5fe8548 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
@@ -24,7 +24,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -160,7 +160,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -169,9 +169,11 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -203,7 +205,9 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -228,7 +232,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               'text' => 'third node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -247,7 +251,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -306,7 +310,9 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'second-node',
+        'normalized' => 'second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -342,7 +348,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -375,7 +381,9 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'third-node',
+        'normalized' => 'third-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -392,7 +400,7 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -400,7 +408,8 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -466,9 +475,11 @@ 
$result_sectioning{'nodes_after_top_before_chapter_not_split_no_use_node_directi
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -491,12 +502,14 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -504,12 +517,14 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 1
               }
             },
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -533,18 +548,21 @@ 
$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
index bba0633e97..cd2b1fcb86 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
@@ -19,7 +19,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -40,7 +40,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -155,7 +155,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -164,9 +164,11 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = 
[
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -198,7 +200,9 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -223,7 +227,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                 'text' => 'third node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -242,7 +246,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -301,7 +305,9 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'second-node',
+          'normalized' => 'second-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -337,7 +343,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -370,7 +376,9 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'third-node',
+          'normalized' => 'third-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -387,7 +395,7 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -395,7 +403,8 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
           }
         ],
         'cmdname' => 'chapter',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -466,6 +475,7 @@ 
$result_sectioning{'nodes_after_top_before_chapter_sections'} = {
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -483,6 +493,7 @@ 
$result_sectioning{'nodes_after_top_before_chapter_sections'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 1,
@@ -511,12 +522,14 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} 
= {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'section_number' => 1
@@ -537,6 +550,7 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} = {
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_next' => {
@@ -545,6 +559,7 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} = {
             'associated_section' => {},
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'node_prev' => {},
@@ -576,12 +591,14 @@ $result_menus{'nodes_after_top_before_chapter_sections'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'section_number' => 1
@@ -602,6 +619,7 @@ $result_menus{'nodes_after_top_before_chapter_sections'} = {
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_next' => {
@@ -609,6 +627,7 @@ $result_menus{'nodes_after_top_before_chapter_sections'} = {
           'extra' => {
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_prev' => {},
@@ -648,6 +667,7 @@ $result_elements{'nodes_after_top_before_chapter_sections'} 
= [
       'unit_command' => {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_number' => 1
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
index ff54d58888..9816ca2e83 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
@@ -19,7 +19,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -40,7 +40,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -155,7 +155,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -164,9 +164,11 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -198,7 +200,9 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -231,7 +235,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                 'text' => 'third node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -250,7 +254,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -309,7 +313,9 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'second-node',
+          'normalized' => 'second-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -353,7 +359,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -386,7 +392,9 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'third-node',
+          'normalized' => 'third-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -403,7 +411,7 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                 'text' => 'subsection'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -411,7 +419,8 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
           }
         ],
         'cmdname' => 'subsection',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -484,6 +493,7 @@ $result_sectioning{'nodes_after_top_before_section_nodes'} 
= {
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -498,6 +508,7 @@ $result_sectioning{'nodes_after_top_before_section_nodes'} 
= {
                           'extra' => {
                             'normalized' => 'second-node'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -512,6 +523,7 @@ $result_sectioning{'nodes_after_top_before_section_nodes'} 
= {
                                 'extra' => {
                                   'normalized' => 'Top'
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {}
                                 }
@@ -554,6 +566,7 @@ $result_sectioning{'nodes_after_top_before_section_nodes'} 
= {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 3,
@@ -600,6 +613,7 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -614,6 +628,7 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
                 'extra' => {
                   'normalized' => 'second-node'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'node_next' => {
@@ -622,6 +637,7 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
                       'associated_section' => {
                         'cmdname' => 'subsection',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {
                             'extra' => {
@@ -645,6 +661,7 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
                       },
                       'normalized' => 'third-node'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_prev' => {},
@@ -720,6 +737,7 @@ $result_menus{'nodes_after_top_before_section_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -734,6 +752,7 @@ $result_menus{'nodes_after_top_before_section_nodes'} = {
                 'extra' => {
                   'normalized' => 'second-node'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
@@ -741,6 +760,7 @@ $result_menus{'nodes_after_top_before_section_nodes'} = {
                     'extra' => {
                       'normalized' => 'third-node'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {
                         'extra' => {
@@ -842,6 +862,7 @@ $result_elements{'nodes_after_top_before_section_nodes'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -849,6 +870,7 @@ $result_elements{'nodes_after_top_before_section_nodes'} = [
             'extra' => {
               'normalized' => 'second-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -864,6 +886,7 @@ $result_elements{'nodes_after_top_before_section_nodes'} = [
                           'extra' => {
                             'normalized' => 'third-node'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'menu_prev' => {},
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
index a7c05576e6..a40ed0e473 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
@@ -19,7 +19,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -40,7 +40,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -155,7 +155,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -164,9 +164,11 @@ $result_trees{'nodes_after_top_before_section_sections'} = 
[
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -198,7 +200,9 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -223,7 +227,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                 'text' => 'third node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -242,7 +246,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -301,7 +305,9 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'second-node',
+          'normalized' => 'second-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -337,7 +343,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -370,7 +376,9 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'third-node',
+          'normalized' => 'third-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -387,7 +395,7 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                 'text' => 'subsection'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -395,7 +403,8 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
           }
         ],
         'cmdname' => 'subsection',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -466,6 +475,7 @@ 
$result_sectioning{'nodes_after_top_before_section_sections'} = {
             'extra' => {
               'normalized' => 'third-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -484,6 +494,7 @@ 
$result_sectioning{'nodes_after_top_before_section_sections'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 3,
@@ -512,12 +523,14 @@ $result_nodes{'nodes_after_top_before_section_sections'} 
= {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'subsection',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'section_number' => 1
@@ -539,6 +552,7 @@ $result_nodes{'nodes_after_top_before_section_sections'} = {
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_next' => {
@@ -547,6 +561,7 @@ $result_nodes{'nodes_after_top_before_section_sections'} = {
             'associated_section' => {},
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'node_prev' => {},
@@ -578,12 +593,14 @@ $result_menus{'nodes_after_top_before_section_sections'} 
= {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'subsection',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'section_number' => 1
@@ -605,6 +622,7 @@ $result_menus{'nodes_after_top_before_section_sections'} = {
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_next' => {
@@ -612,6 +630,7 @@ $result_menus{'nodes_after_top_before_section_sections'} = {
           'extra' => {
             'normalized' => 'third-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_prev' => {},
@@ -651,6 +670,7 @@ $result_elements{'nodes_after_top_before_section_sections'} 
= [
       'unit_command' => {
         'cmdname' => 'subsection',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_number' => 1
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 5772ff24cf..3e7eae865d 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -19,7 +19,7 @@ $result_trees{'nodes_before_after_top'} = {
                       'text' => 'nodes_before_after_top.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'nodes_before_after_top'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'nodes_before_after_top.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'nodes_before_after_top'} = {
               'text' => 'node before'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -97,7 +99,9 @@ $result_trees{'nodes_before_after_top'} = {
             'normalized' => 'node-before'
           }
         ],
-        'normalized' => 'node-before',
+        'normalized' => 'node-before'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -114,7 +118,7 @@ $result_trees{'nodes_before_after_top'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -134,7 +138,9 @@ $result_trees{'nodes_before_after_top'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -151,7 +157,7 @@ $result_trees{'nodes_before_after_top'} = {
               'text' => 'top sectionning'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -180,7 +186,8 @@ $result_trees{'nodes_before_after_top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -197,7 +204,7 @@ $result_trees{'nodes_before_after_top'} = {
               'text' => 'after'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -238,7 +245,9 @@ $result_trees{'nodes_before_after_top'} = {
             'normalized' => 'after'
           }
         ],
-        'normalized' => 'after',
+        'normalized' => 'after'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -255,7 +264,7 @@ $result_trees{'nodes_before_after_top'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -275,7 +284,9 @@ $result_trees{'nodes_before_after_top'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -292,7 +303,7 @@ $result_trees{'nodes_before_after_top'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -316,7 +327,8 @@ $result_trees{'nodes_before_after_top'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -388,9 +400,11 @@ $result_sectioning{'nodes_before_after_top'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -401,9 +415,11 @@ $result_sectioning{'nodes_before_after_top'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -432,10 +448,12 @@ $result_nodes{'nodes_before_after_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -443,12 +461,14 @@ $result_nodes{'nodes_before_after_top'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -464,6 +484,7 @@ $result_menus{'nodes_before_after_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/nodes_before_after_top_xref.pl 
b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
index 21b7d241b5..3d73552858 100644
--- a/tp/t/results/sectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
@@ -19,7 +19,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
                       'text' => 'nodes_before_after_top_xref.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'nodes_before_after_top_xref'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'nodes_before_after_top_xref.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -56,7 +58,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'text' => 'node before'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -97,7 +99,9 @@ $result_trees{'nodes_before_after_top_xref'} = {
             'normalized' => 'node-before'
           }
         ],
-        'normalized' => 'node-before',
+        'normalized' => 'node-before'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -114,7 +118,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -134,7 +138,9 @@ $result_trees{'nodes_before_after_top_xref'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -151,7 +157,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'text' => 'top sectionning'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -180,7 +186,8 @@ $result_trees{'nodes_before_after_top_xref'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -197,7 +204,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'text' => 'after'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -238,7 +245,9 @@ $result_trees{'nodes_before_after_top_xref'} = {
             'normalized' => 'after'
           }
         ],
-        'normalized' => 'after',
+        'normalized' => 'after'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -255,7 +264,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -275,7 +284,9 @@ $result_trees{'nodes_before_after_top_xref'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -292,7 +303,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -328,7 +339,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -339,7 +350,9 @@ $result_trees{'nodes_before_after_top_xref'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -428,7 +441,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -439,7 +452,9 @@ $result_trees{'nodes_before_after_top_xref'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -521,7 +536,8 @@ $result_trees{'nodes_before_after_top_xref'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -617,9 +633,11 @@ $result_sectioning{'nodes_before_after_top_xref'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -630,9 +648,11 @@ $result_sectioning{'nodes_before_after_top_xref'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -661,10 +681,12 @@ $result_nodes{'nodes_before_after_top_xref'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -672,12 +694,14 @@ $result_nodes{'nodes_before_after_top_xref'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -693,6 +717,7 @@ $result_menus{'nodes_before_after_top_xref'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index f34a425ed5..b4c40a1189 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -19,7 +19,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'nodes_before_top.info'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -28,9 +28,11 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'nodes_before_top.info'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -64,13 +66,13 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -87,7 +89,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -104,7 +106,7 @@ $result_trees{'nodes_before_top'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -170,7 +172,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -179,9 +181,11 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -225,7 +229,9 @@ $result_trees{'nodes_before_top'} = {
             ]
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -256,7 +262,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -291,7 +297,9 @@ $result_trees{'nodes_before_top'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'node-in-menu-before-top',
+        'normalized' => 'node-in-menu-before-top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -319,7 +327,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'first'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -346,7 +354,9 @@ $result_trees{'nodes_before_top'} = {
             'normalized' => 'first'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -363,7 +373,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -380,7 +390,7 @@ $result_trees{'nodes_before_top'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -446,7 +456,7 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -455,9 +465,11 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -477,7 +489,8 @@ $result_trees{'nodes_before_top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -494,7 +507,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'second node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -514,7 +527,9 @@ $result_trees{'nodes_before_top'} = {
             'normalized' => 'second-node'
           }
         ],
-        'normalized' => 'second-node',
+        'normalized' => 'second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -531,7 +546,7 @@ $result_trees{'nodes_before_top'} = {
               'text' => 'a chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -539,7 +554,8 @@ $result_trees{'nodes_before_top'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -615,9 +631,11 @@ $result_sectioning{'nodes_before_top'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -628,9 +646,11 @@ $result_sectioning{'nodes_before_top'} = {
                   'extra' => {
                     'normalized' => 'second-node'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -659,6 +679,7 @@ $result_nodes{'nodes_before_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -668,6 +689,7 @@ $result_nodes{'nodes_before_top'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -675,12 +697,14 @@ $result_nodes{'nodes_before_top'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'node_up' => {}
       }
@@ -695,12 +719,14 @@ $result_nodes{'nodes_before_top'} = {
         ],
         'normalized' => 'first'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'node-in-menu-before-top'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -728,12 +754,14 @@ $result_menus{'nodes_before_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl 
b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index dae76eb7e0..9416ebea8e 100644
--- a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
+++ b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
@@ -39,7 +39,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -65,7 +65,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -131,7 +131,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -140,9 +140,11 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -181,7 +183,9 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
               ]
             }
           ],
-          'normalized' => 'first',
+          'normalized' => 'first'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -225,7 +229,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
                 'text' => 'first'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -269,7 +273,9 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
               'normalized' => 'first'
             }
           ],
-          'normalized' => 'second-node',
+          'normalized' => 'second-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -326,6 +332,7 @@ $result_nodes{'nodes_no_node_top_explicit_directions'} = {
     ],
     'normalized' => 'first'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -340,6 +347,7 @@ $result_nodes{'nodes_no_node_top_explicit_directions'} = {
                 'extra' => {
                   'normalized' => 'second-node'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'node_prev' => {},
@@ -405,6 +413,7 @@ $result_menus{'nodes_no_node_top_explicit_directions'} = {
   'extra' => {
     'normalized' => 'first'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -419,6 +428,7 @@ $result_menus{'nodes_no_node_top_explicit_directions'} = {
                 'extra' => {
                   'normalized' => 'second-node'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_up' => {},
@@ -488,6 +498,7 @@ $result_elements{'nodes_no_node_top_explicit_directions'} = 
[
         'extra' => {
           'normalized' => 'first'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -495,6 +506,7 @@ $result_elements{'nodes_no_node_top_explicit_directions'} = 
[
             'extra' => {
               'normalized' => 'second-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
diff --git a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl 
b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
index 8db5870a84..f1b17cea8e 100644
--- a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
@@ -27,7 +27,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 'text' => 'first'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -68,7 +68,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                         'text' => '\'s Not Unix'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'type' => 'brace_command_arg'
@@ -85,7 +85,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 'text' => ' manuals'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -126,7 +126,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                         'text' => '\'s Not Unix'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'type' => 'brace_command_arg'
@@ -143,7 +143,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 'text' => ' manuals'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -184,7 +184,9 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
               'normalized' => 'GNU-manuals'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -201,7 +203,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 'text' => 'internal top node up'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -218,7 +220,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -284,7 +286,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -293,9 +295,11 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -315,7 +319,8 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -343,7 +348,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
             'type' => 'line_arg'
           },
           {
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -354,7 +359,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -395,7 +400,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                         'text' => '\'s Not Unix'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'type' => 'brace_command_arg'
@@ -412,7 +417,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                 'text' => ' manuals'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -447,7 +452,9 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
               'normalized' => 'GNU-manuals'
             }
           ],
-          'normalized' => 'first',
+          'normalized' => 'first'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -509,6 +516,7 @@ $result_sectioning{'non_automatic_internal_top_node_up'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -523,6 +531,7 @@ $result_sectioning{'non_automatic_internal_top_node_up'} = {
                           'extra' => {
                             'normalized' => 'first'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -551,6 +560,7 @@ $result_sectioning{'non_automatic_internal_top_node_up'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -582,6 +592,7 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -596,6 +607,7 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
                     'extra' => {
                       'normalized' => 'first'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_prev' => {}
@@ -631,6 +643,7 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {},
@@ -659,6 +672,7 @@ $result_menus{'non_automatic_internal_top_node_up'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -673,6 +687,7 @@ $result_menus{'non_automatic_internal_top_node_up'} = {
                 'extra' => {
                   'normalized' => 'first'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_up' => {},
@@ -762,6 +777,7 @@ $result_elements{'non_automatic_internal_top_node_up'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -769,6 +785,7 @@ $result_elements{'non_automatic_internal_top_node_up'} = [
             'extra' => {
               'normalized' => 'first'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
index cd78a7b96d..87ca6b391e 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
@@ -27,7 +27,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 'text' => 'first'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -68,7 +68,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                         'text' => '\'s Not Unix'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'type' => 'brace_command_arg'
@@ -85,7 +85,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 'text' => ' manuals'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -126,7 +126,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                         'text' => '\'s Not Unix'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'type' => 'brace_command_arg'
@@ -143,7 +143,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 'text' => ' manuals'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -184,7 +184,9 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
               'normalized' => 'GNU-manuals'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -201,7 +203,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 'text' => 'internal top node up'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -218,7 +220,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -284,7 +286,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -293,9 +295,11 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -315,7 +319,8 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -343,7 +348,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
             'type' => 'line_arg'
           },
           {
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -354,7 +359,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -395,7 +400,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                         'text' => '\'s Not Unix'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_before_argument' => ' '
                     },
                     'type' => 'brace_command_arg'
@@ -412,7 +417,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                 'text' => ' manuals'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -447,7 +452,9 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
               'normalized' => 'GNU-manuals'
             }
           ],
-          'normalized' => 'first',
+          'normalized' => 'first'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -509,6 +516,7 @@ $result_sectioning{'non_automatic_top_node_up_and_url'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -523,6 +531,7 @@ $result_sectioning{'non_automatic_top_node_up_and_url'} = {
                           'extra' => {
                             'normalized' => 'first'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -551,6 +560,7 @@ $result_sectioning{'non_automatic_top_node_up_and_url'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -582,6 +592,7 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -596,6 +607,7 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
                     'extra' => {
                       'normalized' => 'first'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_prev' => {}
@@ -631,6 +643,7 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {},
@@ -659,6 +672,7 @@ $result_menus{'non_automatic_top_node_up_and_url'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -673,6 +687,7 @@ $result_menus{'non_automatic_top_node_up_and_url'} = {
                 'extra' => {
                   'normalized' => 'first'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_up' => {},
@@ -762,6 +777,7 @@ $result_elements{'non_automatic_top_node_up_and_url'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -769,6 +785,7 @@ $result_elements{'non_automatic_top_node_up_and_url'} = [
             'extra' => {
               'normalized' => 'first'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
index ae6ecbf0c7..db02aae8cc 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
@@ -27,7 +27,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                 'text' => 'first'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -44,7 +44,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -61,7 +61,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -98,7 +98,9 @@ $result_trees{'non_automatic_top_node_up_url'} = [
               ]
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -115,7 +117,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                 'text' => 'internal top node up'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -132,7 +134,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -198,7 +200,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -207,9 +209,11 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -229,7 +233,8 @@ $result_trees{'non_automatic_top_node_up_url'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -257,7 +262,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
             'type' => 'line_arg'
           },
           {
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -268,7 +273,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -285,7 +290,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -318,7 +323,9 @@ $result_trees{'non_automatic_top_node_up_url'} = [
               ]
             }
           ],
-          'normalized' => 'first',
+          'normalized' => 'first'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -377,6 +384,7 @@ $result_sectioning{'non_automatic_top_node_up_url'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -391,6 +399,7 @@ $result_sectioning{'non_automatic_top_node_up_url'} = {
                           'extra' => {
                             'normalized' => 'first'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -431,6 +440,7 @@ $result_sectioning{'non_automatic_top_node_up_url'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -462,6 +472,7 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -476,6 +487,7 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
                     'extra' => {
                       'normalized' => 'first'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_prev' => {},
@@ -546,6 +558,7 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {},
@@ -587,6 +600,7 @@ $result_menus{'non_automatic_top_node_up_url'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -601,6 +615,7 @@ $result_menus{'non_automatic_top_node_up_url'} = {
                 'extra' => {
                   'normalized' => 'first'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_up' => {},
@@ -692,6 +707,7 @@ $result_elements{'non_automatic_top_node_up_url'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -699,6 +715,7 @@ $result_elements{'non_automatic_top_node_up_url'} = [
             'extra' => {
               'normalized' => 'first'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
diff --git a/tp/t/results/sectioning/novalidate.pl 
b/tp/t/results/sectioning/novalidate.pl
index 6ae10fcf46..13d2f641a1 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -53,7 +53,7 @@ $result_trees{'novalidate'} = {
               'text' => 'unknown node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -71,7 +71,7 @@ $result_trees{'novalidate'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -137,7 +137,7 @@ $result_trees{'novalidate'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -146,9 +146,11 @@ $result_trees{'novalidate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -221,7 +223,9 @@ $result_trees{'novalidate'} = {
             'normalized' => 'unknown-node'
           }
         ],
-        'normalized' => 'first',
+        'normalized' => 'first'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -271,6 +275,7 @@ $result_nodes{'novalidate'} = {
     ],
     'normalized' => 'first'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'extra' => {
@@ -285,6 +290,7 @@ $result_menus{'novalidate'} = {
   'extra' => {
     'normalized' => 'first'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl 
b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
index 42155a234f..3b605fa756 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -38,7 +38,7 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -161,7 +161,9 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
             ]
           }
         ],
-        'normalized' => 'one-node',
+        'normalized' => 'one-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -201,6 +203,7 @@ $result_nodes{'one_node_explicit_directions_anchor'} = {
   'extra' => {
     'normalized' => 'one-node'
   },
+  'info' => {},
   'structure' => {
     'node_up' => {
       'extra' => {
@@ -219,6 +222,7 @@ $result_menus{'one_node_explicit_directions_anchor'} = {
   'extra' => {
     'normalized' => 'one-node'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/one_subsection.pl 
b/tp/t/results/sectioning/one_subsection.pl
index 3c8371c1b3..4089617d51 100644
--- a/tp/t/results/sectioning/one_subsection.pl
+++ b/tp/t/results/sectioning/one_subsection.pl
@@ -24,7 +24,7 @@ $result_trees{'one_subsection'} = {
               'text' => 'The subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -32,7 +32,7 @@ $result_trees{'one_subsection'} = {
         }
       ],
       'cmdname' => 'subsection',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -58,7 +58,7 @@ $result_sectioning{'one_subsection'} = {
     'section_childs' => [
       {
         'cmdname' => 'subsection',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 3,
           'section_number' => 1,
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index febe9c79e5..df59e0130b 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -18,7 +18,7 @@ $result_trees{'one_subsection_and_node'} = {
               'text' => 'one node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'one_subsection_and_node'} = {
             'normalized' => 'one-node'
           }
         ],
-        'normalized' => 'one-node',
+        'normalized' => 'one-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'one_subsection_and_node'} = {
               'text' => 'The subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -63,7 +65,8 @@ $result_trees{'one_subsection_and_node'} = {
         }
       ],
       'cmdname' => 'subsection',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -97,9 +100,11 @@ $result_sectioning{'one_subsection_and_node'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'one-node'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 3,
           'section_number' => 1,
@@ -118,19 +123,22 @@ $result_nodes{'one_subsection_and_node'} = {
     'associated_section' => {
       'cmdname' => 'subsection',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'section_number' => 1
       }
     },
     'normalized' => 'one-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'one_subsection_and_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'one-node'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'one_subsection_and_node'} = [];
diff --git a/tp/t/results/sectioning/only_special_spaces_node.pl 
b/tp/t/results/sectioning/only_special_spaces_node.pl
index 041294bf92..c1b9041ee2 100644
--- a/tp/t/results/sectioning/only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/only_special_spaces_node.pl
@@ -33,7 +33,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "Top"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -52,7 +52,9 @@ $result_trees{'only_special_spaces_node'} = {
             "normalized" => "Top"
           }
         ],
-        "normalized" => "Top",
+        "normalized" => "Top"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -69,7 +71,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "top"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -82,7 +84,8 @@ $result_trees{'only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -99,7 +102,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "\x{2000}\x{2001}\x{2002}"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -118,7 +121,9 @@ $result_trees{'only_special_spaces_node'} = {
             "normalized" => "_2002_2003_2002"
           }
         ],
-        "normalized" => "_2002_2003_2002",
+        "normalized" => "_2002_2003_2002"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -135,7 +140,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -148,7 +153,8 @@ $result_trees{'only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -160,7 +166,7 @@ $result_trees{'only_special_spaces_node'} = {
     {
       "args" => [
         {
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => " \t\f\13\n"
           },
           "type" => "line_arg"
@@ -186,7 +192,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -199,7 +205,8 @@ $result_trees{'only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -211,7 +218,7 @@ $result_trees{'only_special_spaces_node'} = {
     {
       "args" => [
         {
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => " \r\n"
           },
           "type" => "line_arg"
@@ -237,7 +244,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "CARRIAGE RETURN|\r|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -250,7 +257,8 @@ $result_trees{'only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -267,7 +275,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "\x{85}\x{a0}\x{1680}"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -286,7 +294,9 @@ $result_trees{'only_special_spaces_node'} = {
             "normalized" => "_0085_00a0_1680"
           }
         ],
-        "normalized" => "_0085_00a0_1680",
+        "normalized" => "_0085_00a0_1680"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -303,7 +313,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| OGHAM 
SPACE MARK|\x{1680}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -316,7 +326,8 @@ $result_trees{'only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -333,7 +344,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "\x{180e}\x{2003}"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -352,7 +363,9 @@ $result_trees{'only_special_spaces_node'} = {
             "normalized" => "_180e_2003"
           }
         ],
-        "normalized" => "_180e_2003",
+        "normalized" => "_180e_2003"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -369,7 +382,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -382,7 +395,8 @@ $result_trees{'only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -399,7 +413,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => 
"\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200a}\x{2028}\x{2029}\x{202f}\x{205f}\x{3000}"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -424,7 +438,9 @@ $result_trees{'only_special_spaces_node'} = {
             "normalized" => 
"_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000"
           }
         ],
-        "normalized" => 
"_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000",
+        "normalized" => 
"_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -441,7 +457,7 @@ $result_trees{'only_special_spaces_node'} = {
               "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}| FIGURE SPACE|\x{2007}| PUNCTUATION 
SPACE|\x{2008}| THIN SPACE|\x{2009}| HAIR SPACE|\x{200a}| LINE 
SEPARATOR|\x{2028}| PARAGRAPH SEPARATOR|\x{2029}| NARROW NO-BREAK 
SPACE|\x{202f}| MEDIUM MATHEMATICAL SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -454,7 +470,8 @@ $result_trees{'only_special_spaces_node'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -548,9 +565,11 @@ $result_sectioning{'only_special_spaces_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -561,9 +580,11 @@ $result_sectioning{'only_special_spaces_node'} = {
                   'extra' => {
                     'normalized' => '_2002_2003_2002'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -580,6 +601,7 @@ $result_sectioning{'only_special_spaces_node'} = {
                   'extra' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -597,6 +619,7 @@ $result_sectioning{'only_special_spaces_node'} = {
                   'extra' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -614,9 +637,11 @@ $result_sectioning{'only_special_spaces_node'} = {
                   'extra' => {
                     'normalized' => '_0085_00a0_1680'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 4,
@@ -634,9 +659,11 @@ $result_sectioning{'only_special_spaces_node'} = {
                   'extra' => {
                     'normalized' => '_180e_2003'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 5,
@@ -654,9 +681,11 @@ $result_sectioning{'only_special_spaces_node'} = {
                   'extra' => {
                     'normalized' => 
'_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 6,
@@ -706,10 +735,12 @@ $result_nodes{'only_special_spaces_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -717,12 +748,14 @@ $result_nodes{'only_special_spaces_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => '_2002_2003_2002'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -730,6 +763,7 @@ $result_nodes{'only_special_spaces_node'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
@@ -750,6 +784,7 @@ $result_menus{'only_special_spaces_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/part_before_chapter.pl 
b/tp/t/results/sectioning/part_before_chapter.pl
index c11c97db43..0725258f92 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -25,7 +25,7 @@ $result_trees{'part_before_chapter'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -40,7 +40,8 @@ $result_trees{'part_before_chapter'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -57,7 +58,7 @@ $result_trees{'part_before_chapter'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -66,7 +67,9 @@ $result_trees{'part_before_chapter'} = [
         ],
         'cmdname' => 'chapter',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -109,6 +112,7 @@ $result_sectioning{'part_before_chapter'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -127,6 +131,7 @@ $result_sectioning{'part_before_chapter'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_childs' => [
@@ -163,11 +168,13 @@ $result_elements{'part_before_chapter'} = [
           'associated_part' => {
             'cmdname' => 'part',
             'extra' => {},
+            'info' => {},
             'structure' => {
               'associated_unit' => {}
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_number' => 1
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index fce2c42872..6c613cba72 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -19,7 +19,7 @@ $result_trees{'part_before_section'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -34,7 +34,8 @@ $result_trees{'part_before_section'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -51,7 +52,7 @@ $result_trees{'part_before_section'} = [
                 'text' => 'section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => ' 
 '
             },
@@ -60,7 +61,9 @@ $result_trees{'part_before_section'} = [
         ],
         'cmdname' => 'section',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -103,6 +106,7 @@ $result_sectioning{'part_before_section'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -121,6 +125,7 @@ $result_sectioning{'part_before_section'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_childs' => [
@@ -167,11 +172,13 @@ $result_elements{'part_before_section'} = [
           'associated_part' => {
             'cmdname' => 'part',
             'extra' => {},
+            'info' => {},
             'structure' => {
               'associated_unit' => {}
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_number' => 1
diff --git a/tp/t/results/sectioning/part_before_top.pl 
b/tp/t/results/sectioning/part_before_top.pl
index 61f848b075..be8b9c1283 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -25,7 +25,7 @@ $result_trees{'part_before_top'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -40,7 +40,8 @@ $result_trees{'part_before_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -57,7 +58,7 @@ $result_trees{'part_before_top'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -66,7 +67,9 @@ $result_trees{'part_before_top'} = [
         ],
         'cmdname' => 'top',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -109,6 +112,7 @@ $result_sectioning{'part_before_top'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -127,6 +131,7 @@ $result_sectioning{'part_before_top'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -172,11 +177,13 @@ $result_elements{'part_before_top'} = [
           'associated_part' => {
             'cmdname' => 'part',
             'extra' => {},
+            'info' => {},
             'structure' => {
               'associated_unit' => {}
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 888af1a29c..d819ba0c7f 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -19,7 +19,7 @@ $result_trees{'part_chapter_after_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'part_chapter_after_top'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'part_chapter_after_top'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'part_chapter_after_top'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -139,7 +141,7 @@ $result_trees{'part_chapter_after_top'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -148,9 +150,11 @@ $result_trees{'part_chapter_after_top'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -170,7 +174,8 @@ $result_trees{'part_chapter_after_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -195,7 +200,7 @@ $result_trees{'part_chapter_after_top'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -210,7 +215,8 @@ $result_trees{'part_chapter_after_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -227,7 +233,7 @@ $result_trees{'part_chapter_after_top'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -247,7 +253,9 @@ $result_trees{'part_chapter_after_top'} = [
               'normalized' => 'chapter'
             }
           ],
-          'normalized' => 'chapter',
+          'normalized' => 'chapter'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -264,7 +272,7 @@ $result_trees{'part_chapter_after_top'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => ' 
 '
             },
@@ -273,7 +281,9 @@ $result_trees{'part_chapter_after_top'} = [
         ],
         'cmdname' => 'chapter',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -336,6 +346,7 @@ $result_sectioning{'part_chapter_after_top'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -353,6 +364,7 @@ $result_sectioning{'part_chapter_after_top'} = {
                               'extra' => {
                                 'normalized' => 'chapter'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
@@ -363,6 +375,7 @@ $result_sectioning{'part_chapter_after_top'} = {
                                 'part_associated_section' => {},
                                 'part_following_node' => {}
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'section_childs' => [
@@ -374,6 +387,7 @@ $result_sectioning{'part_chapter_after_top'} = {
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -410,6 +424,7 @@ $result_sectioning{'part_chapter_after_top'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -456,6 +471,7 @@ $result_nodes{'part_chapter_after_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -471,11 +487,13 @@ $result_nodes{'part_chapter_after_top'} = {
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -514,6 +532,7 @@ $result_nodes{'part_chapter_after_top'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -523,6 +542,7 @@ $result_nodes{'part_chapter_after_top'} = {
         'node_preceding_part' => {},
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_prev' => {},
@@ -561,12 +581,14 @@ $result_menus{'part_chapter_after_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -582,11 +604,13 @@ $result_menus{'part_chapter_after_top'} = {
                   'associated_part' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
                   }
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -621,6 +645,7 @@ $result_menus{'part_chapter_after_top'} = {
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_up' => {},
@@ -662,6 +687,7 @@ $result_elements{'part_chapter_after_top'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -677,11 +703,13 @@ $result_elements{'part_chapter_after_top'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
diff --git a/tp/t/results/sectioning/part_chapter_appendix.pl 
b/tp/t/results/sectioning/part_chapter_appendix.pl
index da717633ad..1edd680db3 100644
--- a/tp/t/results/sectioning/part_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_chapter_appendix.pl
@@ -25,7 +25,7 @@ $result_trees{'part_chapter_appendix'} = {
               'text' => 'Part 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -40,7 +40,8 @@ $result_trees{'part_chapter_appendix'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -57,7 +58,7 @@ $result_trees{'part_chapter_appendix'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -73,7 +74,9 @@ $result_trees{'part_chapter_appendix'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -90,7 +93,7 @@ $result_trees{'part_chapter_appendix'} = {
               'text' => 'Appendix'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -98,7 +101,7 @@ $result_trees{'part_chapter_appendix'} = {
         }
       ],
       'cmdname' => 'appendix',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -143,6 +146,7 @@ $result_sectioning{'part_chapter_appendix'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 1,
@@ -150,6 +154,7 @@ $result_sectioning{'part_chapter_appendix'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {}
@@ -160,7 +165,7 @@ $result_sectioning{'part_chapter_appendix'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 'A',
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index a93fd6e30e..65c2755a2c 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -19,7 +19,7 @@ $result_trees{'part_node_after_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'part_node_after_top'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'part_node_after_top'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'part_node_after_top'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -139,7 +141,7 @@ $result_trees{'part_node_after_top'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -148,9 +150,11 @@ $result_trees{'part_node_after_top'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -170,7 +174,8 @@ $result_trees{'part_node_after_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -187,7 +192,7 @@ $result_trees{'part_node_after_top'} = [
                 'text' => 'part node after top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -207,7 +212,9 @@ $result_trees{'part_node_after_top'} = [
               'normalized' => 'part-node-after-top'
             }
           ],
-          'normalized' => 'part-node-after-top',
+          'normalized' => 'part-node-after-top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -232,7 +239,7 @@ $result_trees{'part_node_after_top'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -240,7 +247,8 @@ $result_trees{'part_node_after_top'} = [
           }
         ],
         'cmdname' => 'part',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -297,6 +305,7 @@ $result_sectioning{'part_node_after_top'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -309,6 +318,7 @@ $result_sectioning{'part_node_after_top'} = {
                         'unit_command' => {
                           'cmdname' => 'part',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 0,
@@ -342,6 +352,7 @@ $result_sectioning{'part_node_after_top'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -379,6 +390,7 @@ $result_nodes{'part_node_after_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -391,6 +403,7 @@ $result_nodes{'part_node_after_top'} = {
                   'unit_command' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
@@ -427,6 +440,7 @@ $result_nodes{'part_node_after_top'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -434,6 +448,7 @@ $result_nodes{'part_node_after_top'} = {
       'extra' => {
         'normalized' => 'part-node-after-top'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_prev' => {},
@@ -468,12 +483,14 @@ $result_menus{'part_node_after_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -486,6 +503,7 @@ $result_menus{'part_node_after_top'} = {
               'unit_command' => {
                 'cmdname' => 'part',
                 'extra' => {},
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {}
                 }
@@ -518,6 +536,7 @@ $result_menus{'part_node_after_top'} = {
       'extra' => {
         'normalized' => 'part-node-after-top'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_up' => {},
@@ -576,6 +595,7 @@ $result_elements{'part_node_after_top'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -588,6 +608,7 @@ $result_elements{'part_node_after_top'} = [
             'unit_command' => {
               'cmdname' => 'part',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {}
               }
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index c39ccd093e..16bb0b7de2 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -27,7 +27,7 @@ $result_trees{'part_node_before_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -41,7 +41,7 @@ $result_trees{'part_node_before_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -74,7 +74,9 @@ $result_trees{'part_node_before_top'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'part-node-before-top',
+          'normalized' => 'part-node-before-top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -91,7 +93,7 @@ $result_trees{'part_node_before_top'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -106,7 +108,8 @@ $result_trees{'part_node_before_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -123,7 +126,7 @@ $result_trees{'part_node_before_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -143,7 +146,9 @@ $result_trees{'part_node_before_top'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -160,7 +165,7 @@ $result_trees{'part_node_before_top'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -177,7 +182,7 @@ $result_trees{'part_node_before_top'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -243,7 +248,7 @@ $result_trees{'part_node_before_top'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -252,9 +257,11 @@ $result_trees{'part_node_before_top'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 9,
@@ -270,7 +277,9 @@ $result_trees{'part_node_before_top'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -332,6 +341,7 @@ $result_sectioning{'part_node_before_top'} = {
                 'extra' => {
                   'normalized' => 'Top'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {
                     'extra' => {
@@ -351,6 +361,7 @@ $result_sectioning{'part_node_before_top'} = {
               },
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {},
               'section_level' => 0,
@@ -360,6 +371,7 @@ $result_sectioning{'part_node_before_top'} = {
           },
           'part_following_node' => {}
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -394,6 +406,7 @@ $result_nodes{'part_node_before_top'} = {
         'associated_part' => {
           'cmdname' => 'part',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {
               'extra' => {
@@ -412,6 +425,7 @@ $result_nodes{'part_node_before_top'} = {
           }
         }
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {}
       }
@@ -424,6 +438,7 @@ $result_nodes{'part_node_before_top'} = {
     'node_preceding_part' => {},
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -431,6 +446,7 @@ $result_nodes{'part_node_before_top'} = {
       'extra' => {
         'normalized' => 'part-node-before-top'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_next' => {},
@@ -460,6 +476,7 @@ $result_menus{'part_node_before_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -469,11 +486,13 @@ $result_menus{'part_node_before_top'} = {
             'associated_part' => {
               'cmdname' => 'part',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {}
               }
             }
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -494,6 +513,7 @@ $result_menus{'part_node_before_top'} = {
       'extra' => {
         'normalized' => 'part-node-before-top'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_up' => {},
@@ -547,11 +567,13 @@ $result_elements{'part_node_before_top'} = [
           'associated_part' => {
             'cmdname' => 'part',
             'extra' => {},
+            'info' => {},
             'structure' => {
               'associated_unit' => {}
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
diff --git a/tp/t/results/sectioning/part_node_chapter_after_top.pl 
b/tp/t/results/sectioning/part_node_chapter_after_top.pl
index ca5081f56f..b31c63b169 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -19,7 +19,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'part_node_chapter_after_top'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'part_node_chapter_after_top'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -188,7 +190,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -197,9 +199,11 @@ $result_trees{'part_node_chapter_after_top'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 7,
@@ -219,7 +223,8 @@ $result_trees{'part_node_chapter_after_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -244,7 +249,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -259,7 +264,8 @@ $result_trees{'part_node_chapter_after_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -284,7 +290,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -295,7 +301,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -306,7 +312,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -361,7 +367,9 @@ $result_trees{'part_node_chapter_after_top'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'a-node-after-part',
+          'normalized' => 'a-node-after-part'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -386,7 +394,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'text' => 'a node after part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -400,7 +408,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -434,7 +442,9 @@ $result_trees{'part_node_chapter_after_top'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'chapter',
+          'normalized' => 'chapter'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -451,7 +461,7 @@ $result_trees{'part_node_chapter_after_top'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => ' 
 '
             },
@@ -460,7 +470,9 @@ $result_trees{'part_node_chapter_after_top'} = [
         ],
         'cmdname' => 'chapter',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -539,6 +551,7 @@ $result_sectioning{'part_node_chapter_after_top'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -556,6 +569,7 @@ $result_sectioning{'part_node_chapter_after_top'} = {
                               'extra' => {
                                 'normalized' => 'chapter'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
@@ -566,6 +580,7 @@ $result_sectioning{'part_node_chapter_after_top'} = {
                                 'part_associated_section' => {},
                                 'part_following_node' => {}
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'section_childs' => [
@@ -577,6 +592,7 @@ $result_sectioning{'part_node_chapter_after_top'} = {
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -614,6 +630,7 @@ $result_sectioning{'part_node_chapter_after_top'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -661,6 +678,7 @@ $result_nodes{'part_node_chapter_after_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -676,11 +694,13 @@ $result_nodes{'part_node_chapter_after_top'} = {
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -720,6 +740,7 @@ $result_nodes{'part_node_chapter_after_top'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -728,6 +749,7 @@ $result_nodes{'part_node_chapter_after_top'} = {
         'node_preceding_part' => {},
         'normalized' => 'a-node-after-part'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_next' => {
@@ -737,6 +759,7 @@ $result_nodes{'part_node_chapter_after_top'} = {
             'node_preceding_part' => {},
             'normalized' => 'chapter'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'node_next' => {},
@@ -784,12 +807,14 @@ $result_menus{'part_node_chapter_after_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -805,11 +830,13 @@ $result_menus{'part_node_chapter_after_top'} = {
                   'associated_part' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
                   }
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -845,6 +872,7 @@ $result_menus{'part_node_chapter_after_top'} = {
       'extra' => {
         'normalized' => 'a-node-after-part'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_next' => {
@@ -852,6 +880,7 @@ $result_menus{'part_node_chapter_after_top'} = {
           'extra' => {
             'normalized' => 'chapter'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_prev' => {},
@@ -904,6 +933,7 @@ $result_elements{'part_node_chapter_after_top'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -919,11 +949,13 @@ $result_elements{'part_node_chapter_after_top'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index e6af2cda58..87c9879c25 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -19,7 +19,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'part_node_chapter_appendix'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'part_node_chapter_appendix'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -139,7 +141,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -148,9 +150,11 @@ $result_trees{'part_node_chapter_appendix'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -170,7 +174,8 @@ $result_trees{'part_node_chapter_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -195,7 +200,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                 'text' => 'Part 1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -210,7 +215,8 @@ $result_trees{'part_node_chapter_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -227,7 +233,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                 'text' => 'chapter node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -247,7 +253,9 @@ $result_trees{'part_node_chapter_appendix'} = [
               'normalized' => 'chapter-node'
             }
           ],
-          'normalized' => 'chapter-node',
+          'normalized' => 'chapter-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -264,7 +272,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -280,7 +288,9 @@ $result_trees{'part_node_chapter_appendix'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -305,7 +315,7 @@ $result_trees{'part_node_chapter_appendix'} = [
                 'text' => 'Appendix'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -313,7 +323,8 @@ $result_trees{'part_node_chapter_appendix'} = [
           }
         ],
         'cmdname' => 'appendix',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -382,6 +393,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -399,6 +411,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                               'extra' => {
                                 'normalized' => 'chapter-node'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
@@ -409,6 +422,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                                 'part_associated_section' => {},
                                 'part_following_node' => {}
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'section_childs' => [
@@ -420,6 +434,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -439,6 +454,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                               'unit_command' => {
                                 'cmdname' => 'appendix',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_level' => 1,
@@ -485,6 +501,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -545,6 +562,7 @@ $result_nodes{'part_node_chapter_appendix'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -560,11 +578,13 @@ $result_nodes{'part_node_chapter_appendix'} = {
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -580,6 +600,7 @@ $result_nodes{'part_node_chapter_appendix'} = {
                         'unit_command' => {
                           'cmdname' => 'appendix',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 'A'
@@ -627,6 +648,7 @@ $result_nodes{'part_node_chapter_appendix'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -636,6 +658,7 @@ $result_nodes{'part_node_chapter_appendix'} = {
         'node_preceding_part' => {},
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_prev' => {},
@@ -682,12 +705,14 @@ $result_menus{'part_node_chapter_appendix'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -703,11 +728,13 @@ $result_menus{'part_node_chapter_appendix'} = {
                   'associated_part' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
                   }
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -723,6 +750,7 @@ $result_menus{'part_node_chapter_appendix'} = {
                     'unit_command' => {
                       'cmdname' => 'appendix',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_number' => 'A'
@@ -766,6 +794,7 @@ $result_menus{'part_node_chapter_appendix'} = {
       'extra' => {
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_up' => {},
@@ -815,6 +844,7 @@ $result_elements{'part_node_chapter_appendix'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -830,11 +860,13 @@ $result_elements{'part_node_chapter_appendix'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -850,6 +882,7 @@ $result_elements{'part_node_chapter_appendix'} = [
                   'unit_command' => {
                     'cmdname' => 'appendix',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 'A'
diff --git a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
index 3f3e543ab2..0e8efbe89d 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -19,7 +19,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'part_node_chapter_node_appendix'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -188,7 +190,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -197,9 +199,11 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 7,
@@ -219,7 +223,8 @@ $result_trees{'part_node_chapter_node_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -244,7 +249,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 'text' => 'Part 1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -259,7 +264,8 @@ $result_trees{'part_node_chapter_node_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -276,7 +282,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 'text' => 'chapter node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -296,7 +302,9 @@ $result_trees{'part_node_chapter_node_appendix'} = [
               'normalized' => 'chapter-node'
             }
           ],
-          'normalized' => 'chapter-node',
+          'normalized' => 'chapter-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -313,7 +321,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -329,7 +337,9 @@ $result_trees{'part_node_chapter_node_appendix'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -354,7 +364,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 'text' => 'appendix node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -374,7 +384,9 @@ $result_trees{'part_node_chapter_node_appendix'} = [
               'normalized' => 'appendix-node'
             }
           ],
-          'normalized' => 'appendix-node',
+          'normalized' => 'appendix-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -391,7 +403,7 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                 'text' => 'Appendix'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -399,7 +411,8 @@ $result_trees{'part_node_chapter_node_appendix'} = [
           }
         ],
         'cmdname' => 'appendix',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -475,6 +488,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -492,6 +506,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                               'extra' => {
                                 'normalized' => 'chapter-node'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
@@ -502,6 +517,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                                 'part_associated_section' => {},
                                 'part_following_node' => {}
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'section_childs' => [
@@ -513,6 +529,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -537,11 +554,13 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                                     'extra' => {
                                       'normalized' => 'appendix-node'
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {}
                                     }
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_level' => 1,
@@ -593,6 +612,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -659,6 +679,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -674,11 +695,13 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -694,6 +717,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
                         'unit_command' => {
                           'cmdname' => 'appendix',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 'A'
@@ -746,6 +770,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -755,6 +780,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
         'node_preceding_part' => {},
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_next' => {
@@ -763,6 +789,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
             'associated_section' => {},
             'normalized' => 'appendix-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'node_prev' => {},
@@ -822,12 +849,14 @@ $result_menus{'part_node_chapter_node_appendix'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -843,11 +872,13 @@ $result_menus{'part_node_chapter_node_appendix'} = {
                   'associated_part' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
                   }
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -863,6 +894,7 @@ $result_menus{'part_node_chapter_node_appendix'} = {
                     'unit_command' => {
                       'cmdname' => 'appendix',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_number' => 'A'
@@ -911,6 +943,7 @@ $result_menus{'part_node_chapter_node_appendix'} = {
       'extra' => {
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_next' => {
@@ -918,6 +951,7 @@ $result_menus{'part_node_chapter_node_appendix'} = {
           'extra' => {
             'normalized' => 'appendix-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_prev' => {},
@@ -982,6 +1016,7 @@ $result_elements{'part_node_chapter_node_appendix'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -997,11 +1032,13 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -1017,6 +1054,7 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                   'unit_command' => {
                     'cmdname' => 'appendix',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 'A'
diff --git a/tp/t/results/sectioning/part_node_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_node_part_appendix.pl
index e0c06ade10..d26a92f355 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -19,7 +19,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'part_node_node_part_appendix'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'part_node_node_part_appendix'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -188,7 +190,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -197,9 +199,11 @@ $result_trees{'part_node_node_part_appendix'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 7,
@@ -219,7 +223,8 @@ $result_trees{'part_node_node_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -244,7 +249,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'text' => 'Part 1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -259,7 +264,8 @@ $result_trees{'part_node_node_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -276,7 +282,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'text' => 'chapter node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -296,7 +302,9 @@ $result_trees{'part_node_node_part_appendix'} = [
               'normalized' => 'chapter-node'
             }
           ],
-          'normalized' => 'chapter-node',
+          'normalized' => 'chapter-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -313,7 +321,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -329,7 +337,9 @@ $result_trees{'part_node_node_part_appendix'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -354,7 +364,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'text' => 'appendix part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -374,7 +384,9 @@ $result_trees{'part_node_node_part_appendix'} = [
               'normalized' => 'appendix-part'
             }
           ],
-          'normalized' => 'appendix-part',
+          'normalized' => 'appendix-part'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -391,7 +403,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'text' => 'Part Appendix'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -406,7 +418,8 @@ $result_trees{'part_node_node_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -423,7 +436,7 @@ $result_trees{'part_node_node_part_appendix'} = [
                 'text' => 'Appendix'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -432,7 +445,9 @@ $result_trees{'part_node_node_part_appendix'} = [
         ],
         'cmdname' => 'appendix',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -514,6 +529,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -531,6 +547,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                               'extra' => {
                                 'normalized' => 'chapter-node'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
@@ -541,6 +558,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                                 'part_associated_section' => {},
                                 'part_following_node' => {}
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'section_childs' => [
@@ -552,6 +570,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -576,6 +595,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                                     'extra' => {
                                       'normalized' => 'appendix-part'
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {}
                                     }
@@ -585,6 +605,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                                     'extra' => {
                                       'part_associated_section' => {}
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {},
                                       'section_childs' => [
@@ -596,6 +617,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                                     }
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_level' => 1,
@@ -645,6 +667,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -714,6 +737,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -729,11 +753,13 @@ $result_nodes{'part_node_node_part_appendix'} = {
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -752,11 +778,13 @@ $result_nodes{'part_node_node_part_appendix'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 'A'
@@ -808,6 +836,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -817,6 +846,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
         'node_preceding_part' => {},
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_next' => {
@@ -825,6 +855,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
             'associated_section' => {},
             'normalized' => 'appendix-part'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'node_prev' => {},
@@ -884,12 +915,14 @@ $result_menus{'part_node_node_part_appendix'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -905,11 +938,13 @@ $result_menus{'part_node_node_part_appendix'} = {
                   'associated_part' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
                   }
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -928,11 +963,13 @@ $result_menus{'part_node_node_part_appendix'} = {
                         'associated_part' => {
                           'cmdname' => 'part',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
                         }
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_number' => 'A'
@@ -980,6 +1017,7 @@ $result_menus{'part_node_node_part_appendix'} = {
       'extra' => {
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_next' => {
@@ -987,6 +1025,7 @@ $result_menus{'part_node_node_part_appendix'} = {
           'extra' => {
             'normalized' => 'appendix-part'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_prev' => {},
@@ -1061,6 +1100,7 @@ $result_elements{'part_node_node_part_appendix'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -1076,11 +1116,13 @@ $result_elements{'part_node_node_part_appendix'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -1099,11 +1141,13 @@ $result_elements{'part_node_node_part_appendix'} = [
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 'A'
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index b9d8d12e48..df083f4242 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -19,7 +19,7 @@ $result_trees{'part_node_part_appendix'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'part_node_part_appendix'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'part_node_part_appendix'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'part_node_part_appendix'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -139,7 +141,7 @@ $result_trees{'part_node_part_appendix'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -148,9 +150,11 @@ $result_trees{'part_node_part_appendix'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -170,7 +174,8 @@ $result_trees{'part_node_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -195,7 +200,7 @@ $result_trees{'part_node_part_appendix'} = [
                 'text' => 'Part 1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -210,7 +215,8 @@ $result_trees{'part_node_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -227,7 +233,7 @@ $result_trees{'part_node_part_appendix'} = [
                 'text' => 'chapter node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -247,7 +253,9 @@ $result_trees{'part_node_part_appendix'} = [
               'normalized' => 'chapter-node'
             }
           ],
-          'normalized' => 'chapter-node',
+          'normalized' => 'chapter-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -264,7 +272,7 @@ $result_trees{'part_node_part_appendix'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -280,7 +288,9 @@ $result_trees{'part_node_part_appendix'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -305,7 +315,7 @@ $result_trees{'part_node_part_appendix'} = [
                 'text' => 'Part Appendix'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -320,7 +330,8 @@ $result_trees{'part_node_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -337,7 +348,7 @@ $result_trees{'part_node_part_appendix'} = [
                 'text' => 'Appendix'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -346,7 +357,9 @@ $result_trees{'part_node_part_appendix'} = [
         ],
         'cmdname' => 'appendix',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -421,6 +434,7 @@ $result_sectioning{'part_node_part_appendix'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -438,6 +452,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                               'extra' => {
                                 'normalized' => 'chapter-node'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
@@ -448,6 +463,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                                 'part_associated_section' => {},
                                 'part_following_node' => {}
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'section_childs' => [
@@ -459,6 +475,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -483,6 +500,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                                     'extra' => {
                                       'part_associated_section' => {}
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {},
                                       'section_childs' => [
@@ -494,6 +512,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                                     }
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_level' => 1,
@@ -538,6 +557,7 @@ $result_sectioning{'part_node_part_appendix'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -601,6 +621,7 @@ $result_nodes{'part_node_part_appendix'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -616,11 +637,13 @@ $result_nodes{'part_node_part_appendix'} = {
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -639,11 +662,13 @@ $result_nodes{'part_node_part_appendix'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 'A'
@@ -690,6 +715,7 @@ $result_nodes{'part_node_part_appendix'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -699,6 +725,7 @@ $result_nodes{'part_node_part_appendix'} = {
         'node_preceding_part' => {},
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_prev' => {},
@@ -745,12 +772,14 @@ $result_menus{'part_node_part_appendix'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -766,11 +795,13 @@ $result_menus{'part_node_part_appendix'} = {
                   'associated_part' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
                   }
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -789,11 +820,13 @@ $result_menus{'part_node_part_appendix'} = {
                         'associated_part' => {
                           'cmdname' => 'part',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
                         }
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_number' => 'A'
@@ -836,6 +869,7 @@ $result_menus{'part_node_part_appendix'} = {
       'extra' => {
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_up' => {},
@@ -885,6 +919,7 @@ $result_elements{'part_node_part_appendix'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -900,11 +935,13 @@ $result_elements{'part_node_part_appendix'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -923,11 +960,13 @@ $result_elements{'part_node_part_appendix'} = [
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 'A'
diff --git a/tp/t/results/sectioning/part_node_part_node_appendix.pl 
b/tp/t/results/sectioning/part_node_part_node_appendix.pl
index d45ce649a3..580d786623 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -19,7 +19,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'part_node_part_node_appendix'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'part_node_part_node_appendix'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -188,7 +190,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -197,9 +199,11 @@ $result_trees{'part_node_part_node_appendix'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 7,
@@ -219,7 +223,8 @@ $result_trees{'part_node_part_node_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -244,7 +249,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'text' => 'Part 1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -259,7 +264,8 @@ $result_trees{'part_node_part_node_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -276,7 +282,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'text' => 'chapter node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -296,7 +302,9 @@ $result_trees{'part_node_part_node_appendix'} = [
               'normalized' => 'chapter-node'
             }
           ],
-          'normalized' => 'chapter-node',
+          'normalized' => 'chapter-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -313,7 +321,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -329,7 +337,9 @@ $result_trees{'part_node_part_node_appendix'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -354,7 +364,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'text' => 'Part Appendix'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -369,7 +379,8 @@ $result_trees{'part_node_part_node_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -386,7 +397,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'text' => 'appendix node'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -406,7 +417,9 @@ $result_trees{'part_node_part_node_appendix'} = [
               'normalized' => 'appendix-node'
             }
           ],
-          'normalized' => 'appendix-node',
+          'normalized' => 'appendix-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -423,7 +436,7 @@ $result_trees{'part_node_part_node_appendix'} = [
                 'text' => 'Appendix'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -432,7 +445,9 @@ $result_trees{'part_node_part_node_appendix'} = [
         ],
         'cmdname' => 'appendix',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -514,6 +529,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -531,6 +547,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                               'extra' => {
                                 'normalized' => 'chapter-node'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
@@ -541,6 +558,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                                 'part_associated_section' => {},
                                 'part_following_node' => {}
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'section_childs' => [
@@ -552,6 +570,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -576,6 +595,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                                     'extra' => {
                                       'normalized' => 'appendix-node'
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {}
                                     }
@@ -586,6 +606,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                                       'part_associated_section' => {},
                                       'part_following_node' => {}
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {},
                                       'section_childs' => [
@@ -597,6 +618,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                                     }
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_level' => 1,
@@ -646,6 +668,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -716,6 +739,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -731,11 +755,13 @@ $result_nodes{'part_node_part_node_appendix'} = {
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -754,11 +780,13 @@ $result_nodes{'part_node_part_node_appendix'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 'A'
@@ -810,6 +838,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -819,6 +848,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
         'node_preceding_part' => {},
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_next' => {
@@ -828,6 +858,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
             'node_preceding_part' => {},
             'normalized' => 'appendix-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'node_prev' => {},
@@ -888,12 +919,14 @@ $result_menus{'part_node_part_node_appendix'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -909,11 +942,13 @@ $result_menus{'part_node_part_node_appendix'} = {
                   'associated_part' => {
                     'cmdname' => 'part',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
                   }
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -932,11 +967,13 @@ $result_menus{'part_node_part_node_appendix'} = {
                         'associated_part' => {
                           'cmdname' => 'part',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
                         }
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_number' => 'A'
@@ -984,6 +1021,7 @@ $result_menus{'part_node_part_node_appendix'} = {
       'extra' => {
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_next' => {
@@ -991,6 +1029,7 @@ $result_menus{'part_node_part_node_appendix'} = {
           'extra' => {
             'normalized' => 'appendix-node'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_prev' => {},
@@ -1055,6 +1094,7 @@ $result_elements{'part_node_part_node_appendix'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -1070,11 +1110,13 @@ $result_elements{'part_node_part_node_appendix'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -1093,11 +1135,13 @@ $result_elements{'part_node_part_node_appendix'} = [
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 'A'
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl 
b/tp/t/results/sectioning/placed_things_before_element.pl
index bb4d11b479..a87ab30ab9 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -261,7 +261,7 @@ $result_trees{'placed_things_before_element'} = {
                   'text' => 'float anchor'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -288,7 +288,7 @@ $result_trees{'placed_things_before_element'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -297,9 +297,11 @@ $result_trees{'placed_things_before_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -312,11 +314,13 @@ $result_trees{'placed_things_before_element'} = {
               {}
             ],
             'normalized' => 'float-anchor',
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 17,
@@ -376,7 +380,7 @@ $result_trees{'placed_things_before_element'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -442,7 +446,7 @@ $result_trees{'placed_things_before_element'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -451,9 +455,11 @@ $result_trees{'placed_things_before_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -480,7 +486,7 @@ $result_trees{'placed_things_before_element'} = {
                   'text' => 'index entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -499,7 +505,9 @@ $result_trees{'placed_things_before_element'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -525,7 +533,7 @@ $result_trees{'placed_things_before_element'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -625,7 +633,7 @@ $result_trees{'placed_things_before_element'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -730,7 +738,7 @@ $result_sectioning{'placed_things_before_element'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
@@ -766,6 +774,7 @@ $result_floats{'placed_things_before_element'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index ce73b1e174..7b3fee6753 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -261,7 +261,7 @@ $result_trees{'placed_things_before_node'} = {
                   'text' => 'float anchor'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 ',
                 'spaces_before_argument' => ' '
@@ -288,7 +288,7 @@ $result_trees{'placed_things_before_node'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -297,9 +297,11 @@ $result_trees{'placed_things_before_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -312,11 +314,13 @@ $result_trees{'placed_things_before_node'} = {
               {}
             ],
             'normalized' => 'float-anchor',
-            'spaces_before_argument' => ' ',
             'type' => {
               'normalized' => ''
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 17,
@@ -376,7 +380,7 @@ $result_trees{'placed_things_before_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -442,7 +446,7 @@ $result_trees{'placed_things_before_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -451,9 +455,11 @@ $result_trees{'placed_things_before_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -480,7 +486,7 @@ $result_trees{'placed_things_before_node'} = {
                   'text' => 'index entry'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -499,7 +505,9 @@ $result_trees{'placed_things_before_node'} = {
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -525,7 +533,7 @@ $result_trees{'placed_things_before_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -545,7 +553,9 @@ $result_trees{'placed_things_before_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -562,7 +572,7 @@ $result_trees{'placed_things_before_node'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -662,7 +672,8 @@ $result_trees{'placed_things_before_node'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -775,9 +786,11 @@ $result_sectioning{'placed_things_before_node'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -795,17 +808,20 @@ $result_nodes{'placed_things_before_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'placed_things_before_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'placed_things_before_node'} = [
@@ -831,6 +847,7 @@ $result_floats{'placed_things_before_node'} = {
           'normalized' => ''
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index 3931a7ffff..47372f5e71 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -25,7 +25,7 @@ $result_trees{'protected_node_parentheses'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'protected_node_parentheses'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'protected_node_parentheses'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -79,7 +81,7 @@ $result_trees{'protected_node_parentheses'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -164,7 +166,7 @@ $result_trees{'protected_node_parentheses'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -173,9 +175,11 @@ $result_trees{'protected_node_parentheses'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -195,7 +199,8 @@ $result_trees{'protected_node_parentheses'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -230,7 +235,7 @@ $result_trees{'protected_node_parentheses'} = {
               'text' => 'manual) name'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -367,7 +372,9 @@ $result_trees{'protected_node_parentheses'} = {
             'normalized' => '_0028manual_0029-name'
           }
         ],
-        'normalized' => '_0028manual_0029-name',
+        'normalized' => '_0028manual_0029-name'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -432,9 +439,11 @@ $result_sectioning{'protected_node_parentheses'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -452,6 +461,7 @@ $result_nodes{'protected_node_parentheses'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -461,12 +471,14 @@ $result_nodes{'protected_node_parentheses'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_0028manual_0029-name'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -484,12 +496,14 @@ $result_menus{'protected_node_parentheses'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => '_0028manual_0029-name'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/raiselowersections.pl 
b/tp/t/results/sectioning/raiselowersections.pl
index 94b619bd96..2e882406fc 100644
--- a/tp/t/results/sectioning/raiselowersections.pl
+++ b/tp/t/results/sectioning/raiselowersections.pl
@@ -49,7 +49,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -69,7 +69,9 @@ $result_trees{'raiselowersections'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -81,7 +83,7 @@ $result_trees{'raiselowersections'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -93,7 +95,7 @@ $result_trees{'raiselowersections'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -208,7 +210,7 @@ $result_trees{'raiselowersections'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -217,9 +219,11 @@ $result_trees{'raiselowersections'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -254,7 +258,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -274,7 +278,9 @@ $result_trees{'raiselowersections'} = {
             'normalized' => 'Chapter'
           }
         ],
-        'normalized' => 'Chapter',
+        'normalized' => 'Chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -291,7 +297,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -308,7 +314,7 @@ $result_trees{'raiselowersections'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -374,7 +380,7 @@ $result_trees{'raiselowersections'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -383,9 +389,11 @@ $result_trees{'raiselowersections'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -480,7 +488,8 @@ $result_trees{'raiselowersections'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -497,7 +506,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Chapter in included file'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -517,7 +526,9 @@ $result_trees{'raiselowersections'} = {
             'normalized' => 'Chapter-in-included-file'
           }
         ],
-        'normalized' => 'Chapter-in-included-file',
+        'normalized' => 'Chapter-in-included-file'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -534,7 +545,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Chapter in included file'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -551,7 +562,7 @@ $result_trees{'raiselowersections'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -617,7 +628,7 @@ $result_trees{'raiselowersections'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -626,9 +637,11 @@ $result_trees{'raiselowersections'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'section_file.texi',
                 'line_nr' => 17,
@@ -649,7 +662,9 @@ $result_trees{'raiselowersections'} = {
         }
       ],
       'extra' => {
-        'sections_level' => -1,
+        'sections_level' => -1
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -666,7 +681,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -686,7 +701,9 @@ $result_trees{'raiselowersections'} = {
             'normalized' => 'Section'
           }
         ],
-        'normalized' => 'Section',
+        'normalized' => 'Section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -703,7 +720,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -720,7 +737,7 @@ $result_trees{'raiselowersections'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -786,7 +803,7 @@ $result_trees{'raiselowersections'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -795,9 +812,11 @@ $result_trees{'raiselowersections'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'section_file.texi',
                 'line_nr' => 24,
@@ -818,7 +837,9 @@ $result_trees{'raiselowersections'} = {
         }
       ],
       'extra' => {
-        'sections_level' => -1,
+        'sections_level' => -1
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -835,7 +856,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -855,7 +876,9 @@ $result_trees{'raiselowersections'} = {
             'normalized' => 'Subsection'
           }
         ],
-        'normalized' => 'Subsection',
+        'normalized' => 'Subsection'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -872,7 +895,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -929,7 +952,9 @@ $result_trees{'raiselowersections'} = {
         }
       ],
       'extra' => {
-        'sections_level' => -1,
+        'sections_level' => -1
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -946,7 +971,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Second chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -966,7 +991,9 @@ $result_trees{'raiselowersections'} = {
             'normalized' => 'Second-chapter'
           }
         ],
-        'normalized' => 'Second-chapter',
+        'normalized' => 'Second-chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -983,7 +1010,7 @@ $result_trees{'raiselowersections'} = {
               'text' => 'Second chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1027,7 +1054,8 @@ $result_trees{'raiselowersections'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1174,6 +1202,7 @@ $result_sectioning{'raiselowersections'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
@@ -1187,9 +1216,11 @@ $result_sectioning{'raiselowersections'} = {
                   'extra' => {
                     'normalized' => 'Chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -1200,10 +1231,12 @@ $result_sectioning{'raiselowersections'} = {
                         'extra' => {
                           'normalized' => 'Chapter-in-included-file'
                         },
+                        'info' => {},
                         'structure' => {}
                       },
                       'sections_level' => -1
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -1214,10 +1247,12 @@ $result_sectioning{'raiselowersections'} = {
                               'extra' => {
                                 'normalized' => 'Section'
                               },
+                              'info' => {},
                               'structure' => {}
                             },
                             'sections_level' => -1
                           },
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
@@ -1228,10 +1263,12 @@ $result_sectioning{'raiselowersections'} = {
                                     'extra' => {
                                       'normalized' => 'Subsection'
                                     },
+                                    'info' => {},
                                     'structure' => {}
                                   },
                                   'sections_level' => -1
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.1',
@@ -1266,9 +1303,11 @@ $result_sectioning{'raiselowersections'} = {
                   'extra' => {
                     'normalized' => 'Second-chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -1314,6 +1353,7 @@ $result_nodes{'raiselowersections'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1321,6 +1361,7 @@ $result_nodes{'raiselowersections'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1332,6 +1373,7 @@ $result_nodes{'raiselowersections'} = {
         ],
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1341,6 +1383,7 @@ $result_nodes{'raiselowersections'} = {
               'extra' => {
                 'sections_level' => -1
               },
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
@@ -1352,6 +1395,7 @@ $result_nodes{'raiselowersections'} = {
             ],
             'normalized' => 'Chapter-in-included-file'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -1361,6 +1405,7 @@ $result_nodes{'raiselowersections'} = {
                   'extra' => {
                     'sections_level' => -1
                   },
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.1.1'
                   }
@@ -1372,6 +1417,7 @@ $result_nodes{'raiselowersections'} = {
                 ],
                 'normalized' => 'Section'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
@@ -1381,12 +1427,14 @@ $result_nodes{'raiselowersections'} = {
                       'extra' => {
                         'sections_level' => -1
                       },
+                      'info' => {},
                       'structure' => {
                         'section_number' => '1.1.1.1'
                       }
                     },
                     'normalized' => 'Subsection'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_up' => {}
                   }
@@ -1403,12 +1451,14 @@ $result_nodes{'raiselowersections'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'Second-chapter'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -1435,30 +1485,35 @@ $result_menus{'raiselowersections'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Chapter-in-included-file'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Section'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'Subsection'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_up' => {},
                     'menu_up_hash' => {
@@ -1483,6 +1538,7 @@ $result_menus{'raiselowersections'} = {
           'extra' => {
             'normalized' => 'Second-chapter'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/sectioning/rec_nodes.pl 
b/tp/t/results/sectioning/rec_nodes.pl
index b1f2939a74..b236e1354e 100644
--- a/tp/t/results/sectioning/rec_nodes.pl
+++ b/tp/t/results/sectioning/rec_nodes.pl
@@ -18,7 +18,7 @@ $result_trees{'rec_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,7 @@ $result_trees{'rec_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -159,7 +159,7 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -168,9 +168,11 @@ $result_trees{'rec_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -202,7 +204,9 @@ $result_trees{'rec_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -238,7 +242,7 @@ $result_trees{'rec_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -255,7 +259,7 @@ $result_trees{'rec_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -370,7 +374,7 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -379,9 +383,11 @@ $result_trees{'rec_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -426,7 +432,9 @@ $result_trees{'rec_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'second-node',
+        'normalized' => 'second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -457,7 +465,7 @@ $result_trees{'rec_nodes'} = {
               'text' => 'second node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -474,7 +482,7 @@ $result_trees{'rec_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -540,7 +548,7 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -549,9 +557,11 @@ $result_trees{'rec_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -591,7 +601,9 @@ $result_trees{'rec_nodes'} = {
             'normalized' => 'second-node'
           }
         ],
-        'normalized' => 'other-node',
+        'normalized' => 'other-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -622,7 +634,7 @@ $result_trees{'rec_nodes'} = {
               'text' => 'node following second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -634,7 +646,7 @@ $result_trees{'rec_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -700,7 +712,7 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -709,9 +721,11 @@ $result_trees{'rec_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -765,7 +779,9 @@ $result_trees{'rec_nodes'} = {
             'normalized' => 'node-following-second'
           }
         ],
-        'normalized' => 'node-up-node-following-second',
+        'normalized' => 'node-up-node-following-second'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -796,7 +812,7 @@ $result_trees{'rec_nodes'} = {
               'text' => 'node up node following second'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -822,7 +838,7 @@ $result_trees{'rec_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -888,7 +904,7 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -897,9 +913,11 @@ $result_trees{'rec_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -934,7 +952,9 @@ $result_trees{'rec_nodes'} = {
             'normalized' => 'node-up-node-following-second'
           }
         ],
-        'normalized' => 'node-following-second',
+        'normalized' => 'node-following-second'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1044,6 +1064,7 @@ $result_nodes{'rec_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1055,6 +1076,7 @@ $result_nodes{'rec_nodes'} = {
         ],
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -1066,6 +1088,7 @@ $result_nodes{'rec_nodes'} = {
             ],
             'normalized' => 'other-node'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {},
             'node_up' => {}
@@ -1089,18 +1112,21 @@ $result_menus{'rec_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'other-node'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {},
             'menu_next' => {},
@@ -1116,12 +1142,14 @@ $result_menus{'rec_nodes'} = {
           'extra' => {
             'normalized' => 'node-following-second'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'node-up-node-following-second'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {},
                 'menu_up' => {},
diff --git a/tp/t/results/sectioning/ref_to_top.pl 
b/tp/t/results/sectioning/ref_to_top.pl
index b0bc9b2460..7b01aba070 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -25,7 +25,7 @@ $result_trees{'ref_to_top'} = {
               'text' => 'ToP'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'ref_to_top'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'ref_to_top'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +115,8 @@ $result_trees{'ref_to_top'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -155,9 +158,11 @@ $result_sectioning{'ref_to_top'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -175,17 +180,20 @@ $result_nodes{'ref_to_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'ref_to_top'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'ref_to_top'} = [
diff --git a/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl 
b/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
index 132c1230db..9b05288e2e 100644
--- a/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
@@ -34,7 +34,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -54,7 +54,9 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -71,7 +73,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +88,8 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -103,7 +106,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'text' => "\x{2000}\x{2001}\x{2002}"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -123,7 +126,9 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
             'normalized' => '_2002_2003_2002'
           }
         ],
-        'normalized' => '_2002_2003_2002',
+        'normalized' => '_2002_2003_2002'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -140,7 +145,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               'text' => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -164,7 +169,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                       'text' => "\x{2000}\x{2001}\x{2002}"
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -175,7 +180,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                       'text' => "\x{2000}\x{2001}\x{2002}"
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -210,7 +215,8 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -242,7 +248,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -258,7 +264,9 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
             ],
             'normalized' => '_2002_2003_2002'
           }
-        ],
+        ]
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -290,7 +298,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -352,7 +360,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
                       }
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'brace_command_arg'
@@ -392,7 +400,8 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -470,9 +479,11 @@ 
$result_sectioning{'reference_to_only_special_spaces_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -483,9 +494,11 @@ 
$result_sectioning{'reference_to_only_special_spaces_node'} = {
                   'extra' => {
                     'normalized' => '_2002_2003_2002'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -499,9 +512,11 @@ 
$result_sectioning{'reference_to_only_special_spaces_node'} = {
               'extra' => {
                 'associated_node' => {
                   'cmdname' => 'node',
-                  'extra' => {}
+                  'extra' => {},
+                  'info' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -535,10 +550,12 @@ $result_nodes{'reference_to_only_special_spaces_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -546,12 +563,14 @@ $result_nodes{'reference_to_only_special_spaces_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => '_2002_2003_2002'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -559,11 +578,13 @@ $result_nodes{'reference_to_only_special_spaces_node'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             }
-          }
+          },
+          'info' => {}
         },
         'node_prev' => {},
         'node_up' => {}
@@ -579,6 +600,7 @@ $result_menus{'reference_to_only_special_spaces_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index f1da7b7e32..574d0aa96a 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -24,7 +24,7 @@ $result_trees{'section_before_after_top_node'} = {
               'text' => 'before'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -39,7 +39,8 @@ $result_trees{'section_before_after_top_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +57,7 @@ $result_trees{'section_before_after_top_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +77,9 @@ $result_trees{'section_before_after_top_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'section_before_after_top_node'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -108,7 +111,8 @@ $result_trees{'section_before_after_top_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -125,7 +129,7 @@ $result_trees{'section_before_after_top_node'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -149,7 +153,8 @@ $result_trees{'section_before_after_top_node'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -193,6 +198,7 @@ $result_sectioning{'section_before_after_top_node'} = {
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_up' => {}
@@ -205,9 +211,11 @@ $result_sectioning{'section_before_after_top_node'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_prev' => {},
@@ -218,6 +226,7 @@ $result_sectioning{'section_before_after_top_node'} = {
       {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -246,17 +255,20 @@ $result_nodes{'section_before_after_top_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'section_before_after_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'section_before_after_top_node'} = [
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index eb5bf30ba1..be7c216f50 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -24,7 +24,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
               'text' => 'before'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -39,7 +39,8 @@ $result_trees{'section_before_after_top_node_last_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +57,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +77,9 @@ $result_trees{'section_before_after_top_node_last_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
               'text' => 'top section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -108,7 +111,8 @@ $result_trees{'section_before_after_top_node_last_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -125,7 +129,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
               'text' => 'Chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -154,7 +158,8 @@ $result_trees{'section_before_after_top_node_last_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -171,7 +176,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
               'text' => 'node after'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -191,7 +196,9 @@ $result_trees{'section_before_after_top_node_last_node'} = {
             'normalized' => 'node-after'
           }
         ],
-        'normalized' => 'node-after',
+        'normalized' => 'node-after'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -240,6 +247,7 @@ 
$result_sectioning{'section_before_after_top_node_last_node'} = {
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_up' => {}
@@ -253,9 +261,11 @@ 
$result_sectioning{'section_before_after_top_node_last_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_prev' => {},
@@ -266,6 +276,7 @@ 
$result_sectioning{'section_before_after_top_node_last_node'} = {
       {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
@@ -294,16 +305,19 @@ $result_nodes{'section_before_after_top_node_last_node'} 
= {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node-after'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {}
       }
@@ -317,6 +331,7 @@ $result_menus{'section_before_after_top_node_last_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/section_before_chapter.pl 
b/tp/t/results/sectioning/section_before_chapter.pl
index edca43e91b..cf1e3eaeeb 100644
--- a/tp/t/results/sectioning/section_before_chapter.pl
+++ b/tp/t/results/sectioning/section_before_chapter.pl
@@ -18,7 +18,7 @@ $result_trees{'section_before_chapter'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -33,7 +33,7 @@ $result_trees{'section_before_chapter'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +50,7 @@ $result_trees{'section_before_chapter'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -58,7 +58,7 @@ $result_trees{'section_before_chapter'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -89,7 +89,7 @@ $result_sectioning{'section_before_chapter'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
@@ -98,7 +98,7 @@ $result_sectioning{'section_before_chapter'} = {
       },
       {
         'cmdname' => 'chapter',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 2,
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index 1493e10888..7b4d740b74 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -24,7 +24,7 @@ $result_trees{'section_before_part'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -39,7 +39,7 @@ $result_trees{'section_before_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +56,7 @@ $result_trees{'section_before_part'} = {
               'text' => 'part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -86,7 +86,8 @@ $result_trees{'section_before_part'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -120,7 +121,7 @@ $result_sectioning{'section_before_part'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
@@ -130,6 +131,7 @@ $result_sectioning{'section_before_part'} = {
       {
         'cmdname' => 'part',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index 8fa4a5d99a..edd95c1b2a 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -32,7 +32,7 @@ $result_trees{'section_before_top'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -60,7 +60,9 @@ $result_trees{'section_before_top'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'section-node',
+        'normalized' => 'section-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -77,7 +79,7 @@ $result_trees{'section_before_top'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -92,7 +94,8 @@ $result_trees{'section_before_top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -109,7 +112,7 @@ $result_trees{'section_before_top'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -129,7 +132,9 @@ $result_trees{'section_before_top'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -146,7 +151,7 @@ $result_trees{'section_before_top'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -163,7 +168,7 @@ $result_trees{'section_before_top'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -229,7 +234,7 @@ $result_trees{'section_before_top'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -238,9 +243,11 @@ $result_trees{'section_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -255,7 +262,8 @@ $result_trees{'section_before_top'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -307,9 +315,11 @@ $result_sectioning{'section_before_top'} = {
             'extra' => {
               'normalized' => 'section-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
@@ -324,9 +334,11 @@ $result_sectioning{'section_before_top'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_prev' => {},
@@ -349,6 +361,7 @@ $result_nodes{'section_before_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -358,6 +371,7 @@ $result_nodes{'section_before_top'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -365,12 +379,14 @@ $result_nodes{'section_before_top'} = {
         'associated_section' => {
           'cmdname' => 'section',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'section-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -388,12 +404,14 @@ $result_menus{'section_before_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'section-node'
       },
+      'info' => {},
       'structure' => {
         'menu_up' => {},
         'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/section_before_top_no_node.pl 
b/tp/t/results/sectioning/section_before_top_no_node.pl
index 33bf30097e..ffb7b4bf1a 100644
--- a/tp/t/results/sectioning/section_before_top_no_node.pl
+++ b/tp/t/results/sectioning/section_before_top_no_node.pl
@@ -18,7 +18,7 @@ $result_trees{'section_before_top_no_node'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -33,7 +33,7 @@ $result_trees{'section_before_top_no_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +50,7 @@ $result_trees{'section_before_top_no_node'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -58,7 +58,7 @@ $result_trees{'section_before_top_no_node'} = {
         }
       ],
       'cmdname' => 'top',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -89,7 +89,7 @@ $result_sectioning{'section_before_top_no_node'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
@@ -98,7 +98,7 @@ $result_sectioning{'section_before_top_no_node'} = {
       },
       {
         'cmdname' => 'top',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_prev' => {},
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 854f8e6d76..131286f22f 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -55,7 +55,7 @@ $result_trees{'section_below_unnumbered'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -75,7 +75,9 @@ $result_trees{'section_below_unnumbered'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -92,7 +94,7 @@ $result_trees{'section_below_unnumbered'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -123,7 +125,7 @@ $result_trees{'section_below_unnumbered'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -189,7 +191,7 @@ $result_trees{'section_below_unnumbered'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -198,9 +200,11 @@ $result_trees{'section_below_unnumbered'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -225,7 +229,8 @@ $result_trees{'section_below_unnumbered'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -242,7 +247,7 @@ $result_trees{'section_below_unnumbered'} = {
               'text' => 'Unn'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -262,7 +267,9 @@ $result_trees{'section_below_unnumbered'} = {
             'normalized' => 'Unn'
           }
         ],
-        'normalized' => 'Unn',
+        'normalized' => 'Unn'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -279,7 +286,7 @@ $result_trees{'section_below_unnumbered'} = {
               'text' => 'Unn'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -296,7 +303,7 @@ $result_trees{'section_below_unnumbered'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -362,7 +369,7 @@ $result_trees{'section_below_unnumbered'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -371,9 +378,11 @@ $result_trees{'section_below_unnumbered'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -393,7 +402,8 @@ $result_trees{'section_below_unnumbered'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -410,7 +420,7 @@ $result_trees{'section_below_unnumbered'} = {
               'text' => 'Sec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -430,7 +440,9 @@ $result_trees{'section_below_unnumbered'} = {
             'normalized' => 'Sec'
           }
         ],
-        'normalized' => 'Sec',
+        'normalized' => 'Sec'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -447,7 +459,7 @@ $result_trees{'section_below_unnumbered'} = {
               'text' => 'Sec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -476,7 +488,8 @@ $result_trees{'section_below_unnumbered'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -570,9 +583,11 @@ $result_sectioning{'section_below_unnumbered'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -583,9 +598,11 @@ $result_sectioning{'section_below_unnumbered'} = {
                   'extra' => {
                     'normalized' => 'Unn'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -596,9 +613,11 @@ $result_sectioning{'section_below_unnumbered'} = {
                         'extra' => {
                           'normalized' => 'Sec'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_up' => {}
@@ -632,6 +651,7 @@ $result_nodes{'section_below_unnumbered'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -641,6 +661,7 @@ $result_nodes{'section_below_unnumbered'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -648,6 +669,7 @@ $result_nodes{'section_below_unnumbered'} = {
         'associated_section' => {
           'cmdname' => 'unnumbered',
           'extra' => {},
+          'info' => {},
           'structure' => {}
         },
         'menus' => [
@@ -657,6 +679,7 @@ $result_nodes{'section_below_unnumbered'} = {
         ],
         'normalized' => 'Unn'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -664,10 +687,12 @@ $result_nodes{'section_below_unnumbered'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             },
             'normalized' => 'Sec'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -689,18 +714,21 @@ $result_menus{'section_below_unnumbered'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Unn'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Sec'
           },
+          'info' => {},
           'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl 
b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
index 850f275dee..26084b87a4 100644
--- a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
@@ -24,7 +24,7 @@ $result_trees{'section_below_unnumbered_no_top'} = {
               'text' => 'U'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -32,7 +32,7 @@ $result_trees{'section_below_unnumbered_no_top'} = {
         }
       ],
       'cmdname' => 'unnumbered',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -49,7 +49,7 @@ $result_trees{'section_below_unnumbered_no_top'} = {
               'text' => 'S'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -57,7 +57,7 @@ $result_trees{'section_below_unnumbered_no_top'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -86,12 +86,12 @@ $result_sectioning{'section_below_unnumbered_no_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'section',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_up' => {}
diff --git a/tp/t/results/sectioning/section_chapter_before_top.pl 
b/tp/t/results/sectioning/section_chapter_before_top.pl
index 0978944cb8..f1d500ceb2 100644
--- a/tp/t/results/sectioning/section_chapter_before_top.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top.pl
@@ -18,7 +18,7 @@ $result_trees{'section_chapter_before_top'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -33,7 +33,7 @@ $result_trees{'section_chapter_before_top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +50,7 @@ $result_trees{'section_chapter_before_top'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -65,7 +65,7 @@ $result_trees{'section_chapter_before_top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -82,7 +82,7 @@ $result_trees{'section_chapter_before_top'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -90,7 +90,7 @@ $result_trees{'section_chapter_before_top'} = {
         }
       ],
       'cmdname' => 'top',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -126,7 +126,7 @@ $result_sectioning{'section_chapter_before_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
@@ -135,7 +135,7 @@ $result_sectioning{'section_chapter_before_top'} = {
       },
       {
         'cmdname' => 'chapter',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 2,
@@ -146,7 +146,7 @@ $result_sectioning{'section_chapter_before_top'} = {
       },
       {
         'cmdname' => 'top',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_prev' => {},
diff --git a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl 
b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
index 1e5e2210b1..03d67f514f 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -24,7 +24,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'text' => 'section node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'section_chapter_before_top_nodes'} = {
             'normalized' => 'section-node'
           }
         ],
-        'normalized' => 'section-node',
+        'normalized' => 'section-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'section_chapter_before_top_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'text' => 'chapter node'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +116,9 @@ $result_trees{'section_chapter_before_top_nodes'} = {
             'normalized' => 'chapter-node'
           }
         ],
-        'normalized' => 'chapter-node',
+        'normalized' => 'chapter-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -130,7 +135,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -147,7 +152,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -213,7 +218,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -222,9 +227,11 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -244,7 +251,8 @@ $result_trees{'section_chapter_before_top_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -261,7 +269,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -281,7 +289,9 @@ $result_trees{'section_chapter_before_top_nodes'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -298,7 +308,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -315,7 +325,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -381,7 +391,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -390,9 +400,11 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -412,7 +424,8 @@ $result_trees{'section_chapter_before_top_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -481,9 +494,11 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
             'extra' => {
               'normalized' => 'section-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
@@ -498,9 +513,11 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
             'extra' => {
               'normalized' => 'chapter-node'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 2,
@@ -517,9 +534,11 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_prev' => {},
@@ -545,6 +564,7 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -554,6 +574,7 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -561,6 +582,7 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 2
           }
@@ -572,6 +594,7 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
         ],
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -579,12 +602,14 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 1
               }
             },
             'normalized' => 'section-node'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {},
             'node_up' => {}
@@ -610,18 +635,21 @@ $result_menus{'section_chapter_before_top_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter-node'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section-node'
           },
+          'info' => {},
           'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl 
b/tp/t/results/sectioning/section_in_unnumbered_info.pl
index ab5b798fc5..3bcbb908a6 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -25,7 +25,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'Test section in unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +115,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -375,7 +377,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -384,9 +386,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -406,7 +410,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -423,7 +428,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -443,7 +448,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -460,7 +467,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -477,7 +484,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -543,7 +550,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -552,9 +559,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -574,7 +583,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -591,7 +601,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -611,7 +621,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'section-in-chapter'
           }
         ],
-        'normalized' => 'section-in-chapter',
+        'normalized' => 'section-in-chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -628,7 +640,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -643,7 +655,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -660,7 +673,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -680,7 +693,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumbered'
           }
         ],
-        'normalized' => 'unnumbered',
+        'normalized' => 'unnumbered'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -697,7 +712,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -714,7 +729,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -780,7 +795,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -789,9 +804,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -811,7 +828,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -828,7 +846,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'section in unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -848,7 +866,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'section-in-unnumbered'
           }
         ],
-        'normalized' => 'section-in-unnumbered',
+        'normalized' => 'section-in-unnumbered'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -865,7 +885,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'section in unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -880,7 +900,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -897,7 +918,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -917,7 +938,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'chapter-2'
           }
         ],
-        'normalized' => 'chapter-2',
+        'normalized' => 'chapter-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -934,7 +957,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -951,7 +974,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1066,7 +1089,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1075,9 +1098,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 43,
@@ -1097,7 +1122,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1114,7 +1140,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumberedsec 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1134,7 +1160,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumberedsec-2'
           }
         ],
-        'normalized' => 'unnumberedsec-2',
+        'normalized' => 'unnumberedsec-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1151,7 +1179,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered section 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1168,7 +1196,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1381,7 +1409,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1390,9 +1418,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 53,
@@ -1412,7 +1442,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1429,7 +1460,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered sub 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1449,7 +1480,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumbered-sub-2'
           }
         ],
-        'normalized' => 'unnumbered-sub-2',
+        'normalized' => 'unnumbered-sub-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1466,7 +1499,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered subsection 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1481,7 +1514,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1498,7 +1532,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered sub 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1518,7 +1552,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'numbered-sub-2'
           }
         ],
-        'normalized' => 'numbered-sub-2',
+        'normalized' => 'numbered-sub-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1535,7 +1571,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered subsection 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1550,7 +1586,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1567,7 +1604,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered sub2 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1587,7 +1624,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumbered-sub2-2'
           }
         ],
-        'normalized' => 'unnumbered-sub2-2',
+        'normalized' => 'unnumbered-sub2-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1604,7 +1643,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered subsection2 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1619,7 +1658,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1636,7 +1676,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered sub2 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1656,7 +1696,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'numbered-sub2-2'
           }
         ],
-        'normalized' => 'numbered-sub2-2',
+        'normalized' => 'numbered-sub2-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1673,7 +1715,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered subsection2 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1688,7 +1730,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1705,7 +1748,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumberedsec 2-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1725,7 +1768,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumberedsec-2_002d1'
           }
         ],
-        'normalized' => 'unnumberedsec-2_002d1',
+        'normalized' => 'unnumberedsec-2_002d1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1742,7 +1787,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumberedsec 2-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1759,7 +1804,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1825,7 +1870,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1834,9 +1879,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 72,
@@ -1856,7 +1903,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1873,7 +1921,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered sub 2-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1893,7 +1941,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'numbered-sub-2_002d1'
           }
         ],
-        'normalized' => 'numbered-sub-2_002d1',
+        'normalized' => 'numbered-sub-2_002d1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1910,7 +1960,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered subsection 2-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1930,7 +1980,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1947,7 +1998,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'chapter 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1967,7 +2018,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'chapter-3'
           }
         ],
-        'normalized' => 'chapter-3',
+        'normalized' => 'chapter-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1984,7 +2037,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'chapter 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2001,7 +2054,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2263,7 +2316,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2272,9 +2325,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 87,
@@ -2294,7 +2349,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2311,7 +2367,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumberedsec 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2331,7 +2387,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumberedsec-3'
           }
         ],
-        'normalized' => 'unnumberedsec-3',
+        'normalized' => 'unnumberedsec-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2348,7 +2406,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered section 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2365,7 +2423,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2578,7 +2636,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2587,9 +2645,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 97,
@@ -2609,7 +2669,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2626,7 +2687,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered sub 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2646,7 +2707,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumbered-sub-3'
           }
         ],
-        'normalized' => 'unnumbered-sub-3',
+        'normalized' => 'unnumbered-sub-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2663,7 +2726,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered subsection 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2678,7 +2741,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2695,7 +2759,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered sub 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2715,7 +2779,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'numbered-sub-3'
           }
         ],
-        'normalized' => 'numbered-sub-3',
+        'normalized' => 'numbered-sub-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2732,7 +2798,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered subsection 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2747,7 +2813,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2764,7 +2831,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered sub2 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2784,7 +2851,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumbered-sub2-3'
           }
         ],
-        'normalized' => 'unnumbered-sub2-3',
+        'normalized' => 'unnumbered-sub2-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2801,7 +2870,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered subsection2 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2816,7 +2885,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2833,7 +2903,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered sub2 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2853,7 +2923,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'numbered-sub2-3'
           }
         ],
-        'normalized' => 'numbered-sub2-3',
+        'normalized' => 'numbered-sub2-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2870,7 +2942,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered subsection2 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2885,7 +2957,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2902,7 +2975,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'section 3-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2922,7 +2995,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'section-3_002d1'
           }
         ],
-        'normalized' => 'section-3_002d1',
+        'normalized' => 'section-3_002d1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2939,7 +3014,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'section 3-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2954,7 +3029,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2971,7 +3047,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumberedsec 3-2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2991,7 +3067,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumberedsec-3_002d2'
           }
         ],
-        'normalized' => 'unnumberedsec-3_002d2',
+        'normalized' => 'unnumberedsec-3_002d2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3008,7 +3086,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumberedsec 3-2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3025,7 +3103,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3091,7 +3169,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3100,9 +3178,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 119,
@@ -3122,7 +3202,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3139,7 +3220,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered sub 3-2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3159,7 +3240,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'numbered-sub-3_002d2'
           }
         ],
-        'normalized' => 'numbered-sub-3_002d2',
+        'normalized' => 'numbered-sub-3_002d2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3176,7 +3259,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered subsection 3-2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3191,7 +3274,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3208,7 +3292,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'section 3-3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3228,7 +3312,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'section-3_002d3'
           }
         ],
-        'normalized' => 'section-3_002d3',
+        'normalized' => 'section-3_002d3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3245,7 +3331,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'section 3-3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3262,7 +3348,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3328,7 +3414,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3337,9 +3423,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 129,
@@ -3359,7 +3447,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3376,7 +3465,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'subsection 3-3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3396,7 +3485,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'subsection-3_002d3'
           }
         ],
-        'normalized' => 'subsection-3_002d3',
+        'normalized' => 'subsection-3_002d3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3413,7 +3504,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'subsection 3-3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3428,7 +3519,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3445,7 +3537,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumberedsec 3-4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3465,7 +3557,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumberedsec-3_002d4'
           }
         ],
-        'normalized' => 'unnumberedsec-3_002d4',
+        'normalized' => 'unnumberedsec-3_002d4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3482,7 +3576,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumberedsec 3-4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3499,7 +3593,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3565,7 +3659,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3574,9 +3668,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 139,
@@ -3596,7 +3692,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3613,7 +3710,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered sub 3-4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3633,7 +3730,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'numbered-sub-3_002d4'
           }
         ],
-        'normalized' => 'numbered-sub-3_002d4',
+        'normalized' => 'numbered-sub-3_002d4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3650,7 +3749,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered subsection 3-4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3665,7 +3764,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3682,7 +3782,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3702,7 +3802,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumbered-4'
           }
         ],
-        'normalized' => 'unnumbered-4',
+        'normalized' => 'unnumbered-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3719,7 +3821,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered  4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3736,7 +3838,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3802,7 +3904,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3811,9 +3913,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 149,
@@ -3833,7 +3937,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3850,7 +3955,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumberedsec 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3870,7 +3975,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumberedsec-4'
           }
         ],
-        'normalized' => 'unnumberedsec-4',
+        'normalized' => 'unnumberedsec-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3887,7 +3994,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered section 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3904,7 +4011,7 @@ $result_trees{'section_in_unnumbered_info'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4117,7 +4224,7 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4126,9 +4233,11 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 159,
@@ -4148,7 +4257,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4165,7 +4275,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered sub 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4185,7 +4295,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumbered-sub-4'
           }
         ],
-        'normalized' => 'unnumbered-sub-4',
+        'normalized' => 'unnumbered-sub-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4202,7 +4314,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered subsection 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4217,7 +4329,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4234,7 +4347,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered sub 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4254,7 +4367,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'numbered-sub-4'
           }
         ],
-        'normalized' => 'numbered-sub-4',
+        'normalized' => 'numbered-sub-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4271,7 +4386,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered subsection 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4286,7 +4401,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4303,7 +4419,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered sub2 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4323,7 +4439,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'unnumbered-sub2-4'
           }
         ],
-        'normalized' => 'unnumbered-sub2-4',
+        'normalized' => 'unnumbered-sub2-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4340,7 +4458,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'unnumbered subsection2 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4355,7 +4473,8 @@ $result_trees{'section_in_unnumbered_info'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4372,7 +4491,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered sub2 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4392,7 +4511,9 @@ $result_trees{'section_in_unnumbered_info'} = {
             'normalized' => 'numbered-sub2-4'
           }
         ],
-        'normalized' => 'numbered-sub2-4',
+        'normalized' => 'numbered-sub2-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4409,7 +4530,7 @@ $result_trees{'section_in_unnumbered_info'} = {
               'text' => 'numbered subsection2 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4417,7 +4538,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         }
       ],
       'cmdname' => 'subsection',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4887,9 +5009,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -4900,9 +5024,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -4913,9 +5039,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'section-in-chapter'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -4938,9 +5066,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'unnumbered'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -4951,9 +5081,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'section-in-unnumbered'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_up' => {}
@@ -4975,9 +5107,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'chapter-2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -4988,9 +5122,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5001,9 +5137,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5017,9 +5155,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5034,9 +5174,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5051,9 +5193,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5073,9 +5217,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-2_002d1'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5086,9 +5232,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-2_002d1'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5117,9 +5265,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'chapter-3'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -5130,9 +5280,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5143,9 +5295,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5159,9 +5313,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5176,9 +5332,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5193,9 +5351,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5215,9 +5375,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'section-3_002d1'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '3.1',
@@ -5233,9 +5395,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3_002d2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5246,9 +5410,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3_002d2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5268,9 +5434,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'section-3_002d3'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5281,9 +5449,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'subsection-3_002d3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '3.2.1',
@@ -5305,9 +5475,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3_002d4'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5318,9 +5490,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3_002d4'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5349,9 +5523,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'unnumbered-4'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -5362,9 +5538,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-4'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5375,9 +5553,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-4'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5391,9 +5571,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-4'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5408,9 +5590,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-4'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5425,9 +5609,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-4'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5523,6 +5709,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -5532,6 +5719,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -5539,6 +5727,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -5550,6 +5739,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -5557,12 +5747,14 @@ $result_nodes{'section_in_unnumbered_info'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
             },
             'normalized' => 'section-in-chapter'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -5573,6 +5765,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
             'associated_section' => {
               'cmdname' => 'unnumbered',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             },
             'menus' => [
@@ -5582,6 +5775,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
             ],
             'normalized' => 'unnumbered'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -5589,10 +5783,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {}
                 },
                 'normalized' => 'section-in-unnumbered'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -5603,6 +5799,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 2
                   }
@@ -5614,6 +5811,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                 ],
                 'normalized' => 'chapter-2'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
@@ -5621,6 +5819,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                     'associated_section' => {
                       'cmdname' => 'unnumberedsec',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {}
                     },
                     'menus' => [
@@ -5630,6 +5829,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                     ],
                     'normalized' => 'unnumberedsec-2'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
@@ -5637,10 +5837,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsubsec',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {}
                         },
                         'normalized' => 'unnumbered-sub-2'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_next' => {
                           'cmdname' => 'node',
@@ -5648,10 +5850,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                             'associated_section' => {
                               'cmdname' => 'subsection',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {}
                             },
                             'normalized' => 'numbered-sub-2'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
@@ -5659,10 +5863,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsubsec',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {}
                                 },
                                 'normalized' => 'unnumbered-sub2-2'
                               },
+                              'info' => {},
                               'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
@@ -5670,10 +5876,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {}
                                     },
                                     'normalized' => 'numbered-sub2-2'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_prev' => {},
                                     'node_up' => {}
@@ -5696,6 +5904,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsec',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {}
                         },
                         'menus' => [
@@ -5705,6 +5914,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         ],
                         'normalized' => 'unnumberedsec-2_002d1'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
@@ -5712,10 +5922,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                             'associated_section' => {
                               'cmdname' => 'subsection',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {}
                             },
                             'normalized' => 'numbered-sub-2_002d1'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_up' => {}
                           }
@@ -5733,6 +5945,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 3
                       }
@@ -5744,6 +5957,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                     ],
                     'normalized' => 'chapter-3'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
@@ -5751,6 +5965,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsec',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {}
                         },
                         'menus' => [
@@ -5760,6 +5975,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         ],
                         'normalized' => 'unnumberedsec-3'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
@@ -5767,10 +5983,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                             'associated_section' => {
                               'cmdname' => 'unnumberedsubsec',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {}
                             },
                             'normalized' => 'unnumbered-sub-3'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
@@ -5778,10 +5996,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                 'associated_section' => {
                                   'cmdname' => 'subsection',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {}
                                 },
                                 'normalized' => 'numbered-sub-3'
                               },
+                              'info' => {},
                               'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
@@ -5789,10 +6009,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                     'associated_section' => {
                                       'cmdname' => 'unnumberedsubsec',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {}
                                     },
                                     'normalized' => 'unnumbered-sub2-3'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
@@ -5800,10 +6022,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                         'associated_section' => {
                                           'cmdname' => 'subsection',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {}
                                         },
                                         'normalized' => 'numbered-sub2-3'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'node_prev' => {},
                                         'node_up' => {}
@@ -5826,12 +6050,14 @@ $result_nodes{'section_in_unnumbered_info'} = {
                             'associated_section' => {
                               'cmdname' => 'section',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {
                                 'section_number' => '3.1'
                               }
                             },
                             'normalized' => 'section-3_002d1'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
@@ -5839,6 +6065,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsec',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {}
                                 },
                                 'menus' => [
@@ -5848,6 +6075,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                 ],
                                 'normalized' => 'unnumberedsec-3_002d2'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_child' => {
                                   'cmdname' => 'node',
@@ -5855,10 +6083,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {}
                                     },
                                     'normalized' => 'numbered-sub-3_002d2'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_up' => {}
                                   }
@@ -5869,6 +6099,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                     'associated_section' => {
                                       'cmdname' => 'section',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'section_number' => '3.2'
                                       }
@@ -5880,6 +6111,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                     ],
                                     'normalized' => 'section-3_002d3'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_child' => {
                                       'cmdname' => 'node',
@@ -5887,12 +6119,14 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                         'associated_section' => {
                                           'cmdname' => 'subsection',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {
                                             'section_number' => '3.2.1'
                                           }
                                         },
                                         'normalized' => 'subsection-3_002d3'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'node_up' => {}
                                       }
@@ -5903,6 +6137,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                         'associated_section' => {
                                           'cmdname' => 'unnumberedsec',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {}
                                         },
                                         'menus' => [
@@ -5912,6 +6147,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                         ],
                                         'normalized' => 'unnumberedsec-3_002d4'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_child' => {
                                           'cmdname' => 'node',
@@ -5919,10 +6155,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                             'associated_section' => {
                                               'cmdname' => 'subsection',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {}
                                             },
                                             'normalized' => 
'numbered-sub-3_002d4'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'node_up' => {}
                                           }
@@ -5952,6 +6190,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         'associated_section' => {
                           'cmdname' => 'unnumbered',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {}
                         },
                         'menus' => [
@@ -5961,6 +6200,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         ],
                         'normalized' => 'unnumbered-4'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
@@ -5968,6 +6208,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                             'associated_section' => {
                               'cmdname' => 'unnumberedsec',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {}
                             },
                             'menus' => [
@@ -5977,6 +6218,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                             ],
                             'normalized' => 'unnumberedsec-4'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_child' => {
                               'cmdname' => 'node',
@@ -5984,10 +6226,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsubsec',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {}
                                 },
                                 'normalized' => 'unnumbered-sub-4'
                               },
+                              'info' => {},
                               'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
@@ -5995,10 +6239,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {}
                                     },
                                     'normalized' => 'numbered-sub-4'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
@@ -6006,10 +6252,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                         'associated_section' => {
                                           'cmdname' => 'unnumberedsubsec',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {}
                                         },
                                         'normalized' => 'unnumbered-sub2-4'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'node_next' => {
                                           'cmdname' => 'node',
@@ -6017,10 +6265,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                             'associated_section' => {
                                               'cmdname' => 'subsection',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {}
                                             },
                                             'normalized' => 'numbered-sub2-4'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'node_prev' => {},
                                             'node_up' => {}
@@ -6120,18 +6370,21 @@ $result_menus{'section_in_unnumbered_info'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section-in-chapter'
           },
+          'info' => {},
           'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
@@ -6144,12 +6397,14 @@ $result_menus{'section_in_unnumbered_info'} = {
           'extra' => {
             'normalized' => 'unnumbered'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'section-in-unnumbered'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
@@ -6162,36 +6417,42 @@ $result_menus{'section_in_unnumbered_info'} = {
               'extra' => {
                 'normalized' => 'chapter-2'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'unnumberedsec-2'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'unnumbered-sub-2'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'numbered-sub-2'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-2'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => 'numbered-sub2-2'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_prev' => {},
                                     'menu_up' => {},
@@ -6225,12 +6486,14 @@ $result_menus{'section_in_unnumbered_info'} = {
                       'extra' => {
                         'normalized' => 'unnumberedsec-2_002d1'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'numbered-sub-2_002d1'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_up' => {},
                             'menu_up_hash' => {
@@ -6256,36 +6519,42 @@ $result_menus{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'chapter-3'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'unnumberedsec-3'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'unnumbered-sub-3'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 'numbered-sub-3'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => 'unnumbered-sub2-3'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
                                         'normalized' => 'numbered-sub2-3'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_prev' => {},
                                         'menu_up' => {},
@@ -6319,18 +6588,21 @@ $result_menus{'section_in_unnumbered_info'} = {
                           'extra' => {
                             'normalized' => 'section-3_002d1'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 'unnumberedsec-3_002d2'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_child' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => 'numbered-sub-3_002d2'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_up' => {},
                                     'menu_up_hash' => {
@@ -6343,12 +6615,14 @@ $result_menus{'section_in_unnumbered_info'} = {
                                   'extra' => {
                                     'normalized' => 'section-3_002d3'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_child' => {
                                       'cmdname' => 'node',
                                       'extra' => {
                                         'normalized' => 'subsection-3_002d3'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_up' => {},
                                         'menu_up_hash' => {
@@ -6361,12 +6635,14 @@ $result_menus{'section_in_unnumbered_info'} = {
                                       'extra' => {
                                         'normalized' => 'unnumberedsec-3_002d4'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_child' => {
                                           'cmdname' => 'node',
                                           'extra' => {
                                             'normalized' => 
'numbered-sub-3_002d4'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'menu_up' => {},
                                             'menu_up_hash' => {
@@ -6413,36 +6689,42 @@ $result_menus{'section_in_unnumbered_info'} = {
                       'extra' => {
                         'normalized' => 'unnumbered-4'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'unnumberedsec-4'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_child' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-4'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => 'numbered-sub-4'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
                                         'normalized' => 'unnumbered-sub2-4'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
                                             'normalized' => 'numbered-sub2-4'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'menu_prev' => {},
                                             'menu_up' => {},
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index c6c33961d2..db6f596c5f 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -34,7 +34,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -54,7 +54,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -71,7 +73,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'Test section in unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -122,7 +124,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -384,7 +386,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -393,9 +395,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -415,7 +419,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -432,7 +437,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -452,7 +457,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -469,7 +476,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -486,7 +493,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -552,7 +559,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -561,9 +568,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -583,7 +592,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -600,7 +610,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -620,7 +630,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'section-in-chapter'
           }
         ],
-        'normalized' => 'section-in-chapter',
+        'normalized' => 'section-in-chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -637,7 +649,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'section in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -652,7 +664,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -669,7 +682,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -689,7 +702,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumbered'
           }
         ],
-        'normalized' => 'unnumbered',
+        'normalized' => 'unnumbered'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -706,7 +721,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -723,7 +738,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -789,7 +804,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -798,9 +813,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -820,7 +837,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -837,7 +855,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'section in unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -857,7 +875,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'section-in-unnumbered'
           }
         ],
-        'normalized' => 'section-in-unnumbered',
+        'normalized' => 'section-in-unnumbered'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -874,7 +894,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'section in unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -889,7 +909,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -906,7 +927,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -926,7 +947,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'chapter-2'
           }
         ],
-        'normalized' => 'chapter-2',
+        'normalized' => 'chapter-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -943,7 +966,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'chapter 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -960,7 +983,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1075,7 +1098,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1084,9 +1107,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 43,
@@ -1106,7 +1131,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1123,7 +1149,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumberedsec 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1143,7 +1169,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumberedsec-2'
           }
         ],
-        'normalized' => 'unnumberedsec-2',
+        'normalized' => 'unnumberedsec-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1160,7 +1188,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered section 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1177,7 +1205,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1390,7 +1418,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1399,9 +1427,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 53,
@@ -1421,7 +1451,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1438,7 +1469,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered sub 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1458,7 +1489,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumbered-sub-2'
           }
         ],
-        'normalized' => 'unnumbered-sub-2',
+        'normalized' => 'unnumbered-sub-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1475,7 +1508,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered subsection 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1490,7 +1523,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1507,7 +1541,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered sub 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1527,7 +1561,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'numbered-sub-2'
           }
         ],
-        'normalized' => 'numbered-sub-2',
+        'normalized' => 'numbered-sub-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1544,7 +1580,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered subsection 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1559,7 +1595,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1576,7 +1613,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered sub2 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1596,7 +1633,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumbered-sub2-2'
           }
         ],
-        'normalized' => 'unnumbered-sub2-2',
+        'normalized' => 'unnumbered-sub2-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1613,7 +1652,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered subsection2 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1628,7 +1667,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1645,7 +1685,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered sub2 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1665,7 +1705,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'numbered-sub2-2'
           }
         ],
-        'normalized' => 'numbered-sub2-2',
+        'normalized' => 'numbered-sub2-2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1682,7 +1724,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered subsection2 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1697,7 +1739,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1714,7 +1757,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumberedsec 2-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1734,7 +1777,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumberedsec-2_002d1'
           }
         ],
-        'normalized' => 'unnumberedsec-2_002d1',
+        'normalized' => 'unnumberedsec-2_002d1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1751,7 +1796,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumberedsec 2-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1768,7 +1813,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1834,7 +1879,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1843,9 +1888,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 72,
@@ -1865,7 +1912,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1882,7 +1930,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered sub 2-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1902,7 +1950,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'numbered-sub-2_002d1'
           }
         ],
-        'normalized' => 'numbered-sub-2_002d1',
+        'normalized' => 'numbered-sub-2_002d1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1919,7 +1969,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered subsection 2-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1939,7 +1989,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1956,7 +2007,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'chapter 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1976,7 +2027,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'chapter-3'
           }
         ],
-        'normalized' => 'chapter-3',
+        'normalized' => 'chapter-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1993,7 +2046,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'chapter 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2010,7 +2063,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2272,7 +2325,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2281,9 +2334,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 87,
@@ -2303,7 +2358,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2320,7 +2376,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumberedsec 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2340,7 +2396,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumberedsec-3'
           }
         ],
-        'normalized' => 'unnumberedsec-3',
+        'normalized' => 'unnumberedsec-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2357,7 +2415,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered section 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2374,7 +2432,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2587,7 +2645,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2596,9 +2654,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 97,
@@ -2618,7 +2678,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2635,7 +2696,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered sub 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2655,7 +2716,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumbered-sub-3'
           }
         ],
-        'normalized' => 'unnumbered-sub-3',
+        'normalized' => 'unnumbered-sub-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2672,7 +2735,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered subsection 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2687,7 +2750,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2704,7 +2768,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered sub 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2724,7 +2788,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'numbered-sub-3'
           }
         ],
-        'normalized' => 'numbered-sub-3',
+        'normalized' => 'numbered-sub-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2741,7 +2807,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered subsection 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2756,7 +2822,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2773,7 +2840,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered sub2 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2793,7 +2860,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumbered-sub2-3'
           }
         ],
-        'normalized' => 'unnumbered-sub2-3',
+        'normalized' => 'unnumbered-sub2-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2810,7 +2879,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered subsection2 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2825,7 +2894,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2842,7 +2912,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered sub2 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2862,7 +2932,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'numbered-sub2-3'
           }
         ],
-        'normalized' => 'numbered-sub2-3',
+        'normalized' => 'numbered-sub2-3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2879,7 +2951,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered subsection2 3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2894,7 +2966,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2911,7 +2984,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'section 3-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2931,7 +3004,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'section-3_002d1'
           }
         ],
-        'normalized' => 'section-3_002d1',
+        'normalized' => 'section-3_002d1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2948,7 +3023,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'section 3-1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -2963,7 +3038,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2980,7 +3056,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumberedsec 3-2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3000,7 +3076,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumberedsec-3_002d2'
           }
         ],
-        'normalized' => 'unnumberedsec-3_002d2',
+        'normalized' => 'unnumberedsec-3_002d2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3017,7 +3095,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumberedsec 3-2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3034,7 +3112,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3100,7 +3178,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3109,9 +3187,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 119,
@@ -3131,7 +3211,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3148,7 +3229,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered sub 3-2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3168,7 +3249,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'numbered-sub-3_002d2'
           }
         ],
-        'normalized' => 'numbered-sub-3_002d2',
+        'normalized' => 'numbered-sub-3_002d2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3185,7 +3268,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered subsection 3-2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3200,7 +3283,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3217,7 +3301,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'section 3-3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3237,7 +3321,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'section-3_002d3'
           }
         ],
-        'normalized' => 'section-3_002d3',
+        'normalized' => 'section-3_002d3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3254,7 +3340,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'section 3-3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3271,7 +3357,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3337,7 +3423,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3346,9 +3432,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 129,
@@ -3368,7 +3456,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3385,7 +3474,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'subsection 3-3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3405,7 +3494,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'subsection-3_002d3'
           }
         ],
-        'normalized' => 'subsection-3_002d3',
+        'normalized' => 'subsection-3_002d3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3422,7 +3513,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'subsection 3-3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3437,7 +3528,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3454,7 +3546,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumberedsec 3-4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3474,7 +3566,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumberedsec-3_002d4'
           }
         ],
-        'normalized' => 'unnumberedsec-3_002d4',
+        'normalized' => 'unnumberedsec-3_002d4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3491,7 +3585,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumberedsec 3-4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3508,7 +3602,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3574,7 +3668,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3583,9 +3677,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 139,
@@ -3605,7 +3701,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3622,7 +3719,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered sub 3-4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3642,7 +3739,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'numbered-sub-3_002d4'
           }
         ],
-        'normalized' => 'numbered-sub-3_002d4',
+        'normalized' => 'numbered-sub-3_002d4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3659,7 +3758,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered subsection 3-4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3674,7 +3773,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3691,7 +3791,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3711,7 +3811,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumbered-4'
           }
         ],
-        'normalized' => 'unnumbered-4',
+        'normalized' => 'unnumbered-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3728,7 +3830,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered  4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3745,7 +3847,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -3811,7 +3913,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -3820,9 +3922,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 149,
@@ -3842,7 +3946,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3859,7 +3964,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumberedsec 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3879,7 +3984,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumberedsec-4'
           }
         ],
-        'normalized' => 'unnumberedsec-4',
+        'normalized' => 'unnumberedsec-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -3896,7 +4003,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered section 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -3913,7 +4020,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -4126,7 +4233,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -4135,9 +4242,11 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 159,
@@ -4157,7 +4266,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4174,7 +4284,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered sub 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4194,7 +4304,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumbered-sub-4'
           }
         ],
-        'normalized' => 'unnumbered-sub-4',
+        'normalized' => 'unnumbered-sub-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4211,7 +4323,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered subsection 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4226,7 +4338,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4243,7 +4356,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered sub 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4263,7 +4376,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'numbered-sub-4'
           }
         ],
-        'normalized' => 'numbered-sub-4',
+        'normalized' => 'numbered-sub-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4280,7 +4395,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered subsection 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4295,7 +4410,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4312,7 +4428,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered sub2 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4332,7 +4448,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'unnumbered-sub2-4'
           }
         ],
-        'normalized' => 'unnumbered-sub2-4',
+        'normalized' => 'unnumbered-sub2-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4349,7 +4467,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'unnumbered subsection2 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4364,7 +4482,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4381,7 +4500,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered sub2 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4401,7 +4520,9 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
             'normalized' => 'numbered-sub2-4'
           }
         ],
-        'normalized' => 'numbered-sub2-4',
+        'normalized' => 'numbered-sub2-4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4418,7 +4539,7 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               'text' => 'numbered subsection2 4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -4426,7 +4547,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         }
       ],
       'cmdname' => 'subsection',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -4895,9 +5017,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -4908,9 +5032,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -4921,9 +5047,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'section-in-chapter'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -4946,9 +5074,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'unnumbered'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -4959,9 +5089,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'section-in-unnumbered'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_up' => {}
@@ -4983,9 +5115,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'chapter-2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -4996,9 +5130,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5009,9 +5145,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5025,9 +5163,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5042,9 +5182,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5059,9 +5201,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5081,9 +5225,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-2_002d1'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5094,9 +5240,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-2_002d1'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5125,9 +5273,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'chapter-3'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -5138,9 +5288,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5151,9 +5303,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5167,9 +5321,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5184,9 +5340,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5201,9 +5359,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5223,9 +5383,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'section-3_002d1'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '3.1',
@@ -5241,9 +5403,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3_002d2'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5254,9 +5418,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3_002d2'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5276,9 +5442,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'section-3_002d3'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5289,9 +5457,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'subsection-3_002d3'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_number' => '3.2.1',
@@ -5313,9 +5483,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3_002d4'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5326,9 +5498,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3_002d4'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5357,9 +5531,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'unnumbered-4'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -5370,9 +5546,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-4'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
@@ -5383,9 +5561,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-4'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_up' => {}
@@ -5399,9 +5579,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-4'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5416,9 +5598,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-4'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5433,9 +5617,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-4'
                               },
+                              'info' => {},
                               'structure' => {}
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'section_level' => 3,
                             'section_prev' => {},
@@ -5531,6 +5717,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -5540,6 +5727,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -5547,6 +5735,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -5558,6 +5747,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
         ],
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -5565,12 +5755,14 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
             },
             'normalized' => 'section-in-chapter'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -5581,6 +5773,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
             'associated_section' => {
               'cmdname' => 'unnumbered',
               'extra' => {},
+              'info' => {},
               'structure' => {}
             },
             'menus' => [
@@ -5590,6 +5783,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
             ],
             'normalized' => 'unnumbered'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
@@ -5597,10 +5791,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {}
                 },
                 'normalized' => 'section-in-unnumbered'
               },
+              'info' => {},
               'structure' => {
                 'node_up' => {}
               }
@@ -5611,6 +5807,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                 'associated_section' => {
                   'cmdname' => 'chapter',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => 2
                   }
@@ -5622,6 +5819,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                 ],
                 'normalized' => 'chapter-2'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
@@ -5629,6 +5827,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                     'associated_section' => {
                       'cmdname' => 'unnumberedsec',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {}
                     },
                     'menus' => [
@@ -5638,6 +5837,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                     ],
                     'normalized' => 'unnumberedsec-2'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
@@ -5645,10 +5845,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsubsec',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {}
                         },
                         'normalized' => 'unnumbered-sub-2'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_next' => {
                           'cmdname' => 'node',
@@ -5656,10 +5858,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                             'associated_section' => {
                               'cmdname' => 'subsection',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {}
                             },
                             'normalized' => 'numbered-sub-2'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
@@ -5667,10 +5871,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsubsec',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {}
                                 },
                                 'normalized' => 'unnumbered-sub2-2'
                               },
+                              'info' => {},
                               'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
@@ -5678,10 +5884,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {}
                                     },
                                     'normalized' => 'numbered-sub2-2'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_prev' => {},
                                     'node_up' => {}
@@ -5704,6 +5912,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsec',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {}
                         },
                         'menus' => [
@@ -5713,6 +5922,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         ],
                         'normalized' => 'unnumberedsec-2_002d1'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
@@ -5720,10 +5930,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                             'associated_section' => {
                               'cmdname' => 'subsection',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {}
                             },
                             'normalized' => 'numbered-sub-2_002d1'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_up' => {}
                           }
@@ -5741,6 +5953,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                     'associated_section' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'section_number' => 3
                       }
@@ -5752,6 +5965,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                     ],
                     'normalized' => 'chapter-3'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
@@ -5759,6 +5973,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsec',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {}
                         },
                         'menus' => [
@@ -5768,6 +5983,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         ],
                         'normalized' => 'unnumberedsec-3'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
@@ -5775,10 +5991,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                             'associated_section' => {
                               'cmdname' => 'unnumberedsubsec',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {}
                             },
                             'normalized' => 'unnumbered-sub-3'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
@@ -5786,10 +6004,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                 'associated_section' => {
                                   'cmdname' => 'subsection',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {}
                                 },
                                 'normalized' => 'numbered-sub-3'
                               },
+                              'info' => {},
                               'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
@@ -5797,10 +6017,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                     'associated_section' => {
                                       'cmdname' => 'unnumberedsubsec',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {}
                                     },
                                     'normalized' => 'unnumbered-sub2-3'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
@@ -5808,10 +6030,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                         'associated_section' => {
                                           'cmdname' => 'subsection',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {}
                                         },
                                         'normalized' => 'numbered-sub2-3'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'node_prev' => {},
                                         'node_up' => {}
@@ -5834,12 +6058,14 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                             'associated_section' => {
                               'cmdname' => 'section',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {
                                 'section_number' => '3.1'
                               }
                             },
                             'normalized' => 'section-3_002d1'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
@@ -5847,6 +6073,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsec',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {}
                                 },
                                 'menus' => [
@@ -5856,6 +6083,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                 ],
                                 'normalized' => 'unnumberedsec-3_002d2'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_child' => {
                                   'cmdname' => 'node',
@@ -5863,10 +6091,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {}
                                     },
                                     'normalized' => 'numbered-sub-3_002d2'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_up' => {}
                                   }
@@ -5877,6 +6107,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                     'associated_section' => {
                                       'cmdname' => 'section',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'section_number' => '3.2'
                                       }
@@ -5888,6 +6119,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                     ],
                                     'normalized' => 'section-3_002d3'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_child' => {
                                       'cmdname' => 'node',
@@ -5895,12 +6127,14 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                         'associated_section' => {
                                           'cmdname' => 'subsection',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {
                                             'section_number' => '3.2.1'
                                           }
                                         },
                                         'normalized' => 'subsection-3_002d3'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'node_up' => {}
                                       }
@@ -5911,6 +6145,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                         'associated_section' => {
                                           'cmdname' => 'unnumberedsec',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {}
                                         },
                                         'menus' => [
@@ -5920,6 +6155,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                         ],
                                         'normalized' => 'unnumberedsec-3_002d4'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_child' => {
                                           'cmdname' => 'node',
@@ -5927,10 +6163,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                             'associated_section' => {
                                               'cmdname' => 'subsection',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {}
                                             },
                                             'normalized' => 
'numbered-sub-3_002d4'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'node_up' => {}
                                           }
@@ -5960,6 +6198,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         'associated_section' => {
                           'cmdname' => 'unnumbered',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {}
                         },
                         'menus' => [
@@ -5969,6 +6208,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         ],
                         'normalized' => 'unnumbered-4'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
@@ -5976,6 +6216,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                             'associated_section' => {
                               'cmdname' => 'unnumberedsec',
                               'extra' => {},
+                              'info' => {},
                               'structure' => {}
                             },
                             'menus' => [
@@ -5985,6 +6226,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                             ],
                             'normalized' => 'unnumberedsec-4'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_child' => {
                               'cmdname' => 'node',
@@ -5992,10 +6234,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsubsec',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {}
                                 },
                                 'normalized' => 'unnumbered-sub-4'
                               },
+                              'info' => {},
                               'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
@@ -6003,10 +6247,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {}
                                     },
                                     'normalized' => 'numbered-sub-4'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
@@ -6014,10 +6260,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                         'associated_section' => {
                                           'cmdname' => 'unnumberedsubsec',
                                           'extra' => {},
+                                          'info' => {},
                                           'structure' => {}
                                         },
                                         'normalized' => 'unnumbered-sub2-4'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'node_next' => {
                                           'cmdname' => 'node',
@@ -6025,10 +6273,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                             'associated_section' => {
                                               'cmdname' => 'subsection',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {}
                                             },
                                             'normalized' => 'numbered-sub2-4'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'node_prev' => {},
                                             'node_up' => {}
@@ -6128,18 +6378,21 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section-in-chapter'
           },
+          'info' => {},
           'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
@@ -6152,12 +6405,14 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
           'extra' => {
             'normalized' => 'unnumbered'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'section-in-unnumbered'
               },
+              'info' => {},
               'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
@@ -6170,36 +6425,42 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
               'extra' => {
                 'normalized' => 'chapter-2'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'unnumberedsec-2'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'unnumbered-sub-2'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'numbered-sub-2'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-2'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => 'numbered-sub2-2'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_prev' => {},
                                     'menu_up' => {},
@@ -6233,12 +6494,14 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                       'extra' => {
                         'normalized' => 'unnumberedsec-2_002d1'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'numbered-sub-2_002d1'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_up' => {},
                             'menu_up_hash' => {
@@ -6264,36 +6527,42 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'chapter-3'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'unnumberedsec-3'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'unnumbered-sub-3'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 'numbered-sub-3'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => 'unnumbered-sub2-3'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
                                         'normalized' => 'numbered-sub2-3'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_prev' => {},
                                         'menu_up' => {},
@@ -6327,18 +6596,21 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                           'extra' => {
                             'normalized' => 'section-3_002d1'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 'unnumberedsec-3_002d2'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_child' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => 'numbered-sub-3_002d2'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_up' => {},
                                     'menu_up_hash' => {
@@ -6351,12 +6623,14 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                                   'extra' => {
                                     'normalized' => 'section-3_002d3'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_child' => {
                                       'cmdname' => 'node',
                                       'extra' => {
                                         'normalized' => 'subsection-3_002d3'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_up' => {},
                                         'menu_up_hash' => {
@@ -6369,12 +6643,14 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                                       'extra' => {
                                         'normalized' => 'unnumberedsec-3_002d4'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_child' => {
                                           'cmdname' => 'node',
                                           'extra' => {
                                             'normalized' => 
'numbered-sub-3_002d4'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'menu_up' => {},
                                             'menu_up_hash' => {
@@ -6421,36 +6697,42 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                       'extra' => {
                         'normalized' => 'unnumbered-4'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'unnumberedsec-4'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_child' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-4'
                               },
+                              'info' => {},
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => 'numbered-sub-4'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
                                         'normalized' => 'unnumbered-sub2-4'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
                                             'normalized' => 'numbered-sub2-4'
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'menu_prev' => {},
                                             'menu_up' => {},
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index 481514fee2..59e7dabe2e 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -25,7 +25,7 @@ $result_trees{'section_node_before_part'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -45,7 +45,9 @@ $result_trees{'section_node_before_part'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'section_node_before_part'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -77,7 +79,8 @@ $result_trees{'section_node_before_part'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -94,7 +97,7 @@ $result_trees{'section_node_before_part'} = {
               'text' => 'part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -102,7 +105,8 @@ $result_trees{'section_node_before_part'} = {
         }
       ],
       'cmdname' => 'part',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -143,9 +147,11 @@ $result_sectioning{'section_node_before_part'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 2,
           'section_number' => 1,
@@ -155,6 +161,7 @@ $result_sectioning{'section_node_before_part'} = {
       {
         'cmdname' => 'part',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -173,19 +180,22 @@ $result_nodes{'section_node_before_part'} = {
     'associated_section' => {
       'cmdname' => 'section',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'section_number' => 1
       }
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'section_node_before_part'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'section_node_before_part'} = [
diff --git a/tp/t/results/sectioning/sectioning_part_appendix.pl 
b/tp/t/results/sectioning/sectioning_part_appendix.pl
index 40fa43bd11..07af3043ca 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix.pl
@@ -19,7 +19,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -34,7 +34,8 @@ $result_trees{'sectioning_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -59,7 +60,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -74,7 +75,8 @@ $result_trees{'sectioning_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -99,7 +101,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -114,7 +116,8 @@ $result_trees{'sectioning_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -139,7 +142,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'subsection'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -154,7 +157,8 @@ $result_trees{'sectioning_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -179,7 +183,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'subsubsection'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -194,7 +198,8 @@ $result_trees{'sectioning_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -219,7 +224,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -234,7 +239,8 @@ $result_trees{'sectioning_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -251,7 +257,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'chapter in part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -267,7 +273,9 @@ $result_trees{'sectioning_part_appendix'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -292,7 +300,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'second chapter in part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -307,7 +315,8 @@ $result_trees{'sectioning_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -332,7 +341,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -347,7 +356,8 @@ $result_trees{'sectioning_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -372,7 +382,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'appendix'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -387,7 +397,8 @@ $result_trees{'sectioning_part_appendix'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -412,7 +423,7 @@ $result_trees{'sectioning_part_appendix'} = [
                 'text' => 'appendixsec'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -420,7 +431,8 @@ $result_trees{'sectioning_part_appendix'} = [
           }
         ],
         'cmdname' => 'appendixsec',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -512,6 +524,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -524,12 +537,14 @@ $result_sectioning{'sectioning_part_appendix'} = {
                     'unit_command' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_childs' => [
                           {
                             'cmdname' => 'section',
                             'extra' => {},
+                            'info' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -549,6 +564,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                               'extra' => {
                                                 'part_associated_section' => {}
                                               },
+                                              'info' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'section_childs' => [
@@ -556,6 +572,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                   {
                                                     'cmdname' => 'chapter',
                                                     'extra' => {},
+                                                    'info' => {},
                                                     'structure' => {
                                                       'associated_unit' => {
                                                         'extra' => {
@@ -570,6 +587,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                                 'unit_command' 
=> {
                                                                   'cmdname' => 
'unnumbered',
                                                                   'extra' => 
{},
+                                                                  'info' => {},
                                                                   'structure' 
=> {
                                                                     
'associated_unit' => {},
                                                                     
'section_level' => 1,
@@ -589,12 +607,14 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                                       
'unit_command' => {
                                                                         
'cmdname' => 'appendix',
                                                                         
'extra' => {},
+                                                                        'info' 
=> {},
                                                                         
'structure' => {
                                                                           
'associated_unit' => {},
                                                                           
'section_childs' => [
                                                                             {
                                                                               
'cmdname' => 'appendixsec',
                                                                               
'extra' => {},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {
                                                                                
   'extra' => {
@@ -676,6 +696,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                               }
                                             }
                                           },
+                                          'info' => {},
                                           'structure' => {
                                             'associated_unit' => {},
                                             'section_level' => 1,
@@ -693,6 +714,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                               'unit_command' => {
                                                 'cmdname' => 'subsubsection',
                                                 'extra' => {},
+                                                'info' => {},
                                                 'structure' => {
                                                   'associated_unit' => {},
                                                   'section_level' => 4,
@@ -700,6 +722,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                   'section_up' => {
                                                     'cmdname' => 'subsection',
                                                     'extra' => {},
+                                                    'info' => {},
                                                     'structure' => {
                                                       'associated_unit' => {
                                                         'extra' => {
@@ -943,6 +966,7 @@ $result_elements{'sectioning_part_appendix'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -955,6 +979,7 @@ $result_elements{'sectioning_part_appendix'} = [
             'unit_command' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -973,11 +998,13 @@ $result_elements{'sectioning_part_appendix'} = [
                       'associated_part' => {
                         'cmdname' => 'part',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {}
                         }
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 2
@@ -991,6 +1018,7 @@ $result_elements{'sectioning_part_appendix'} = [
                         'unit_command' => {
                           'cmdname' => 'subsubsection',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => '1.1.1.1'
@@ -1004,6 +1032,7 @@ $result_elements{'sectioning_part_appendix'} = [
                               'unit_command' => {
                                 'cmdname' => 'subsection',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_number' => '1.1.1'
@@ -1017,6 +1046,7 @@ $result_elements{'sectioning_part_appendix'} = [
                                     'unit_command' => {
                                       'cmdname' => 'section',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'section_number' => '1.1'
@@ -1059,6 +1089,7 @@ $result_elements{'sectioning_part_appendix'} = [
                         'unit_command' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 3
@@ -1074,6 +1105,7 @@ $result_elements{'sectioning_part_appendix'} = [
                               'unit_command' => {
                                 'cmdname' => 'unnumbered',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {}
                                 }
@@ -1088,6 +1120,7 @@ $result_elements{'sectioning_part_appendix'} = [
                                     'unit_command' => {
                                       'cmdname' => 'appendix',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'section_number' => 'A'
@@ -1103,6 +1136,7 @@ $result_elements{'sectioning_part_appendix'} = [
                                           'unit_command' => {
                                             'cmdname' => 'appendixsec',
                                             'extra' => {},
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'section_number' => 'A.1'
diff --git a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl 
b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
index 0d0fd2d3b9..88569c283a 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
@@ -19,7 +19,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -34,7 +34,8 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -59,7 +60,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                 'text' => 'section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -74,7 +75,8 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -99,7 +101,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                 'text' => 'subsection'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -114,7 +116,8 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -139,7 +142,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                 'text' => 'subsubsection'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -154,7 +157,8 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -179,7 +183,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -194,7 +198,8 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -211,7 +216,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                 'text' => 'chapter in part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -227,7 +232,9 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           }
         ],
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -252,7 +259,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                 'text' => 'second chapter in part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -267,7 +274,8 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -292,7 +300,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                 'text' => 'unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -307,7 +315,8 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -332,7 +341,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                 'text' => 'appendix'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -347,7 +356,8 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -372,7 +382,7 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
                 'text' => 'appendixsec'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -380,7 +390,8 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           }
         ],
         'cmdname' => 'appendixsec',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -466,6 +477,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
       {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -483,6 +495,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                           'extra' => {
                             'part_associated_section' => {}
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_childs' => [
@@ -490,6 +503,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                               {
                                 'cmdname' => 'chapter',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {
                                     'extra' => {
@@ -504,6 +518,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                             'unit_command' => {
                                               'cmdname' => 'unnumbered',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'section_level' => 1,
@@ -522,12 +537,14 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                                   'unit_command' => {
                                                     'cmdname' => 'appendix',
                                                     'extra' => {},
+                                                    'info' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'section_childs' => [
                                                         {
                                                           'cmdname' => 
'appendixsec',
                                                           'extra' => {},
+                                                          'info' => {},
                                                           'structure' => {
                                                             'associated_unit' 
=> {
                                                               'extra' => {
@@ -606,6 +623,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                           }
                         }
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_level' => 1,
@@ -622,6 +640,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                           'unit_command' => {
                             'cmdname' => 'subsubsection',
                             'extra' => {},
+                            'info' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'section_level' => 4,
@@ -629,6 +648,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                               'section_up' => {
                                 'cmdname' => 'subsection',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {
                                     'extra' => {
@@ -641,6 +661,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                             'unit_command' => {
                                               'cmdname' => 'section',
                                               'extra' => {},
+                                              'info' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'section_childs' => [
@@ -843,6 +864,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
       'unit_command' => {
         'cmdname' => 'chapter',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_number' => 1
@@ -859,11 +881,13 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 2
@@ -877,6 +901,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                   'unit_command' => {
                     'cmdname' => 'subsubsection',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => '1.1.1.1'
@@ -890,6 +915,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                         'unit_command' => {
                           'cmdname' => 'subsection',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => '1.1.1'
@@ -903,6 +929,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                               'unit_command' => {
                                 'cmdname' => 'section',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_number' => '1.1'
@@ -945,6 +972,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 3
@@ -960,6 +988,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                         'unit_command' => {
                           'cmdname' => 'unnumbered',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -974,6 +1003,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                               'unit_command' => {
                                 'cmdname' => 'appendix',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_number' => 'A'
@@ -989,6 +1019,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                     'unit_command' => {
                                       'cmdname' => 'appendixsec',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'section_number' => 'A.1'
diff --git a/tp/t/results/sectioning/sections.pl 
b/tp/t/results/sectioning/sections.pl
index f3a91f9ddd..46c26f5440 100644
--- a/tp/t/results/sectioning/sections.pl
+++ b/tp/t/results/sectioning/sections.pl
@@ -18,7 +18,7 @@ $result_trees{'sections'} = {
               'text' => 'a chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -26,7 +26,7 @@ $result_trees{'sections'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -52,7 +52,7 @@ $result_sectioning{'sections'} = {
     'section_childs' => [
       {
         'cmdname' => 'chapter',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_number' => 1,
diff --git a/tp/t/results/sectioning/sections_test.pl 
b/tp/t/results/sectioning/sections_test.pl
index b4d62a421e..7166f9561d 100644
--- a/tp/t/results/sectioning/sections_test.pl
+++ b/tp/t/results/sectioning/sections_test.pl
@@ -24,7 +24,7 @@ $result_trees{'sections_test'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -39,7 +39,8 @@ $result_trees{'sections_test'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +57,7 @@ $result_trees{'sections_test'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -71,7 +72,7 @@ $result_trees{'sections_test'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -88,7 +89,7 @@ $result_trees{'sections_test'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -103,7 +104,7 @@ $result_trees{'sections_test'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -120,7 +121,7 @@ $result_trees{'sections_test'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -135,7 +136,7 @@ $result_trees{'sections_test'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -152,7 +153,7 @@ $result_trees{'sections_test'} = {
               'text' => 'subsubsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -167,7 +168,7 @@ $result_trees{'sections_test'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +185,7 @@ $result_trees{'sections_test'} = {
               'text' => 'part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -199,7 +200,8 @@ $result_trees{'sections_test'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -216,7 +218,7 @@ $result_trees{'sections_test'} = {
               'text' => 'chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -232,7 +234,9 @@ $result_trees{'sections_test'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -249,7 +253,7 @@ $result_trees{'sections_test'} = {
               'text' => 'second chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +268,7 @@ $result_trees{'sections_test'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +285,7 @@ $result_trees{'sections_test'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -296,7 +300,7 @@ $result_trees{'sections_test'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -313,7 +317,7 @@ $result_trees{'sections_test'} = {
               'text' => 'appendix'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -328,7 +332,7 @@ $result_trees{'sections_test'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -345,7 +349,7 @@ $result_trees{'sections_test'} = {
               'text' => 'appendixsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -353,7 +357,7 @@ $result_trees{'sections_test'} = {
         }
       ],
       'cmdname' => 'appendixsec',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -431,26 +435,27 @@ $result_sectioning{'sections_test'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
-                                'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.1',
@@ -490,6 +495,7 @@ $result_sectioning{'sections_test'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 2,
@@ -499,12 +505,13 @@ $result_sectioning{'sections_test'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -516,7 +523,7 @@ $result_sectioning{'sections_test'} = {
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -533,12 +540,12 @@ $result_sectioning{'sections_test'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => 'A.1',
diff --git a/tp/t/results/sectioning/sections_test_no_use_nodes.pl 
b/tp/t/results/sectioning/sections_test_no_use_nodes.pl
index e783d84bdb..6e96b3151d 100644
--- a/tp/t/results/sectioning/sections_test_no_use_nodes.pl
+++ b/tp/t/results/sectioning/sections_test_no_use_nodes.pl
@@ -24,7 +24,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -39,7 +39,8 @@ $result_trees{'sections_test_no_use_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +57,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -71,7 +72,8 @@ $result_trees{'sections_test_no_use_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -88,7 +90,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -103,7 +105,8 @@ $result_trees{'sections_test_no_use_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -120,7 +123,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -135,7 +138,8 @@ $result_trees{'sections_test_no_use_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -152,7 +156,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'subsubsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -167,7 +171,8 @@ $result_trees{'sections_test_no_use_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +189,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -199,7 +204,8 @@ $result_trees{'sections_test_no_use_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -216,7 +222,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -232,7 +238,9 @@ $result_trees{'sections_test_no_use_nodes'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -249,7 +257,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'second chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +272,8 @@ $result_trees{'sections_test_no_use_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -296,7 +305,8 @@ $result_trees{'sections_test_no_use_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -313,7 +323,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'appendix'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -328,7 +338,8 @@ $result_trees{'sections_test_no_use_nodes'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -345,7 +356,7 @@ $result_trees{'sections_test_no_use_nodes'} = {
               'text' => 'appendixsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -353,7 +364,8 @@ $result_trees{'sections_test_no_use_nodes'} = {
         }
       ],
       'cmdname' => 'appendixsec',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -431,26 +443,31 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.1',
@@ -490,6 +507,7 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 2,
@@ -499,12 +517,14 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -517,6 +537,7 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
             {
               'cmdname' => 'unnumbered',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -534,11 +555,13 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
       {
         'cmdname' => 'appendix',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => 'A.1',
diff --git 
a/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl 
b/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl
index e9d7726177..1ee69c6e89 100644
--- a/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl
+++ b/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl
@@ -24,7 +24,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -39,7 +39,8 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +57,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -71,7 +72,8 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -88,7 +90,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -103,7 +105,8 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -120,7 +123,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -135,7 +138,8 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -152,7 +156,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'subsubsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -167,7 +171,8 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +189,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -199,7 +204,8 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -216,7 +222,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -232,7 +238,9 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -249,7 +257,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'second chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +272,8 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +290,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -296,7 +305,8 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -313,7 +323,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'appendix'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -328,7 +338,8 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -345,7 +356,7 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
               'text' => 'appendixsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -353,7 +364,8 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
         }
       ],
       'cmdname' => 'appendixsec',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -431,26 +443,31 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.1',
@@ -490,6 +507,7 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 2,
@@ -499,12 +517,14 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -517,6 +537,7 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
             {
               'cmdname' => 'unnumbered',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -534,11 +555,13 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
       {
         'cmdname' => 'appendix',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => 'A.1',
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index 6a8f668f4c..d810026e2b 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -18,7 +18,7 @@ $result_trees{'semi_auto'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'semi_auto'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'semi_auto'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -72,7 +74,7 @@ $result_trees{'semi_auto'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -187,7 +189,7 @@ $result_trees{'semi_auto'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -196,9 +198,11 @@ $result_trees{'semi_auto'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -218,7 +222,8 @@ $result_trees{'semi_auto'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -235,7 +240,7 @@ $result_trees{'semi_auto'} = {
               'text' => 'Chap1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -255,7 +260,9 @@ $result_trees{'semi_auto'} = {
             'normalized' => 'Chap1'
           }
         ],
-        'normalized' => 'Chap1',
+        'normalized' => 'Chap1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -272,7 +279,7 @@ $result_trees{'semi_auto'} = {
               'text' => 'Chapter 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -289,7 +296,7 @@ $result_trees{'semi_auto'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -355,7 +362,7 @@ $result_trees{'semi_auto'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -364,9 +371,11 @@ $result_trees{'semi_auto'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -386,7 +395,8 @@ $result_trees{'semi_auto'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -403,7 +413,7 @@ $result_trees{'semi_auto'} = {
               'text' => 'Sec in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -423,7 +433,9 @@ $result_trees{'semi_auto'} = {
             'normalized' => 'Sec-in-chapter'
           }
         ],
-        'normalized' => 'Sec-in-chapter',
+        'normalized' => 'Sec-in-chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -440,7 +452,7 @@ $result_trees{'semi_auto'} = {
               'text' => 'Sec in chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -455,7 +467,8 @@ $result_trees{'semi_auto'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -483,7 +496,7 @@ $result_trees{'semi_auto'} = {
               'text' => 'Chap1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -494,7 +507,7 @@ $result_trees{'semi_auto'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -528,7 +541,9 @@ $result_trees{'semi_auto'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Section-non-auto',
+        'normalized' => 'Section-non-auto'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -545,7 +560,7 @@ $result_trees{'semi_auto'} = {
               'text' => 'Section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -553,7 +568,8 @@ $result_trees{'semi_auto'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -634,9 +650,11 @@ $result_sectioning{'semi_auto'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -647,9 +665,11 @@ $result_sectioning{'semi_auto'} = {
                   'extra' => {
                     'normalized' => 'Chap1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -660,9 +680,11 @@ $result_sectioning{'semi_auto'} = {
                         'extra' => {
                           'normalized' => 'Sec-in-chapter'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -677,9 +699,11 @@ $result_sectioning{'semi_auto'} = {
                         'extra' => {
                           'normalized' => 'Section-non-auto'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.2',
@@ -718,6 +742,7 @@ $result_nodes{'semi_auto'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -727,6 +752,7 @@ $result_nodes{'semi_auto'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -734,6 +760,7 @@ $result_nodes{'semi_auto'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -745,6 +772,7 @@ $result_nodes{'semi_auto'} = {
         ],
         'normalized' => 'Chap1'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -752,12 +780,14 @@ $result_nodes{'semi_auto'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
             },
             'normalized' => 'Sec-in-chapter'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
@@ -765,12 +795,14 @@ $result_nodes{'semi_auto'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'section_number' => '1.2'
                   }
                 },
                 'normalized' => 'Section-non-auto'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -800,18 +832,21 @@ $result_menus{'semi_auto'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Chap1'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Sec-in-chapter'
           },
+          'info' => {},
           'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
@@ -824,6 +859,7 @@ $result_menus{'semi_auto'} = {
           'extra' => {
             'normalized' => 'Section-non-auto'
           },
+          'info' => {},
           'structure' => {
             'menu_prev' => {},
             'menu_up' => {},
diff --git a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl 
b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
index 9691f3677a..435110c713 100644
--- a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
+++ b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
@@ -24,7 +24,7 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -68,7 +70,7 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
                       'text' => 'very badly placed setfilename'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -77,9 +79,11 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
               ],
               'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'very badly placed setfilename'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -105,7 +109,7 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
                   'text' => 'a bit too late'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -114,9 +118,11 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'a bit too late'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 4,
@@ -124,7 +130,8 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -161,9 +168,11 @@ $result_sectioning{'setfilename_on_top_and_after_node'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -181,17 +190,20 @@ $result_nodes{'setfilename_on_top_and_after_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'setfilename_on_top_and_after_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'setfilename_on_top_and_after_node'} = [
diff --git a/tp/t/results/sectioning/shortcontents.pl 
b/tp/t/results/sectioning/shortcontents.pl
index f9d5c36e72..b6ccfcab3a 100644
--- a/tp/t/results/sectioning/shortcontents.pl
+++ b/tp/t/results/sectioning/shortcontents.pl
@@ -24,7 +24,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -39,7 +39,8 @@ $result_trees{'shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -56,7 +57,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -71,7 +72,7 @@ $result_trees{'shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -88,7 +89,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -103,7 +104,7 @@ $result_trees{'shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -120,7 +121,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'subsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -135,7 +136,7 @@ $result_trees{'shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -152,7 +153,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'subsubsection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -167,7 +168,7 @@ $result_trees{'shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -184,7 +185,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -199,7 +200,8 @@ $result_trees{'shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -216,7 +218,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -232,7 +234,9 @@ $result_trees{'shortcontents'} = {
         }
       ],
       'extra' => {
-        'associated_part' => {},
+        'associated_part' => {}
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -249,7 +253,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'second chapter in part'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -264,7 +268,7 @@ $result_trees{'shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -281,7 +285,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'unnumbered'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -296,7 +300,7 @@ $result_trees{'shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -313,7 +317,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'appendix'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -328,7 +332,7 @@ $result_trees{'shortcontents'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -345,7 +349,7 @@ $result_trees{'shortcontents'} = {
               'text' => 'appendixsec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -375,7 +379,7 @@ $result_trees{'shortcontents'} = {
           }
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -456,26 +460,27 @@ $result_sectioning{'shortcontents'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
-                                'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'section_level' => 4,
                                   'section_number' => '1.1.1.1',
@@ -515,6 +520,7 @@ $result_sectioning{'shortcontents'} = {
             'extra' => {
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'section_level' => 1,
               'section_number' => 2,
@@ -524,12 +530,13 @@ $result_sectioning{'shortcontents'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 3,
@@ -541,7 +548,7 @@ $result_sectioning{'shortcontents'} = {
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_prev' => {},
@@ -558,12 +565,12 @@ $result_sectioning{'shortcontents'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
-              'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_level' => 2,
                 'section_number' => 'A.1',
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index fdb88f87e9..95a60c4632 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -25,7 +25,7 @@ $result_trees{'space_in_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -42,7 +42,7 @@ $result_trees{'space_in_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -224,7 +224,7 @@ $result_trees{'space_in_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -233,9 +233,11 @@ $result_trees{'space_in_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -267,7 +269,9 @@ $result_trees{'space_in_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -284,7 +288,7 @@ $result_trees{'space_in_node'} = {
               'text' => 'Chap first  here'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -311,7 +315,9 @@ $result_trees{'space_in_node'} = {
             'normalized' => 'Chap-first-here'
           }
         ],
-        'normalized' => 'Chap-first-here',
+        'normalized' => 'Chap-first-here'
+      },
+      'info' => {
         'spaces_before_argument' => '  '
       },
       'source_info' => {
@@ -328,7 +334,7 @@ $result_trees{'space_in_node'} = {
               'text' => 'Test               title'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -355,7 +361,9 @@ $result_trees{'space_in_node'} = {
             'normalized' => 'Test-title'
           }
         ],
-        'normalized' => 'Test-title',
+        'normalized' => 'Test-title'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -372,7 +380,7 @@ $result_trees{'space_in_node'} = {
               'text' => 'Last with spaces'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' 
 '
           },
@@ -392,7 +400,9 @@ $result_trees{'space_in_node'} = {
             'normalized' => 'Last-with-spaces'
           }
         ],
-        'normalized' => 'Last-with-spaces',
+        'normalized' => 'Last-with-spaces'
+      },
+      'info' => {
         'spaces_before_argument' => '   '
       },
       'source_info' => {
@@ -458,24 +468,28 @@ $result_nodes{'space_in_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Chap-first-here'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Test-title'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Last-with-spaces'
               },
+              'info' => {},
               'structure' => {
                 'node_prev' => {},
                 'node_up' => {}
@@ -505,24 +519,28 @@ $result_menus{'space_in_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Chap-first-here'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Test-title'
           },
+          'info' => {},
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Last-with-spaces'
               },
+              'info' => {},
               'structure' => {
                 'menu_prev' => {},
                 'menu_up' => {},
diff --git a/tp/t/results/sectioning/special_spaces_in_nodes.pl 
b/tp/t/results/sectioning/special_spaces_in_nodes.pl
index f14071ae94..fab3813555 100644
--- a/tp/t/results/sectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/sectioning/special_spaces_in_nodes.pl
@@ -33,7 +33,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "Top\x{2000}"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => " \n"
           },
           "type" => "line_arg"
@@ -52,7 +52,9 @@ $result_trees{'special_spaces_in_nodes'} = {
             "normalized" => "Top_2002"
           }
         ],
-        "normalized" => "Top_2002",
+        "normalized" => "Top_2002"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -69,7 +71,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "top"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -82,7 +84,8 @@ $result_trees{'special_spaces_in_nodes'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -99,7 +102,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -118,7 +121,9 @@ $result_trees{'special_spaces_in_nodes'} = {
             "normalized" => 
"EN-QUAD_007c_2002_007c-EM-QUAD_007c_2003_007c-EN-SPACE_007c_2002_007c"
           }
         ],
-        "normalized" => 
"EN-QUAD_007c_2002_007c-EM-QUAD_007c_2003_007c-EN-SPACE_007c_2002_007c",
+        "normalized" => 
"EN-QUAD_007c_2002_007c-EM-QUAD_007c_2003_007c-EN-SPACE_007c_2002_007c"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -135,7 +140,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "chap"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -154,7 +159,7 @@ $result_trees{'special_spaces_in_nodes'} = {
         {
           "args" => [
             {
-              "extra" => {
+              "info" => {
                 "spaces_after_argument" => "\n"
               },
               "type" => "block_line_arg"
@@ -554,7 +559,7 @@ $result_trees{'special_spaces_in_nodes'} = {
                       "text" => "menu"
                     }
                   ],
-                  "extra" => {
+                  "info" => {
                     "spaces_after_argument" => "\n"
                   },
                   "type" => "line_arg"
@@ -562,9 +567,11 @@ $result_trees{'special_spaces_in_nodes'} = {
               ],
               "cmdname" => "end",
               "extra" => {
-                "spaces_before_argument" => " ",
                 "text_arg" => "menu"
               },
+              "info" => {
+                "spaces_before_argument" => " "
+              },
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
                 "line_nr" => 18,
@@ -583,7 +590,8 @@ $result_trees{'special_spaces_in_nodes'} = {
           "type" => "empty_line"
         }
       ],
-      "extra" => {
+      "extra" => {},
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -600,7 +608,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -625,7 +633,9 @@ $result_trees{'special_spaces_in_nodes'} = {
             "normalized" => 
"CHARACTER-TABULATION_007c-_007c-FORM-FEED_007c-_007c-LINE-TABULATION_007c-_007c"
           }
         ],
-        "normalized" => 
"CHARACTER-TABULATION_007c-_007c-FORM-FEED_007c-_007c-LINE-TABULATION_007c-_007c",
+        "normalized" => 
"CHARACTER-TABULATION_007c-_007c-FORM-FEED_007c-_007c-LINE-TABULATION_007c-_007c"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -642,7 +652,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "CARRIAGE RETURN|\r|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -667,7 +677,9 @@ $result_trees{'special_spaces_in_nodes'} = {
             "normalized" => "CARRIAGE-RETURN_007c-_007c"
           }
         ],
-        "normalized" => "CARRIAGE-RETURN_007c-_007c",
+        "normalized" => "CARRIAGE-RETURN_007c-_007c"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -684,7 +696,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| OGHAM 
SPACE MARK|\x{1680}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -709,7 +721,9 @@ $result_trees{'special_spaces_in_nodes'} = {
             "normalized" => 
"NEXT-LINE-_0028NEL_0029_007c_0085_007c-NO_002dBREAK-SPACE_007c_00a0_007c-OGHAM-SPACE-MARK_007c_1680_007c"
           }
         ],
-        "normalized" => 
"NEXT-LINE-_0028NEL_0029_007c_0085_007c-NO_002dBREAK-SPACE_007c_00a0_007c-OGHAM-SPACE-MARK_007c_1680_007c",
+        "normalized" => 
"NEXT-LINE-_0028NEL_0029_007c_0085_007c-NO_002dBREAK-SPACE_007c_00a0_007c-OGHAM-SPACE-MARK_007c_1680_007c"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -726,7 +740,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -751,7 +765,9 @@ $result_trees{'special_spaces_in_nodes'} = {
             "normalized" => 
"MONGOLIAN-VOWEL-SEPARATOR_007c_180e_007c-EM-SPACE_007c_2003_007c"
           }
         ],
-        "normalized" => 
"MONGOLIAN-VOWEL-SEPARATOR_007c_180e_007c-EM-SPACE_007c_2003_007c",
+        "normalized" => 
"MONGOLIAN-VOWEL-SEPARATOR_007c_180e_007c-EM-SPACE_007c_2003_007c"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -768,7 +784,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -793,7 +809,9 @@ $result_trees{'special_spaces_in_nodes'} = {
             "normalized" => 
"THREE_002dPER_002dEM-SPACE_007c_2004_007c-FOUR_002dPER_002dEM-SPACE_007c_2005_007c-SIX_002dPER_002dEM-SPACE_007c_2006_007c"
           }
         ],
-        "normalized" => 
"THREE_002dPER_002dEM-SPACE_007c_2004_007c-FOUR_002dPER_002dEM-SPACE_007c_2005_007c-SIX_002dPER_002dEM-SPACE_007c_2006_007c",
+        "normalized" => 
"THREE_002dPER_002dEM-SPACE_007c_2004_007c-FOUR_002dPER_002dEM-SPACE_007c_2005_007c-SIX_002dPER_002dEM-SPACE_007c_2006_007c"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -810,7 +828,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "FIGURE SPACE|\x{2007}| PUNCTUATION SPACE|\x{2008}| 
THIN SPACE|\x{2009}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -835,7 +853,9 @@ $result_trees{'special_spaces_in_nodes'} = {
             "normalized" => 
"FIGURE-SPACE_007c_2007_007c-PUNCTUATION-SPACE_007c_2008_007c-THIN-SPACE_007c_2009_007c"
           }
         ],
-        "normalized" => 
"FIGURE-SPACE_007c_2007_007c-PUNCTUATION-SPACE_007c_2008_007c-THIN-SPACE_007c_2009_007c",
+        "normalized" => 
"FIGURE-SPACE_007c_2007_007c-PUNCTUATION-SPACE_007c_2008_007c-THIN-SPACE_007c_2009_007c"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -852,7 +872,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "HAIR SPACE|\x{200a}| LINE SEPARATOR|\x{2028}| 
PARAGRAPH SEPARATOR|\x{2029}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -877,7 +897,9 @@ $result_trees{'special_spaces_in_nodes'} = {
             "normalized" => 
"HAIR-SPACE_007c_200a_007c-LINE-SEPARATOR_007c_2028_007c-PARAGRAPH-SEPARATOR_007c_2029_007c"
           }
         ],
-        "normalized" => 
"HAIR-SPACE_007c_200a_007c-LINE-SEPARATOR_007c_2028_007c-PARAGRAPH-SEPARATOR_007c_2029_007c",
+        "normalized" => 
"HAIR-SPACE_007c_200a_007c-LINE-SEPARATOR_007c_2028_007c-PARAGRAPH-SEPARATOR_007c_2029_007c"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -894,7 +916,7 @@ $result_trees{'special_spaces_in_nodes'} = {
               "text" => "NARROW NO-BREAK SPACE|\x{202f}| MEDIUM MATHEMATICAL 
SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
             }
           ],
-          "extra" => {
+          "info" => {
             "spaces_after_argument" => "\n"
           },
           "type" => "line_arg"
@@ -958,7 +980,9 @@ $result_trees{'special_spaces_in_nodes'} = {
             "normalized" => 
"NARROW-NO_002dBREAK-SPACE_007c_202f_007c-MEDIUM-MATHEMATICAL-SPACE_007c_205f_007c-IDEOGRAPHIC-SPACE_007c_3000_007c"
           }
         ],
-        "normalized" => 
"NARROW-NO_002dBREAK-SPACE_007c_202f_007c-MEDIUM-MATHEMATICAL-SPACE_007c_205f_007c-IDEOGRAPHIC-SPACE_007c_3000_007c",
+        "normalized" => 
"NARROW-NO_002dBREAK-SPACE_007c_202f_007c-MEDIUM-MATHEMATICAL-SPACE_007c_205f_007c-IDEOGRAPHIC-SPACE_007c_3000_007c"
+      },
+      "info" => {
         "spaces_before_argument" => " "
       },
       "source_info" => {
@@ -1098,9 +1122,11 @@ $result_sectioning{'special_spaces_in_nodes'} = {
             'extra' => {
               'normalized' => 'Top_2002'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1111,9 +1137,11 @@ $result_sectioning{'special_spaces_in_nodes'} = {
                   'extra' => {
                     'normalized' => 
'EN-QUAD_007c_2002_007c-EM-QUAD_007c_2003_007c-EN-SPACE_007c_2002_007c'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1142,10 +1170,12 @@ $result_nodes{'special_spaces_in_nodes'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top_2002'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -1153,6 +1183,7 @@ $result_nodes{'special_spaces_in_nodes'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1164,54 +1195,63 @@ $result_nodes{'special_spaces_in_nodes'} = {
         ],
         'normalized' => 
'EN-QUAD_007c_2002_007c-EM-QUAD_007c_2003_007c-EN-SPACE_007c_2002_007c'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 
'CHARACTER-TABULATION_007c-_007c-FORM-FEED_007c-_007c-LINE-TABULATION_007c-_007c'
           },
+          'info' => {},
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'CARRIAGE-RETURN_007c-_007c'
               },
+              'info' => {},
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 
'NEXT-LINE-_0028NEL_0029_007c_0085_007c-NO_002dBREAK-SPACE_007c_00a0_007c-OGHAM-SPACE-MARK_007c_1680_007c'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 
'MONGOLIAN-VOWEL-SEPARATOR_007c_180e_007c-EM-SPACE_007c_2003_007c'
                       },
+                      'info' => {},
                       'structure' => {
                         'node_next' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 
'THREE_002dPER_002dEM-SPACE_007c_2004_007c-FOUR_002dPER_002dEM-SPACE_007c_2005_007c-SIX_002dPER_002dEM-SPACE_007c_2006_007c'
                           },
+                          'info' => {},
                           'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
                               'extra' => {
                                 'normalized' => 
'FIGURE-SPACE_007c_2007_007c-PUNCTUATION-SPACE_007c_2008_007c-THIN-SPACE_007c_2009_007c'
                               },
+                              'info' => {},
                               'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
                                     'normalized' => 
'HAIR-SPACE_007c_200a_007c-LINE-SEPARATOR_007c_2028_007c-PARAGRAPH-SEPARATOR_007c_2029_007c'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
                                         'normalized' => 
'NARROW-NO_002dBREAK-SPACE_007c_202f_007c-MEDIUM-MATHEMATICAL-SPACE_007c_205f_007c-IDEOGRAPHIC-SPACE_007c_3000_007c'
                                       },
+                                      'info' => {},
                                       'structure' => {
                                         'node_prev' => {},
                                         'node_up' => {}
@@ -1271,6 +1311,7 @@ $result_menus{'special_spaces_in_nodes'} = {
   'extra' => {
     'normalized' => 'Top_2002'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/sectioning/top_chapter_sections.pl 
b/tp/t/results/sectioning/top_chapter_sections.pl
index 031b5a22a2..488afd191f 100644
--- a/tp/t/results/sectioning/top_chapter_sections.pl
+++ b/tp/t/results/sectioning/top_chapter_sections.pl
@@ -19,7 +19,7 @@ $result_trees{'top_chapter_sections'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -34,7 +34,8 @@ $result_trees{'top_chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -59,7 +60,7 @@ $result_trees{'top_chapter_sections'} = [
                 'text' => 'unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -74,7 +75,8 @@ $result_trees{'top_chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -99,7 +101,7 @@ $result_trees{'top_chapter_sections'} = [
                 'text' => 'First chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -114,7 +116,8 @@ $result_trees{'top_chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -139,7 +142,7 @@ $result_trees{'top_chapter_sections'} = [
                 'text' => 'second'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -154,7 +157,8 @@ $result_trees{'top_chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -179,7 +183,7 @@ $result_trees{'top_chapter_sections'} = [
                 'text' => 'Chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -194,7 +198,8 @@ $result_trees{'top_chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -219,7 +224,7 @@ $result_trees{'top_chapter_sections'} = [
                 'text' => 'Section of chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -234,7 +239,8 @@ $result_trees{'top_chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -259,7 +265,7 @@ $result_trees{'top_chapter_sections'} = [
                 'text' => 'subsection 1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -274,7 +280,8 @@ $result_trees{'top_chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -299,7 +306,7 @@ $result_trees{'top_chapter_sections'} = [
                 'text' => 'subsection 2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -314,7 +321,8 @@ $result_trees{'top_chapter_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -339,7 +347,7 @@ $result_trees{'top_chapter_sections'} = [
                 'text' => 'Chapter 2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -347,7 +355,8 @@ $result_trees{'top_chapter_sections'} = [
           }
         ],
         'cmdname' => 'chapter',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -427,6 +436,7 @@ $result_sectioning{'top_chapter_sections'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -439,6 +449,7 @@ $result_sectioning{'top_chapter_sections'} = {
                     'unit_command' => {
                       'cmdname' => 'unnumbered',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_level' => 1,
@@ -457,12 +468,14 @@ $result_sectioning{'top_chapter_sections'} = {
                           'unit_command' => {
                             'cmdname' => 'chapter',
                             'extra' => {},
+                            'info' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'section_childs' => [
                                 {
                                   'cmdname' => 'section',
                                   'extra' => {},
+                                  'info' => {},
                                   'structure' => {
                                     'associated_unit' => {
                                       'extra' => {
@@ -477,12 +490,14 @@ $result_sectioning{'top_chapter_sections'} = {
                                               'unit_command' => {
                                                 'cmdname' => 'chapter',
                                                 'extra' => {},
+                                                'info' => {},
                                                 'structure' => {
                                                   'associated_unit' => {},
                                                   'section_childs' => [
                                                     {
                                                       'cmdname' => 'section',
                                                       'extra' => {},
+                                                      'info' => {},
                                                       'structure' => {
                                                         'associated_unit' => {
                                                           'extra' => {
@@ -497,6 +512,7 @@ $result_sectioning{'top_chapter_sections'} = {
                                                                   
'unit_command' => {
                                                                     'cmdname' 
=> 'chapter',
                                                                     'extra' => 
{},
+                                                                    'info' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
                                                                       
'section_level' => 1,
@@ -515,6 +531,7 @@ $result_sectioning{'top_chapter_sections'} = {
                                                                         
'unit_command' => {
                                                                           
'cmdname' => 'subsection',
                                                                           
'extra' => {},
+                                                                          
'info' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {},
                                                                             
'section_level' => 3,
@@ -522,6 +539,7 @@ $result_sectioning{'top_chapter_sections'} = {
                                                                             
'section_prev' => {
                                                                               
'cmdname' => 'subsection',
                                                                               
'extra' => {},
+                                                                              
'info' => {},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {
                                                                                
   'extra' => {
@@ -806,6 +824,7 @@ $result_elements{'top_chapter_sections'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -818,6 +837,7 @@ $result_elements{'top_chapter_sections'} = [
             'unit_command' => {
               'cmdname' => 'unnumbered',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {}
               }
@@ -832,6 +852,7 @@ $result_elements{'top_chapter_sections'} = [
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -847,6 +868,7 @@ $result_elements{'top_chapter_sections'} = [
                         'unit_command' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 2
@@ -860,6 +882,7 @@ $result_elements{'top_chapter_sections'} = [
                               'unit_command' => {
                                 'cmdname' => 'section',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_number' => '1.1'
@@ -884,6 +907,7 @@ $result_elements{'top_chapter_sections'} = [
                               'unit_command' => {
                                 'cmdname' => 'chapter',
                                 'extra' => {},
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_number' => 3
@@ -897,6 +921,7 @@ $result_elements{'top_chapter_sections'} = [
                                     'unit_command' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
+                                      'info' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'section_number' => '2.1.2'
@@ -910,6 +935,7 @@ $result_elements{'top_chapter_sections'} = [
                                           'unit_command' => {
                                             'cmdname' => 'subsection',
                                             'extra' => {},
+                                            'info' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'section_number' => '2.1.1'
@@ -923,6 +949,7 @@ $result_elements{'top_chapter_sections'} = [
                                                 'unit_command' => {
                                                   'cmdname' => 'section',
                                                   'extra' => {},
+                                                  'info' => {},
                                                   'structure' => {
                                                     'associated_unit' => {},
                                                     'section_number' => '2.1'
diff --git a/tp/t/results/sectioning/top_no_argument_and_content.pl 
b/tp/t/results/sectioning/top_no_argument_and_content.pl
index 4847c89d7e..32544a8592 100644
--- a/tp/t/results/sectioning/top_no_argument_and_content.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_content.pl
@@ -19,7 +19,7 @@ $result_trees{'top_no_argument_and_content'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
diff --git a/tp/t/results/sectioning/top_no_argument_and_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_node.pl
index a3391ac7f5..dcc0ed008e 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -18,7 +18,7 @@ $result_trees{'top_no_argument_and_node'} = {
               'text' => 'start'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'top_no_argument_and_node'} = {
             'normalized' => 'start'
           }
         ],
-        'normalized' => 'start',
+        'normalized' => 'start'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +52,7 @@ $result_trees{'top_no_argument_and_node'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,8 @@ $result_sectioning{'top_no_argument_and_node'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'start'
-            }
+            },
+            'info' => {}
           }
         },
         'structure' => {
@@ -111,14 +114,16 @@ $result_nodes{'top_no_argument_and_node'} = {
       'structure' => {}
     },
     'normalized' => 'start'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'top_no_argument_and_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'start'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'top_no_argument_and_node'} = [];
diff --git a/tp/t/results/sectioning/top_no_argument_and_top_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
index fa30360a20..6db605eeba 100644
--- a/tp/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -18,7 +18,7 @@ $result_trees{'top_no_argument_and_top_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'top_no_argument_and_top_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +52,7 @@ $result_trees{'top_no_argument_and_top_node'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -88,7 +90,8 @@ $result_sectioning{'top_no_argument_and_top_node'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
         'structure' => {
@@ -111,14 +114,16 @@ $result_nodes{'top_no_argument_and_top_node'} = {
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'top_no_argument_and_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'top_no_argument_and_top_node'} = [];
diff --git a/tp/t/results/sectioning/top_node_no_menu_direction.pl 
b/tp/t/results/sectioning/top_node_no_menu_direction.pl
index 06c5c46789..dcaa9ccbdc 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -18,7 +18,7 @@ $result_trees{'top_node_no_menu_direction'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'top_node_no_menu_direction'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -150,7 +150,7 @@ $result_trees{'top_node_no_menu_direction'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -159,9 +159,11 @@ $result_trees{'top_node_no_menu_direction'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -193,7 +195,9 @@ $result_trees{'top_node_no_menu_direction'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -229,7 +233,7 @@ $result_trees{'top_node_no_menu_direction'} = {
               'text' => 'TOP'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -262,7 +266,9 @@ $result_trees{'top_node_no_menu_direction'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'second-node',
+        'normalized' => 'second-node'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -312,12 +318,14 @@ $result_nodes{'top_node_no_menu_direction'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -335,12 +343,14 @@ $result_menus{'top_node_no_menu_direction'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'second-node'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {},
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index cbf1fbb9bd..af80db17f5 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -25,7 +25,7 @@ $result_trees{'top_node_part_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -52,7 +52,9 @@ $result_trees{'top_node_part_top'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -69,7 +71,7 @@ $result_trees{'top_node_part_top'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -84,7 +86,8 @@ $result_trees{'top_node_part_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -101,7 +104,7 @@ $result_trees{'top_node_part_top'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -110,7 +113,9 @@ $result_trees{'top_node_part_top'} = [
         ],
         'cmdname' => 'top',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -161,6 +166,7 @@ $result_sectioning{'top_node_part_top'} = {
                 'extra' => {
                   'normalized' => 'Top'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {
                     'extra' => {
@@ -177,6 +183,7 @@ $result_sectioning{'top_node_part_top'} = {
               },
               'associated_part' => {}
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {},
               'section_level' => 0,
@@ -185,6 +192,7 @@ $result_sectioning{'top_node_part_top'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -215,6 +223,7 @@ $result_nodes{'top_node_part_top'} = {
         'associated_part' => {
           'cmdname' => 'part',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {
               'extra' => {
@@ -230,12 +239,14 @@ $result_nodes{'top_node_part_top'} = {
           }
         }
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {}
       }
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {}
   }
@@ -250,6 +261,7 @@ $result_menus{'top_node_part_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -259,11 +271,13 @@ $result_menus{'top_node_part_top'} = {
             'associated_part' => {
               'cmdname' => 'part',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {}
               }
             }
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -316,11 +330,13 @@ $result_elements{'top_node_part_top'} = [
           'associated_part' => {
             'cmdname' => 'part',
             'extra' => {},
+            'info' => {},
             'structure' => {
               'associated_unit' => {}
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
diff --git a/tp/t/results/sectioning/top_node_up_url.pl 
b/tp/t/results/sectioning/top_node_up_url.pl
index 9e0976f4a1..1280e30148 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -19,7 +19,7 @@ $result_trees{'top_node_up_url'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -39,7 +39,9 @@ $result_trees{'top_node_up_url'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -56,7 +58,7 @@ $result_trees{'top_node_up_url'} = [
                 'text' => 'internal top node up'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -73,7 +75,7 @@ $result_trees{'top_node_up_url'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -139,7 +141,7 @@ $result_trees{'top_node_up_url'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -148,9 +150,11 @@ $result_trees{'top_node_up_url'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -170,7 +174,8 @@ $result_trees{'top_node_up_url'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -195,7 +200,7 @@ $result_trees{'top_node_up_url'} = [
                 'text' => 'first'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -215,7 +220,9 @@ $result_trees{'top_node_up_url'} = [
               'normalized' => 'first'
             }
           ],
-          'normalized' => 'first',
+          'normalized' => 'first'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -269,6 +276,7 @@ $result_sectioning{'top_node_up_url'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -283,6 +291,7 @@ $result_sectioning{'top_node_up_url'} = {
                           'extra' => {
                             'normalized' => 'first'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -312,6 +321,7 @@ $result_sectioning{'top_node_up_url'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 0,
@@ -344,6 +354,7 @@ $result_nodes{'top_node_up_url'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -358,6 +369,7 @@ $result_nodes{'top_node_up_url'} = {
                     'extra' => {
                       'normalized' => 'first'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_prev' => {},
@@ -395,6 +407,7 @@ $result_nodes{'top_node_up_url'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {},
@@ -425,6 +438,7 @@ $result_menus{'top_node_up_url'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -439,6 +453,7 @@ $result_menus{'top_node_up_url'} = {
                 'extra' => {
                   'normalized' => 'first'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_up' => {},
@@ -502,6 +517,7 @@ $result_elements{'top_node_up_url'} = [
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -509,6 +525,7 @@ $result_elements{'top_node_up_url'} = [
             'extra' => {
               'normalized' => 'first'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
diff --git a/tp/t/results/sectioning/top_part_chapter.pl 
b/tp/t/results/sectioning/top_part_chapter.pl
index 3d97411c10..57f43c2adb 100644
--- a/tp/t/results/sectioning/top_part_chapter.pl
+++ b/tp/t/results/sectioning/top_part_chapter.pl
@@ -19,7 +19,7 @@ $result_trees{'top_part_chapter'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -34,7 +34,8 @@ $result_trees{'top_part_chapter'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -59,7 +60,7 @@ $result_trees{'top_part_chapter'} = [
                 'text' => 'part'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -74,7 +75,8 @@ $result_trees{'top_part_chapter'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -91,7 +93,7 @@ $result_trees{'top_part_chapter'} = [
                 'text' => 'chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => ' 
 '
             },
@@ -100,7 +102,9 @@ $result_trees{'top_part_chapter'} = [
         ],
         'cmdname' => 'chapter',
         'extra' => {
-          'associated_part' => {},
+          'associated_part' => {}
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -144,6 +148,7 @@ $result_sectioning{'top_part_chapter'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -161,6 +166,7 @@ $result_sectioning{'top_part_chapter'} = {
                           'extra' => {
                             'part_associated_section' => {}
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_childs' => [
@@ -172,6 +178,7 @@ $result_sectioning{'top_part_chapter'} = {
                           }
                         }
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_level' => 1,
@@ -242,6 +249,7 @@ $result_elements{'top_part_chapter'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -257,11 +265,13 @@ $result_elements{'top_part_chapter'} = [
                 'associated_part' => {
                   'cmdname' => 'part',
                   'extra' => {},
+                  'info' => {},
                   'structure' => {
                     'associated_unit' => {}
                   }
                 }
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index bde3a841a3..b03929d854 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -19,7 +19,7 @@ $result_trees{'top_without_node_nodes'} = [
                 'text' => 'top section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -43,7 +43,8 @@ $result_trees{'top_without_node_nodes'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -80,7 +81,7 @@ $result_trees{'top_without_node_nodes'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -107,7 +108,9 @@ $result_trees{'top_without_node_nodes'} = [
               ]
             }
           ],
-          'normalized' => 'second',
+          'normalized' => 'second'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -124,7 +127,7 @@ $result_trees{'top_without_node_nodes'} = [
                 'text' => 'Chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -148,7 +151,8 @@ $result_trees{'top_without_node_nodes'} = [
             'type' => 'paragraph'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -195,6 +199,7 @@ $result_sectioning{'top_without_node_nodes'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -203,6 +208,7 @@ $result_sectioning{'top_without_node_nodes'} = {
                 'extra' => {
                   'normalized' => 'second'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {}
                 }
@@ -225,6 +231,7 @@ $result_sectioning{'top_without_node_nodes'} = {
               'extra' => {
                 'associated_node' => {}
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_level' => 1,
@@ -258,6 +265,7 @@ $result_nodes{'top_without_node_nodes'} = {
     'associated_section' => {
       'cmdname' => 'chapter',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -285,6 +293,7 @@ $result_nodes{'top_without_node_nodes'} = {
     },
     'normalized' => 'second'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'node_up' => {
@@ -304,6 +313,7 @@ $result_menus{'top_without_node_nodes'} = {
   'extra' => {
     'normalized' => 'second'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -345,6 +355,7 @@ $result_elements{'top_without_node_nodes'} = [
         'extra' => {
           'normalized' => 'second'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index 283388305a..09863e3908 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -19,7 +19,7 @@ $result_trees{'top_without_node_sections'} = [
                 'text' => 'top section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -43,7 +43,8 @@ $result_trees{'top_without_node_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -88,7 +89,7 @@ $result_trees{'top_without_node_sections'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -115,7 +116,9 @@ $result_trees{'top_without_node_sections'} = [
               ]
             }
           ],
-          'normalized' => 'second',
+          'normalized' => 'second'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -132,7 +135,7 @@ $result_trees{'top_without_node_sections'} = [
                 'text' => 'Chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -156,7 +159,8 @@ $result_trees{'top_without_node_sections'} = [
             'type' => 'paragraph'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -204,6 +208,7 @@ $result_sectioning{'top_without_node_sections'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -221,11 +226,13 @@ $result_sectioning{'top_without_node_sections'} = {
                           'extra' => {
                             'normalized' => 'second'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
                         }
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_level' => 1,
@@ -292,6 +299,7 @@ $result_nodes{'top_without_node_sections'} = {
     'associated_section' => {
       'cmdname' => 'chapter',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -304,6 +312,7 @@ $result_nodes{'top_without_node_sections'} = {
                   'unit_command' => {
                     'cmdname' => 'top',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
@@ -342,6 +351,7 @@ $result_nodes{'top_without_node_sections'} = {
     },
     'normalized' => 'second'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'node_up' => {
@@ -369,12 +379,14 @@ $result_menus{'top_without_node_sections'} = {
   'extra' => {
     'normalized' => 'second'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'section_number' => 1
@@ -388,6 +400,7 @@ $result_menus{'top_without_node_sections'} = {
               'unit_command' => {
                 'cmdname' => 'top',
                 'extra' => {},
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {}
                 }
@@ -446,6 +459,7 @@ $result_elements{'top_without_node_sections'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -458,6 +472,7 @@ $result_elements{'top_without_node_sections'} = [
             'unit_command' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
diff --git a/tp/t/results/sectioning/topic_guide.pl 
b/tp/t/results/sectioning/topic_guide.pl
index 29317f177b..c0c5b5e456 100644
--- a/tp/t/results/sectioning/topic_guide.pl
+++ b/tp/t/results/sectioning/topic_guide.pl
@@ -39,7 +39,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -59,7 +59,9 @@ $result_trees{'topic_guide'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -76,7 +78,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'A example quide topic collection'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -111,7 +113,7 @@ $result_trees{'topic_guide'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -226,7 +228,7 @@ $result_trees{'topic_guide'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -235,9 +237,11 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 12,
@@ -257,7 +261,8 @@ $result_trees{'topic_guide'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -274,7 +279,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'guide1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -294,7 +299,9 @@ $result_trees{'topic_guide'} = {
             'normalized' => 'guide1'
           }
         ],
-        'normalized' => 'guide1',
+        'normalized' => 'guide1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -311,7 +318,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'guide 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -342,7 +349,7 @@ $result_trees{'topic_guide'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -506,7 +513,7 @@ $result_trees{'topic_guide'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -515,9 +522,11 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 23,
@@ -537,7 +546,8 @@ $result_trees{'topic_guide'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -562,7 +572,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'topic2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -594,7 +604,7 @@ $result_trees{'topic_guide'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -679,7 +689,7 @@ $result_trees{'topic_guide'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -688,9 +698,11 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 33,
@@ -728,7 +740,9 @@ $result_trees{'topic_guide'} = {
             'normalized' => 'topic2'
           }
         ],
-        'normalized' => 'topic1',
+        'normalized' => 'topic1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -753,7 +767,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'topic3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -764,7 +778,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'topic1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -796,7 +810,7 @@ $result_trees{'topic_guide'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -881,7 +895,7 @@ $result_trees{'topic_guide'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -890,9 +904,11 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 43,
@@ -936,7 +952,9 @@ $result_trees{'topic_guide'} = {
             'normalized' => 'topic1'
           }
         ],
-        'normalized' => 'topic2',
+        'normalized' => 'topic2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -961,7 +979,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'topic5'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -972,7 +990,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'topic2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -1004,7 +1022,7 @@ $result_trees{'topic_guide'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1040,7 +1058,7 @@ $result_trees{'topic_guide'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1049,9 +1067,11 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 52,
@@ -1095,7 +1115,9 @@ $result_trees{'topic_guide'} = {
             'normalized' => 'topic2'
           }
         ],
-        'normalized' => 'topic3',
+        'normalized' => 'topic3'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1112,7 +1134,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'topic4'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1143,7 +1165,7 @@ $result_trees{'topic_guide'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1228,7 +1250,7 @@ $result_trees{'topic_guide'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1237,9 +1259,11 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 62,
@@ -1271,7 +1295,9 @@ $result_trees{'topic_guide'} = {
             'normalized' => 'topic4'
           }
         ],
-        'normalized' => 'topic4',
+        'normalized' => 'topic4'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1291,7 +1317,7 @@ $result_trees{'topic_guide'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -1302,7 +1328,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'topic3'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -1334,7 +1360,7 @@ $result_trees{'topic_guide'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1468,7 +1494,7 @@ $result_trees{'topic_guide'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1477,9 +1503,11 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 73,
@@ -1518,7 +1546,9 @@ $result_trees{'topic_guide'} = {
             'normalized' => 'topic3'
           }
         ],
-        'normalized' => 'topic5',
+        'normalized' => 'topic5'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1535,7 +1565,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'guide2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1555,7 +1585,9 @@ $result_trees{'topic_guide'} = {
             'normalized' => 'guide2'
           }
         ],
-        'normalized' => 'guide2',
+        'normalized' => 'guide2'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1572,7 +1604,7 @@ $result_trees{'topic_guide'} = {
               'text' => 'guide 2'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1603,7 +1635,7 @@ $result_trees{'topic_guide'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1718,7 +1750,7 @@ $result_trees{'topic_guide'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1727,9 +1759,11 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 83,
@@ -1749,7 +1783,8 @@ $result_trees{'topic_guide'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1980,9 +2015,11 @@ $result_sectioning{'topic_guide'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1993,9 +2030,11 @@ $result_sectioning{'topic_guide'} = {
                   'extra' => {
                     'normalized' => 'guide1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2012,9 +2051,11 @@ $result_sectioning{'topic_guide'} = {
                   'extra' => {
                     'normalized' => 'guide2'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -2048,6 +2089,7 @@ $result_nodes{'topic_guide'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -2057,6 +2099,7 @@ $result_nodes{'topic_guide'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -2064,6 +2107,7 @@ $result_nodes{'topic_guide'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -2075,6 +2119,7 @@ $result_nodes{'topic_guide'} = {
         ],
         'normalized' => 'guide1'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -2086,6 +2131,7 @@ $result_nodes{'topic_guide'} = {
             ],
             'normalized' => 'topic1'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {},
             'node_next' => {
@@ -2098,6 +2144,7 @@ $result_nodes{'topic_guide'} = {
                 ],
                 'normalized' => 'topic2'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {},
                 'node_next' => {
@@ -2110,6 +2157,7 @@ $result_nodes{'topic_guide'} = {
                     ],
                     'normalized' => 'topic3'
                   },
+                  'info' => {},
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
@@ -2121,6 +2169,7 @@ $result_nodes{'topic_guide'} = {
                         ],
                         'normalized' => 'topic5'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {},
                         'node_prev' => {}
@@ -2140,6 +2189,7 @@ $result_nodes{'topic_guide'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
@@ -2151,6 +2201,7 @@ $result_nodes{'topic_guide'} = {
             ],
             'normalized' => 'guide2'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {},
             'node_prev' => {},
@@ -2182,18 +2233,21 @@ $result_menus{'topic_guide'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'guide1'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'topic1'
           },
+          'info' => {},
           'structure' => {
             'menu_child' => {},
             'menu_next' => {
@@ -2201,6 +2255,7 @@ $result_menus{'topic_guide'} = {
               'extra' => {
                 'normalized' => 'topic2'
               },
+              'info' => {},
               'structure' => {
                 'menu_child' => {},
                 'menu_next' => {
@@ -2208,6 +2263,7 @@ $result_menus{'topic_guide'} = {
                   'extra' => {
                     'normalized' => 'topic5'
                   },
+                  'info' => {},
                   'structure' => {
                     'menu_child' => {},
                     'menu_next' => {
@@ -2215,12 +2271,14 @@ $result_menus{'topic_guide'} = {
                       'extra' => {
                         'normalized' => 'topic4'
                       },
+                      'info' => {},
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'guide2'
                           },
+                          'info' => {},
                           'structure' => {
                             'menu_child' => {},
                             'menu_prev' => {},
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 2e9e8a56b8..9e47a555a8 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -19,7 +19,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -36,7 +36,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -230,7 +230,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -239,9 +239,11 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 7,
@@ -273,7 +275,9 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -313,7 +317,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                 }
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -340,7 +344,9 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               'normalized' => '_00e3'
             }
           ],
-          'normalized' => '_00e3',
+          'normalized' => '_00e3'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -365,7 +371,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                 'text' => 'n'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -392,7 +398,9 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               'normalized' => 'n'
             }
           ],
-          'normalized' => 'n',
+          'normalized' => 'n'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -432,7 +440,7 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                 }
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -452,7 +460,9 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
               'normalized' => '_00e2'
             }
           ],
-          'normalized' => '_00e2',
+          'normalized' => '_00e2'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -522,6 +532,7 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -536,6 +547,7 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
                 'extra' => {
                   'normalized' => '_00e3'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'node_next' => {
@@ -543,6 +555,7 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
                     'extra' => {
                       'normalized' => 'n'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {
                         'extra' => {
@@ -558,6 +571,7 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
                                   'extra' => {
                                     'normalized' => '_00e2'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'associated_unit' => {},
                                     'node_prev' => {},
@@ -675,6 +689,7 @@ $result_menus{'transliterated_split_equivalent_nodes'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -689,6 +704,7 @@ $result_menus{'transliterated_split_equivalent_nodes'} = {
                 'extra' => {
                   'normalized' => '_00e3'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
@@ -696,6 +712,7 @@ $result_menus{'transliterated_split_equivalent_nodes'} = {
                     'extra' => {
                       'normalized' => 'n'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {
                         'extra' => {
@@ -711,6 +728,7 @@ $result_menus{'transliterated_split_equivalent_nodes'} = {
                                   'extra' => {
                                     'normalized' => '_00e2'
                                   },
+                                  'info' => {},
                                   'structure' => {
                                     'associated_unit' => {},
                                     'menu_prev' => {},
@@ -842,6 +860,7 @@ $result_elements{'transliterated_split_equivalent_nodes'} = 
[
         'extra' => {
           'normalized' => 'Top'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
@@ -849,6 +868,7 @@ $result_elements{'transliterated_split_equivalent_nodes'} = 
[
             'extra' => {
               'normalized' => '_00e3'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -864,6 +884,7 @@ $result_elements{'transliterated_split_equivalent_nodes'} = 
[
                           'extra' => {
                             'normalized' => 'n'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'menu_next' => {
@@ -871,6 +892,7 @@ $result_elements{'transliterated_split_equivalent_nodes'} = 
[
                               'extra' => {
                                 'normalized' => '_00e2'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {
                                   'extra' => {
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end.pl
index 09ea4cca95..de7b52c43a 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -25,7 +25,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -45,7 +45,9 @@ $result_trees{'two_nodes_at_the_end'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -79,7 +81,7 @@ $result_trees{'two_nodes_at_the_end'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -243,7 +245,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -252,9 +254,11 @@ $result_trees{'two_nodes_at_the_end'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 8,
@@ -274,7 +278,8 @@ $result_trees{'two_nodes_at_the_end'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -307,7 +312,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'text' => 'node after chapter 1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -318,7 +323,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -329,7 +334,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -368,7 +373,9 @@ $result_trees{'two_nodes_at_the_end'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'chapter-1',
+          'normalized' => 'chapter-1'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -385,7 +392,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'text' => 'chapter c1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -400,7 +407,8 @@ $result_trees{'two_nodes_at_the_end'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -417,7 +425,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'text' => 'node after chapter 1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -458,7 +466,9 @@ $result_trees{'two_nodes_at_the_end'} = [
               'normalized' => 'node-after-chapter-1'
             }
           ],
-          'normalized' => 'node-after-chapter-1',
+          'normalized' => 'node-after-chapter-1'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -475,7 +485,7 @@ $result_trees{'two_nodes_at_the_end'} = [
                 'text' => 'node after chapter 2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -495,7 +505,9 @@ $result_trees{'two_nodes_at_the_end'} = [
               'normalized' => 'node-after-chapter-2'
             }
           ],
-          'normalized' => 'node-after-chapter-2',
+          'normalized' => 'node-after-chapter-2'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -577,6 +589,7 @@ $result_sectioning{'two_nodes_at_the_end'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -594,11 +607,13 @@ $result_sectioning{'two_nodes_at_the_end'} = {
                               'extra' => {
                                 'normalized' => 'chapter-1'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -637,6 +652,7 @@ $result_sectioning{'two_nodes_at_the_end'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_childs' => [
@@ -681,6 +697,7 @@ $result_nodes{'two_nodes_at_the_end'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -693,6 +710,7 @@ $result_nodes{'two_nodes_at_the_end'} = {
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -733,6 +751,7 @@ $result_nodes{'two_nodes_at_the_end'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -741,6 +760,7 @@ $result_nodes{'two_nodes_at_the_end'} = {
         'associated_section' => {},
         'normalized' => 'chapter-1'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_next' => {
@@ -748,6 +768,7 @@ $result_nodes{'two_nodes_at_the_end'} = {
           'extra' => {
             'normalized' => 'node-after-chapter-1'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'node_next' => {
@@ -755,6 +776,7 @@ $result_nodes{'two_nodes_at_the_end'} = {
               'extra' => {
                 'normalized' => 'node-after-chapter-2'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'node_prev' => {},
@@ -807,12 +829,14 @@ $result_menus{'two_nodes_at_the_end'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -825,6 +849,7 @@ $result_menus{'two_nodes_at_the_end'} = {
               'unit_command' => {
                 'cmdname' => 'chapter',
                 'extra' => {},
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -861,6 +886,7 @@ $result_menus{'two_nodes_at_the_end'} = {
       'extra' => {
         'normalized' => 'chapter-1'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_next' => {
@@ -868,6 +894,7 @@ $result_menus{'two_nodes_at_the_end'} = {
           'extra' => {
             'normalized' => 'node-after-chapter-1'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_next' => {
@@ -875,6 +902,7 @@ $result_menus{'two_nodes_at_the_end'} = {
               'extra' => {
                 'normalized' => 'node-after-chapter-2'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'menu_prev' => {},
@@ -937,6 +965,7 @@ $result_elements{'two_nodes_at_the_end'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -949,6 +978,7 @@ $result_elements{'two_nodes_at_the_end'} = [
             'unit_command' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 2e2dbef8a5..991db7afc6 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -25,7 +25,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -45,7 +45,9 @@ $result_trees{'two_nodes_between_chapters'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'text' => 'top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -79,7 +81,7 @@ $result_trees{'two_nodes_between_chapters'} = [
           {
             'args' => [
               {
-                'extra' => {
+                'info' => {
                   'spaces_after_argument' => '
 '
                 },
@@ -243,7 +245,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                         'text' => 'menu'
                       }
                     ],
-                    'extra' => {
+                    'info' => {
                       'spaces_after_argument' => '
 '
                     },
@@ -252,9 +254,11 @@ $result_trees{'two_nodes_between_chapters'} = [
                 ],
                 'cmdname' => 'end',
                 'extra' => {
-                  'spaces_before_argument' => ' ',
                   'text_arg' => 'menu'
                 },
+                'info' => {
+                  'spaces_before_argument' => ' '
+                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 8,
@@ -274,7 +278,8 @@ $result_trees{'two_nodes_between_chapters'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -307,7 +312,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -318,7 +323,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'text' => 'node between chapters'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_before_argument' => ' '
             },
             'type' => 'line_arg'
@@ -329,7 +334,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 ',
               'spaces_before_argument' => ' '
@@ -368,7 +373,9 @@ $result_trees{'two_nodes_between_chapters'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'chapter-1',
+          'normalized' => 'chapter-1'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -385,7 +392,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'text' => 'chapter c1'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -400,7 +407,8 @@ $result_trees{'two_nodes_between_chapters'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -417,7 +425,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'text' => 'node between chapters'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -444,7 +452,9 @@ $result_trees{'two_nodes_between_chapters'} = [
               'normalized' => 'node-between-chapters'
             }
           ],
-          'normalized' => 'node-between-chapters',
+          'normalized' => 'node-between-chapters'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -469,7 +479,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'text' => 'chapter 2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -489,7 +499,9 @@ $result_trees{'two_nodes_between_chapters'} = [
               'normalized' => 'chapter-2'
             }
           ],
-          'normalized' => 'chapter-2',
+          'normalized' => 'chapter-2'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -506,7 +518,7 @@ $result_trees{'two_nodes_between_chapters'} = [
                 'text' => 'chapter c2'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -514,7 +526,8 @@ $result_trees{'two_nodes_between_chapters'} = [
           }
         ],
         'cmdname' => 'chapter',
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -596,6 +609,7 @@ $result_sectioning{'two_nodes_between_chapters'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -613,11 +627,13 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                               'extra' => {
                                 'normalized' => 'chapter-1'
                               },
+                              'info' => {},
                               'structure' => {
                                 'associated_unit' => {}
                               }
                             }
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -642,11 +658,13 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                                     'extra' => {
                                       'normalized' => 'chapter-2'
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {}
                                     }
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_level' => 1,
@@ -700,6 +718,7 @@ $result_sectioning{'two_nodes_between_chapters'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_childs' => [
@@ -764,6 +783,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -776,6 +796,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
@@ -791,6 +812,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
                         'unit_command' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 2
@@ -845,6 +867,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
@@ -853,6 +876,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
         'associated_section' => {},
         'normalized' => 'chapter-1'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'node_next' => {},
@@ -861,6 +885,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
           'extra' => {
             'normalized' => 'node-between-chapters'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'node_next' => {
@@ -869,6 +894,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
                 'associated_section' => {},
                 'normalized' => 'chapter-2'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'node_prev' => {},
@@ -934,12 +960,14 @@ $result_menus{'two_nodes_between_chapters'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -952,6 +980,7 @@ $result_menus{'two_nodes_between_chapters'} = {
               'unit_command' => {
                 'cmdname' => 'chapter',
                 'extra' => {},
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'section_number' => 1
@@ -967,6 +996,7 @@ $result_menus{'two_nodes_between_chapters'} = {
                     'unit_command' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_number' => 2
@@ -1017,6 +1047,7 @@ $result_menus{'two_nodes_between_chapters'} = {
       'extra' => {
         'normalized' => 'chapter-1'
       },
+      'info' => {},
       'structure' => {
         'associated_unit' => {},
         'menu_next' => {
@@ -1024,6 +1055,7 @@ $result_menus{'two_nodes_between_chapters'} = {
           'extra' => {
             'normalized' => 'node-between-chapters'
           },
+          'info' => {},
           'structure' => {
             'associated_unit' => {},
             'menu_next' => {
@@ -1031,6 +1063,7 @@ $result_menus{'two_nodes_between_chapters'} = {
               'extra' => {
                 'normalized' => 'chapter-2'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'menu_prev' => {},
@@ -1125,6 +1158,7 @@ $result_elements{'two_nodes_between_chapters'} = [
       'unit_command' => {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -1137,6 +1171,7 @@ $result_elements{'two_nodes_between_chapters'} = [
             'unit_command' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {},
                 'section_number' => 1
@@ -1152,6 +1187,7 @@ $result_elements{'two_nodes_between_chapters'} = [
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 2
diff --git a/tp/t/results/sectioning/two_unnumbered_no_argument.pl 
b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
index 593f971a33..659276e0e8 100644
--- a/tp/t/results/sectioning/two_unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
@@ -19,7 +19,7 @@ $result_trees{'two_unnumbered_no_argument'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -39,7 +39,7 @@ $result_trees{'two_unnumbered_no_argument'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl 
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index 1063508f3a..501be7953b 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -18,7 +18,7 @@ $result_trees{'unknown_node_in_menu'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -35,7 +35,7 @@ $result_trees{'unknown_node_in_menu'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -101,7 +101,7 @@ $result_trees{'unknown_node_in_menu'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -110,9 +110,11 @@ $result_trees{'unknown_node_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -139,7 +141,9 @@ $result_trees{'unknown_node_in_menu'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -177,14 +181,16 @@ $result_nodes{'unknown_node_in_menu'} = {
       }
     ],
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'unknown_node_in_menu'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'unknown_node_in_menu'} = [
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index d6382f6a99..b3e1f4230b 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -19,7 +19,7 @@ $result_trees{'unnumbered_before_node_top_top'} = [
                 'text' => 'before nodes'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -48,7 +48,8 @@ $result_trees{'unnumbered_before_node_top_top'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -73,7 +74,7 @@ $result_trees{'unnumbered_before_node_top_top'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -93,7 +94,9 @@ $result_trees{'unnumbered_before_node_top_top'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -110,7 +113,7 @@ $result_trees{'unnumbered_before_node_top_top'} = [
                 'text' => 'top section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -129,7 +132,8 @@ $result_trees{'unnumbered_before_node_top_top'} = [
             'type' => 'paragraph'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -176,6 +180,7 @@ $result_sectioning{'unnumbered_before_node_top_top'} = {
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -193,11 +198,13 @@ $result_sectioning{'unnumbered_before_node_top_top'} = {
                           'extra' => {
                             'normalized' => 'Top'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
                         }
                       },
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_level' => 1,
@@ -259,6 +266,7 @@ $result_nodes{'unnumbered_before_node_top_top'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -271,6 +279,7 @@ $result_nodes{'unnumbered_before_node_top_top'} = {
                   'unit_command' => {
                     'cmdname' => 'unnumbered',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
@@ -299,6 +308,7 @@ $result_nodes{'unnumbered_before_node_top_top'} = {
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {}
   }
@@ -321,12 +331,14 @@ $result_menus{'unnumbered_before_node_top_top'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'top',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -339,6 +351,7 @@ $result_menus{'unnumbered_before_node_top_top'} = {
               'unit_command' => {
                 'cmdname' => 'unnumbered',
                 'extra' => {},
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {}
                 }
@@ -399,6 +412,7 @@ $result_elements{'unnumbered_before_node_top_top'} = [
       'unit_command' => {
         'cmdname' => 'unnumbered',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -411,6 +425,7 @@ $result_elements{'unnumbered_before_node_top_top'} = [
             'unit_command' => {
               'cmdname' => 'top',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {}
               }
diff --git a/tp/t/results/sectioning/unnumbered_before_top.pl 
b/tp/t/results/sectioning/unnumbered_before_top.pl
index 78c8ad4259..5e207e762c 100644
--- a/tp/t/results/sectioning/unnumbered_before_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top.pl
@@ -18,7 +18,7 @@ $result_trees{'unnumbered_before_top'} = {
               'text' => 'before top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -33,7 +33,7 @@ $result_trees{'unnumbered_before_top'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -50,7 +50,7 @@ $result_trees{'unnumbered_before_top'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -58,7 +58,7 @@ $result_trees{'unnumbered_before_top'} = {
         }
       ],
       'cmdname' => 'top',
-      'extra' => {
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -89,7 +89,7 @@ $result_sectioning{'unnumbered_before_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_up' => {}
@@ -97,7 +97,7 @@ $result_sectioning{'unnumbered_before_top'} = {
       },
       {
         'cmdname' => 'top',
-        'extra' => {},
+        'info' => {},
         'structure' => {
           'section_level' => 1,
           'section_prev' => {},
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index 8f7800a166..a31ad80c6d 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -19,7 +19,7 @@ $result_trees{'unnumbered_before_top_node'} = [
                 'text' => 'before nodes'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -34,7 +34,8 @@ $result_trees{'unnumbered_before_top_node'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -51,7 +52,7 @@ $result_trees{'unnumbered_before_top_node'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -109,7 +110,9 @@ $result_trees{'unnumbered_before_top_node'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -152,6 +155,7 @@ $result_sectioning{'unnumbered_before_top_node'} = {
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -181,12 +185,14 @@ $result_nodes{'unnumbered_before_top_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'unnumbered',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -209,12 +215,14 @@ $result_menus{'unnumbered_before_top_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'unnumbered',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -244,6 +252,7 @@ $result_elements{'unnumbered_before_top_node'} = [
       'unit_command' => {
         'cmdname' => 'unnumbered',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
diff --git a/tp/t/results/sectioning/unnumbered_no_argument.pl 
b/tp/t/results/sectioning/unnumbered_no_argument.pl
index 80832bddfd..611a8e2a17 100644
--- a/tp/t/results/sectioning/unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/unnumbered_no_argument.pl
@@ -13,7 +13,7 @@ $result_trees{'unnumbered_no_argument'} = {
     {
       'args' => [
         {
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index e14646b362..9ffd196136 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -39,7 +39,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -66,7 +66,9 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
               ]
             }
           ],
-          'normalized' => 'a-node',
+          'normalized' => 'a-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -83,7 +85,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
                 'text' => 'unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -112,7 +114,8 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -129,7 +132,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
                 'text' => 'top section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -153,7 +156,8 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -198,7 +202,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -225,7 +229,9 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
               ]
             }
           ],
-          'normalized' => 'second',
+          'normalized' => 'second'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -242,7 +248,7 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
                 'text' => 'Chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -266,7 +272,8 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
             'type' => 'paragraph'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -332,6 +339,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
             'extra' => {
               'normalized' => 'a-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -348,6 +356,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
                           'extra' => {
                             'normalized' => 'second'
                           },
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {}
                           }
@@ -380,6 +389,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 1,
@@ -389,6 +399,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
       {
         'cmdname' => 'top',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 1,
@@ -402,6 +413,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
         'extra' => {
           'associated_node' => {}
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 1,
@@ -445,6 +457,7 @@ $result_nodes{'unnumbered_top_without_node_nodes'} = {
     'associated_section' => {
       'cmdname' => 'unnumbered',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -462,6 +475,7 @@ $result_nodes{'unnumbered_top_without_node_nodes'} = {
                       'associated_section' => {
                         'cmdname' => 'chapter',
                         'extra' => {},
+                        'info' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'section_number' => 1
@@ -469,6 +483,7 @@ $result_nodes{'unnumbered_top_without_node_nodes'} = {
                       },
                       'normalized' => 'second'
                     },
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'node_up' => {
@@ -519,6 +534,7 @@ $result_nodes{'unnumbered_top_without_node_nodes'} = {
     },
     'normalized' => 'a-node'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'node_up' => {
@@ -548,6 +564,7 @@ $result_menus{'unnumbered_top_without_node_nodes'} = {
   'extra' => {
     'normalized' => 'a-node'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
@@ -564,6 +581,7 @@ $result_menus{'unnumbered_top_without_node_nodes'} = {
                 'extra' => {
                   'normalized' => 'second'
                 },
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {}
                 }
@@ -651,6 +669,7 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
         'extra' => {
           'normalized' => 'a-node'
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -667,6 +686,7 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
               'extra' => {
                 'normalized' => 'second'
               },
+              'info' => {},
               'structure' => {
                 'associated_unit' => {}
               }
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 89c710d5b9..2b8f3f7f38 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -45,7 +45,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -72,7 +72,9 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
               ]
             }
           ],
-          'normalized' => 'a-node',
+          'normalized' => 'a-node'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -89,7 +91,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
                 'text' => 'unnumbered'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -118,7 +120,8 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -143,7 +146,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
                 'text' => 'top section'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -167,7 +170,8 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
             'type' => 'empty_line'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -212,7 +216,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
                 'text' => ')'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -239,7 +243,9 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
               ]
             }
           ],
-          'normalized' => 'second',
+          'normalized' => 'second'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -256,7 +262,7 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
                 'text' => 'Chapter'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -280,7 +286,8 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
             'type' => 'paragraph'
           }
         ],
-        'extra' => {
+        'extra' => {},
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -347,6 +354,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
             'extra' => {
               'normalized' => 'a-node'
             },
+            'info' => {},
             'structure' => {
               'associated_unit' => {
                 'extra' => {
@@ -359,6 +367,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
                         'unit_command' => {
                           'cmdname' => 'top',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_level' => 1,
@@ -382,11 +391,13 @@ 
$result_sectioning{'unnumbered_top_without_node_sections'} = {
                                     'extra' => {
                                       'normalized' => 'second'
                                     },
+                                    'info' => {},
                                     'structure' => {
                                       'associated_unit' => {}
                                     }
                                   }
                                 },
+                                'info' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'section_level' => 1,
@@ -438,6 +449,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
             }
           }
         },
+        'info' => {},
         'structure' => {
           'associated_unit' => {},
           'section_level' => 1,
@@ -489,6 +501,7 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
     'associated_section' => {
       'cmdname' => 'unnumbered',
       'extra' => {},
+      'info' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -501,6 +514,7 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
                   'unit_command' => {
                     'cmdname' => 'top',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {}
                     }
@@ -515,6 +529,7 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
                         'unit_command' => {
                           'cmdname' => 'chapter',
                           'extra' => {},
+                          'info' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'section_number' => 1
@@ -574,6 +589,7 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
     },
     'normalized' => 'a-node'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {},
     'node_up' => {
@@ -611,12 +627,14 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
   'extra' => {
     'normalized' => 'a-node'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'unit_command' => {
           'cmdname' => 'unnumbered',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'associated_unit' => {}
           }
@@ -629,6 +647,7 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
               'unit_command' => {
                 'cmdname' => 'top',
                 'extra' => {},
+                'info' => {},
                 'structure' => {
                   'associated_unit' => {}
                 }
@@ -643,6 +662,7 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
                     'unit_command' => {
                       'cmdname' => 'chapter',
                       'extra' => {},
+                      'info' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'section_number' => 1
@@ -752,6 +772,7 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
       'unit_command' => {
         'cmdname' => 'unnumbered',
         'extra' => {},
+        'info' => {},
         'structure' => {
           'associated_unit' => {}
         }
@@ -764,6 +785,7 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
             'unit_command' => {
               'cmdname' => 'top',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'associated_unit' => {}
               }
@@ -778,6 +800,7 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
                   'unit_command' => {
                     'cmdname' => 'chapter',
                     'extra' => {},
+                    'info' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'section_number' => 1
diff --git a/tp/t/results/transformations/master_menu_fr.pl 
b/tp/t/results/transformations/master_menu_fr.pl
index f022ee2c60..428e6d9944 100644
--- a/tp/t/results/transformations/master_menu_fr.pl
+++ b/tp/t/results/transformations/master_menu_fr.pl
@@ -34,7 +34,7 @@ $result_trees{'master_menu_fr'} = {
                       'text' => 'fr'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'master_menu_fr'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'fr'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'no_master_menu_fr.texi',
                 'line_nr' => 3,
@@ -71,7 +73,7 @@ $result_trees{'master_menu_fr'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -91,7 +93,9 @@ $result_trees{'master_menu_fr'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -108,7 +112,7 @@ $result_trees{'master_menu_fr'} = {
               'text' => 'max'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -125,7 +129,7 @@ $result_trees{'master_menu_fr'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -201,7 +205,7 @@ $result_trees{'master_menu_fr'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -297,7 +301,7 @@ $result_trees{'master_menu_fr'} = {
                           'text' => 'detailmenu'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -306,8 +310,10 @@ $result_trees{'master_menu_fr'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
+                  },
+                  'info' => {
+                    'spaces_before_argument' => ' '
                   }
                 }
               ]
@@ -320,7 +326,7 @@ $result_trees{'master_menu_fr'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -329,9 +335,11 @@ $result_trees{'master_menu_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'no_master_menu_fr.texi',
                 'line_nr' => 10,
@@ -351,7 +359,8 @@ $result_trees{'master_menu_fr'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -368,7 +377,7 @@ $result_trees{'master_menu_fr'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -388,7 +397,9 @@ $result_trees{'master_menu_fr'} = {
             'normalized' => 'chap'
           }
         ],
-        'normalized' => 'chap',
+        'normalized' => 'chap'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -405,7 +416,7 @@ $result_trees{'master_menu_fr'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -422,7 +433,7 @@ $result_trees{'master_menu_fr'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -488,7 +499,7 @@ $result_trees{'master_menu_fr'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -497,9 +508,11 @@ $result_trees{'master_menu_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => 'no_master_menu_fr.texi',
                 'line_nr' => 17,
@@ -519,7 +532,8 @@ $result_trees{'master_menu_fr'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -536,7 +550,7 @@ $result_trees{'master_menu_fr'} = {
               'text' => 'section'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -556,7 +570,9 @@ $result_trees{'master_menu_fr'} = {
             'normalized' => 'section'
           }
         ],
-        'normalized' => 'section',
+        'normalized' => 'section'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -573,7 +589,7 @@ $result_trees{'master_menu_fr'} = {
               'text' => 'sec'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -581,7 +597,8 @@ $result_trees{'master_menu_fr'} = {
         }
       ],
       'cmdname' => 'section',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -669,9 +686,11 @@ $result_sectioning{'master_menu_fr'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -682,9 +701,11 @@ $result_sectioning{'master_menu_fr'} = {
                   'extra' => {
                     'normalized' => 'chap'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_childs' => [
                   {
@@ -695,9 +716,11 @@ $result_sectioning{'master_menu_fr'} = {
                         'extra' => {
                           'normalized' => 'section'
                         },
+                        'info' => {},
                         'structure' => {}
                       }
                     },
+                    'info' => {},
                     'structure' => {
                       'section_level' => 2,
                       'section_number' => '1.1',
@@ -733,6 +756,7 @@ $result_nodes{'master_menu_fr'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -742,6 +766,7 @@ $result_nodes{'master_menu_fr'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -749,6 +774,7 @@ $result_nodes{'master_menu_fr'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -760,6 +786,7 @@ $result_nodes{'master_menu_fr'} = {
         ],
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
@@ -767,12 +794,14 @@ $result_nodes{'master_menu_fr'} = {
             'associated_section' => {
               'cmdname' => 'section',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => '1.1'
               }
             },
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'node_up' => {}
           }
@@ -794,18 +823,21 @@ $result_menus{'master_menu_fr'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'chap'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'section'
           },
+          'info' => {},
           'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
diff --git a/tp/t/results/value/set_flag_command_equivalent.pl 
b/tp/t/results/value/set_flag_command_equivalent.pl
index dcc6ebc2fb..10f4481c9b 100644
--- a/tp/t/results/value/set_flag_command_equivalent.pl
+++ b/tp/t/results/value/set_flag_command_equivalent.pl
@@ -17,7 +17,7 @@ $result_trees{'set_flag_command_equivalent'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -28,7 +28,9 @@ $result_trees{'set_flag_command_equivalent'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -64,7 +66,7 @@ $result_trees{'set_flag_command_equivalent'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -75,7 +77,9 @@ $result_trees{'set_flag_command_equivalent'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/value/set_in_item_missing_line.pl 
b/tp/t/results/value/set_in_item_missing_line.pl
index efa65c7bd5..87d5bf9ed4 100644
--- a/tp/t/results/value/set_in_item_missing_line.pl
+++ b/tp/t/results/value/set_in_item_missing_line.pl
@@ -23,7 +23,7 @@ $result_trees{'set_in_item_missing_line'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -69,7 +69,7 @@ $result_trees{'set_in_item_missing_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -96,7 +96,7 @@ $result_trees{'set_in_item_missing_line'} = {
                               'text' => 'jj'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -104,7 +104,7 @@ $result_trees{'set_in_item_missing_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -127,7 +127,7 @@ $result_trees{'set_in_item_missing_line'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -136,9 +136,11 @@ $result_trees{'set_in_item_missing_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -147,7 +149,9 @@ $result_trees{'set_in_item_missing_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -175,7 +179,7 @@ $result_trees{'set_in_item_missing_line'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -224,7 +228,7 @@ $result_trees{'set_in_item_missing_line'} = {
                               'text' => 'jj'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -232,7 +236,7 @@ $result_trees{'set_in_item_missing_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -255,7 +259,7 @@ $result_trees{'set_in_item_missing_line'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -264,9 +268,11 @@ $result_trees{'set_in_item_missing_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -275,7 +281,9 @@ $result_trees{'set_in_item_missing_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/value/set_on_item_line.pl 
b/tp/t/results/value/set_on_item_line.pl
index bd7cea33ee..27404aafd9 100644
--- a/tp/t/results/value/set_on_item_line.pl
+++ b/tp/t/results/value/set_on_item_line.pl
@@ -23,7 +23,7 @@ $result_trees{'set_on_item_line'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'set_on_item_line'} = {
                               'text' => 'item text'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -73,7 +73,7 @@ $result_trees{'set_on_item_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -138,7 +138,7 @@ $result_trees{'set_on_item_line'} = {
                               'text' => 'line'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -146,7 +146,7 @@ $result_trees{'set_on_item_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -198,7 +198,7 @@ $result_trees{'set_on_item_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -221,7 +221,7 @@ $result_trees{'set_on_item_line'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -230,9 +230,11 @@ $result_trees{'set_on_item_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -241,7 +243,9 @@ $result_trees{'set_on_item_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -269,7 +273,7 @@ $result_trees{'set_on_item_line'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -312,7 +316,7 @@ $result_trees{'set_on_item_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -382,7 +386,7 @@ $result_trees{'set_on_item_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -448,7 +452,7 @@ $result_trees{'set_on_item_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -471,7 +475,7 @@ $result_trees{'set_on_item_line'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -480,9 +484,11 @@ $result_trees{'set_on_item_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -491,7 +497,9 @@ $result_trees{'set_on_item_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index 14f51d0c59..fbc2aaa3d9 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -85,7 +85,7 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => 'cp fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -97,7 +97,9 @@ $result_trees{'value_in_index_commands'} = {
             'misc_args' => [
               'cp',
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -114,7 +116,7 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => 'cp fn'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -126,7 +128,9 @@ $result_trees{'value_in_index_commands'} = {
             'misc_args' => [
               'cp',
               'fn'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -180,7 +184,7 @@ $result_trees{'value_in_index_commands'} = {
                       'text' => 'truc'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -191,7 +195,9 @@ $result_trees{'value_in_index_commands'} = {
               'extra' => {
                 'misc_args' => [
                   'truc'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -272,7 +278,7 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => 'codeidx'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -283,7 +289,9 @@ $result_trees{'value_in_index_commands'} = {
           'extra' => {
             'misc_args' => [
               'codeidx'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -334,7 +342,7 @@ $result_trees{'value_in_index_commands'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -356,7 +364,7 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => 'index truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -376,7 +384,9 @@ $result_trees{'value_in_index_commands'} = {
               'index_ignore_chars' => {},
               'index_name' => 'truc',
               'index_type_command' => 'trucindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -474,7 +484,7 @@ $result_trees{'value_in_index_commands'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -494,7 +504,9 @@ $result_trees{'value_in_index_commands'} = {
               'index_ignore_chars' => {},
               'index_name' => 'codeidx',
               'index_type_command' => 'codeidxindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -517,7 +529,7 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => 'truc kindex'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -537,7 +549,9 @@ $result_trees{'value_in_index_commands'} = {
               'index_ignore_chars' => {},
               'index_name' => 'ky',
               'index_type_command' => 'kindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -555,7 +569,7 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => 'pindex codeidx'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -575,7 +589,9 @@ $result_trees{'value_in_index_commands'} = {
               'index_ignore_chars' => {},
               'index_name' => 'pg',
               'index_type_command' => 'pindex'
-            },
+            }
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -607,7 +623,7 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => 'truc'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -618,7 +634,9 @@ $result_trees{'value_in_index_commands'} = {
           'extra' => {
             'misc_args' => [
               'truc'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -649,7 +667,7 @@ $result_trees{'value_in_index_commands'} = {
                   'text' => 'cp'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -660,7 +678,9 @@ $result_trees{'value_in_index_commands'} = {
           'extra' => {
             'misc_args' => [
               'cp'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -683,7 +703,9 @@ $result_trees{'value_in_index_commands'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -776,7 +798,8 @@ $result_nodes{'value_in_index_commands'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'value_in_index_commands'} = {
@@ -784,7 +807,8 @@ $result_menus{'value_in_index_commands'} = {
   'extra' => {
     'isindex' => 1,
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'value_in_index_commands'} = [
diff --git a/tp/t/results/value/value_in_invalid_documentencoding.pl 
b/tp/t/results/value/value_in_invalid_documentencoding.pl
index b093bc54ff..eb31fbca69 100644
--- a/tp/t/results/value/value_in_invalid_documentencoding.pl
+++ b/tp/t/results/value/value_in_invalid_documentencoding.pl
@@ -38,7 +38,7 @@ $result_trees{'value_in_invalid_documentencoding'} = {
                   'text' => 'bad'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -47,9 +47,11 @@ $result_trees{'value_in_invalid_documentencoding'} = {
           ],
           'cmdname' => 'documentencoding',
           'extra' => {
-            'spaces_before_argument' => ' ',
             'text_arg' => 'bad'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 2,
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 4b2a9471cd..09ec5f7f0d 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -46,7 +46,7 @@ $result_trees{'value_in_misc_commands'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -66,7 +66,9 @@ $result_trees{'value_in_misc_commands'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -83,7 +85,7 @@ $result_trees{'value_in_misc_commands'} = {
               'text' => 'top atext'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -100,7 +102,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'Comment like: atext'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -108,7 +110,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'subheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -222,7 +224,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => '200mm,150mm'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -230,7 +232,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'pagesizes',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -262,7 +264,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'on line following headings atext'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -270,7 +272,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'headings',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -287,7 +289,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'some text ignored atext'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -295,7 +297,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'oddfooting',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -312,7 +314,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'on line following everyheading atext'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -320,7 +322,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'everyheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -368,7 +370,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => '0.1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -379,7 +381,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '0.1'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -492,7 +496,7 @@ $result_trees{'value_in_misc_commands'} = {
                       'text' => 'phoo,//,\\\\'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -505,7 +509,9 @@ $result_trees{'value_in_misc_commands'} = {
                   'phoo',
                   '//',
                   '\\\\'
-                ],
+                ]
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -588,7 +594,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'phi,:,:'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -601,7 +607,9 @@ $result_trees{'value_in_misc_commands'} = {
               'phi',
               ':',
               ':'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -739,7 +747,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'strong,(strong:,:)'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -752,7 +760,9 @@ $result_trees{'value_in_misc_commands'} = {
               'strong',
               '(strong:',
               ':)'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -864,7 +874,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'code'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -875,7 +885,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'code'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -927,7 +939,7 @@ $result_trees{'value_in_misc_commands'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -974,7 +986,7 @@ $result_trees{'value_in_misc_commands'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -983,9 +995,11 @@ $result_trees{'value_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 62,
@@ -1122,7 +1136,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'asis'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1133,7 +1147,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'asis'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1150,7 +1166,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => '0'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1161,7 +1177,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '0'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1178,7 +1196,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'none'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1189,7 +1207,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'none'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1206,7 +1226,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => '4'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1217,7 +1237,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '4'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1234,7 +1256,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'none'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1245,7 +1267,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'none'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1262,7 +1286,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => '6'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1273,7 +1297,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '6'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1337,7 +1363,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'end'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1348,7 +1374,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'end'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1365,7 +1393,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'separate'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1376,7 +1404,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'separate'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1419,7 +1449,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'ISO-8859-1'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1430,9 +1460,11 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'input_encoding_name' => 'iso-8859-1',
             'input_perl_encoding' => 'iso-8859-1',
-            'spaces_before_argument' => ' ',
             'text_arg' => 'ISO-8859-1'
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 83,
@@ -1504,7 +1536,7 @@ $result_trees{'value_in_misc_commands'} = {
                       'text' => 'en'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1513,9 +1545,11 @@ $result_trees{'value_in_misc_commands'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'en'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 88,
@@ -1544,7 +1578,7 @@ $result_trees{'value_in_misc_commands'} = {
                       'text' => 'en'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1553,9 +1587,11 @@ $result_trees{'value_in_misc_commands'} = {
               ],
               'cmdname' => 'documentlanguage',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'en'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 91,
@@ -1624,7 +1660,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'on'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1635,7 +1671,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'on'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1652,7 +1690,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'off'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1663,7 +1701,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'off'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1722,7 +1762,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => '10'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1733,7 +1773,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '10'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1829,7 +1871,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'false'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1840,7 +1882,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'false'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1862,7 +1906,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'true'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1873,7 +1917,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               'true'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2192,7 +2238,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => 'line after exdent'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2200,7 +2246,7 @@ $result_trees{'value_in_misc_commands'} = {
             }
           ],
           'cmdname' => 'exdent',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2243,7 +2289,7 @@ $result_trees{'value_in_misc_commands'} = {
                   'text' => '2'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -2254,7 +2300,9 @@ $result_trees{'value_in_misc_commands'} = {
           'extra' => {
             'misc_args' => [
               '2'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2408,7 +2456,8 @@ $result_trees{'value_in_misc_commands'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2657,9 +2706,11 @@ $result_sectioning{'value_in_misc_commands'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -2677,17 +2728,20 @@ $result_nodes{'value_in_misc_commands'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'value_in_misc_commands'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'value_in_misc_commands'} = [
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index b499bdc02a..15f9456807 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -60,7 +60,7 @@ $result_trees{'value_in_node'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -77,7 +77,7 @@ $result_trees{'value_in_node'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -94,7 +94,7 @@ $result_trees{'value_in_node'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -130,7 +130,9 @@ $result_trees{'value_in_node'} = {
             ]
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -147,7 +149,7 @@ $result_trees{'value_in_node'} = {
               'text' => 'Expansion in Node Names'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -164,7 +166,7 @@ $result_trees{'value_in_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -235,7 +237,7 @@ $result_trees{'value_in_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -244,9 +246,11 @@ $result_trees{'value_in_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -266,7 +270,8 @@ $result_trees{'value_in_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -294,7 +299,7 @@ $result_trees{'value_in_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -305,7 +310,7 @@ $result_trees{'value_in_node'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -339,7 +344,9 @@ $result_trees{'value_in_node'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Node-1',
+        'normalized' => 'Node-1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -356,7 +363,7 @@ $result_trees{'value_in_node'} = {
               'text' => 'Chapter 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -399,7 +406,7 @@ $result_trees{'value_in_node'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -465,7 +472,7 @@ $result_trees{'value_in_node'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -474,9 +481,11 @@ $result_trees{'value_in_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -496,7 +505,8 @@ $result_trees{'value_in_node'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -516,7 +526,7 @@ $result_trees{'value_in_node'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -527,7 +537,7 @@ $result_trees{'value_in_node'} = {
               'text' => 'Node 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -538,7 +548,7 @@ $result_trees{'value_in_node'} = {
               'text' => 'Node 1'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -615,7 +625,9 @@ $result_trees{'value_in_node'} = {
             'normalized' => 'Node-1'
           }
         ],
-        'normalized' => 'Section-1_002e1',
+        'normalized' => 'Section-1_002e1'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -699,9 +711,11 @@ $result_sectioning{'value_in_node'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -712,9 +726,11 @@ $result_sectioning{'value_in_node'} = {
                   'extra' => {
                     'normalized' => 'Node-1'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -743,6 +759,7 @@ $result_nodes{'value_in_node'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -752,6 +769,7 @@ $result_nodes{'value_in_node'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -759,6 +777,7 @@ $result_nodes{'value_in_node'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -770,12 +789,14 @@ $result_nodes{'value_in_node'} = {
         ],
         'normalized' => 'Node-1'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Section-1_002e1'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {}
@@ -824,18 +845,21 @@ $result_menus{'value_in_node'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'Node-1'
       },
+      'info' => {},
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'Section-1_002e1'
           },
+          'info' => {},
           'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
diff --git a/tp/t/results/value/value_node_directions.pl 
b/tp/t/results/value/value_node_directions.pl
index a1f7f0a327..07a318e281 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -54,7 +54,7 @@ $result_trees{'value_node_directions'} = {
               'text' => 'bar'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -71,7 +71,7 @@ $result_trees{'value_node_directions'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -88,7 +88,7 @@ $result_trees{'value_node_directions'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -125,7 +125,9 @@ $result_trees{'value_node_directions'} = {
             ]
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -142,7 +144,7 @@ $result_trees{'value_node_directions'} = {
               'text' => 'Var bar'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -166,7 +168,8 @@ $result_trees{'value_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -191,7 +194,7 @@ $result_trees{'value_node_directions'} = {
               'text' => 'BarFoo'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -202,7 +205,7 @@ $result_trees{'value_node_directions'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -219,7 +222,7 @@ $result_trees{'value_node_directions'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -257,7 +260,9 @@ $result_trees{'value_node_directions'} = {
             ]
           }
         ],
-        'normalized' => 'bar',
+        'normalized' => 'bar'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -274,7 +279,7 @@ $result_trees{'value_node_directions'} = {
               'text' => 'BarFoo'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -289,7 +294,8 @@ $result_trees{'value_node_directions'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -309,7 +315,7 @@ $result_trees{'value_node_directions'} = {
           'type' => 'line_arg'
         },
         {
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -320,7 +326,7 @@ $result_trees{'value_node_directions'} = {
               'text' => 'bar'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'type' => 'line_arg'
@@ -337,7 +343,7 @@ $result_trees{'value_node_directions'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 ',
             'spaces_before_argument' => ' '
@@ -370,7 +376,9 @@ $result_trees{'value_node_directions'} = {
             ]
           }
         ],
-        'normalized' => 'BarFoo',
+        'normalized' => 'BarFoo'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -387,7 +395,7 @@ $result_trees{'value_node_directions'} = {
               'text' => 'bar'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -395,7 +403,8 @@ $result_trees{'value_node_directions'} = {
         }
       ],
       'cmdname' => 'chapter',
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -459,9 +468,11 @@ $result_sectioning{'value_node_directions'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -472,9 +483,11 @@ $result_sectioning{'value_node_directions'} = {
                   'extra' => {
                     'normalized' => 'bar'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -491,9 +504,11 @@ $result_sectioning{'value_node_directions'} = {
                   'extra' => {
                     'normalized' => 'BarFoo'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 2,
@@ -527,10 +542,12 @@ $result_nodes{'value_node_directions'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -538,12 +555,14 @@ $result_nodes{'value_node_directions'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'bar'
       },
+      'info' => {},
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
@@ -551,12 +570,14 @@ $result_nodes{'value_node_directions'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {},
+              'info' => {},
               'structure' => {
                 'section_number' => 2
               }
             },
             'normalized' => 'BarFoo'
           },
+          'info' => {},
           'structure' => {
             'node_prev' => {},
             'node_up' => {
@@ -610,6 +631,7 @@ $result_menus{'value_node_directions'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl 
b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
index 6b3265de97..9b2773be47 100644
--- a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
+++ b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
@@ -65,7 +65,7 @@ $result_trees{'comma_value_in_macro_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'comma_value_in_macro_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/value_and_macro/macro_in_value.pl 
b/tp/t/results/value_and_macro/macro_in_value.pl
index 2e4e21f303..4787e75bf6 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -41,7 +41,7 @@ $result_trees{'macro_in_value'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -50,9 +50,11 @@ $result_trees{'macro_in_value'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/value_and_macro/value_in_macro_body.pl 
b/tp/t/results/value_and_macro/value_in_macro_body.pl
index 7d6ae93e32..f9b0cb8b5e 100644
--- a/tp/t/results/value_and_macro/value_in_macro_body.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_body.pl
@@ -61,7 +61,7 @@ $result_trees{'value_in_macro_body'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -70,9 +70,11 @@ $result_trees{'value_in_macro_body'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl 
b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
index 28129fc711..28206da59f 100644
--- a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
@@ -65,7 +65,7 @@ $result_trees{'value_in_macro_formal_arg'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'value_in_macro_formal_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl 
b/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
index 8f90393184..17292cfb45 100644
--- a/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
+++ b/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
@@ -17,7 +17,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
@@ -51,7 +51,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' 
 '
               },
@@ -93,7 +93,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
@@ -135,7 +135,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' 
 '
               },
@@ -177,7 +177,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
                   'text' => ' b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
@@ -219,7 +219,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
                   'text' => ' b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' 
 '
               },
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 83fa56385c..1fa453caf0 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -43,7 +43,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'commands_and_spaces.info'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '  
 '
               },
@@ -52,9 +52,11 @@ $result_trees{'commands_and_spaces'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => '  ',
             'text_arg' => 'commands_and_spaces.info'
           },
+          'info' => {
+            'spaces_before_argument' => '  '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 3,
@@ -124,7 +126,7 @@ $result_trees{'commands_and_spaces'} = {
               'text' => 'a'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' '
           },
           'type' => 'line_arg'
@@ -155,7 +157,7 @@ $result_trees{'commands_and_spaces'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => ' '
           },
           'type' => 'line_arg'
@@ -172,7 +174,7 @@ $result_trees{'commands_and_spaces'} = {
               'text' => ')'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '   
 ',
             'spaces_before_argument' => ' '
@@ -195,7 +197,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'centered'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '  
 '
               },
@@ -203,7 +205,7 @@ $result_trees{'commands_and_spaces'} = {
             }
           ],
           'cmdname' => 'center',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
@@ -314,7 +316,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
@@ -334,7 +336,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -345,7 +347,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -356,7 +358,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -389,7 +391,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'a'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
@@ -401,7 +403,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -413,7 +415,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'c'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -424,7 +426,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'd'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -435,7 +437,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'e'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'brace_command_arg'
@@ -468,7 +470,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'Note'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '  
 '
               },
@@ -494,7 +496,7 @@ $result_trees{'commands_and_spaces'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -503,9 +505,11 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -513,7 +517,7 @@ $result_trees{'commands_and_spaces'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
@@ -535,7 +539,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'ff'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -546,7 +550,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'b'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '   
 ',
                 'spaces_before_argument' => ' '
@@ -583,7 +587,9 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'caption',
               'extra' => {
-                'float' => {},
+                'float' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -644,7 +650,7 @@ $result_trees{'commands_and_spaces'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -653,9 +659,11 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -670,7 +678,6 @@ $result_trees{'commands_and_spaces'} = {
             ],
             'normalized' => 'b',
             'shortcaption' => {},
-            'spaces_before_argument' => '  ',
             'type' => {
               'content' => [
                 {}
@@ -678,6 +685,9 @@ $result_trees{'commands_and_spaces'} = {
               'normalized' => 'ff'
             }
           },
+          'info' => {
+            'spaces_before_argument' => '  '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 30,
@@ -701,7 +711,7 @@ $result_trees{'commands_and_spaces'} = {
                           'text' => '0.4  0.6'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '  
 '
                       },
@@ -713,7 +723,9 @@ $result_trees{'commands_and_spaces'} = {
                     'misc_args' => [
                       '0.4',
                       '0.6'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => '  '
                   },
                   'source_info' => {
@@ -736,7 +748,7 @@ $result_trees{'commands_and_spaces'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -745,9 +757,11 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 37,
@@ -757,7 +771,9 @@ $result_trees{'commands_and_spaces'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
@@ -792,7 +808,7 @@ $result_trees{'commands_and_spaces'} = {
                       'text' => 'r '
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'type' => 'bracketed'
@@ -822,7 +838,7 @@ $result_trees{'commands_and_spaces'} = {
                   'text' => 'gg hh j'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -839,7 +855,7 @@ $result_trees{'commands_and_spaces'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -848,9 +864,11 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 40,
@@ -885,7 +903,9 @@ $result_trees{'commands_and_spaces'} = {
                 'text' => 'j',
                 'type' => 'row_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
@@ -902,7 +922,7 @@ $result_trees{'commands_and_spaces'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '  
 '
               },
@@ -924,7 +944,7 @@ $result_trees{'commands_and_spaces'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -933,9 +953,11 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -957,7 +979,7 @@ $result_trees{'commands_and_spaces'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '  
 '
               },
@@ -983,7 +1005,7 @@ $result_trees{'commands_and_spaces'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '  
 '
                   },
@@ -992,9 +1014,11 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 48,
@@ -1016,7 +1040,7 @@ $result_trees{'commands_and_spaces'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '  
 '
               },
@@ -1042,7 +1066,7 @@ $result_trees{'commands_and_spaces'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '  
 '
                   },
@@ -1051,9 +1075,11 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 52,
@@ -1086,7 +1112,7 @@ $result_trees{'commands_and_spaces'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '  
 '
               },
@@ -1107,7 +1133,7 @@ $result_trees{'commands_and_spaces'} = {
                               'text' => 'in item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => ' 
 '
                           },
@@ -1115,7 +1141,7 @@ $result_trees{'commands_and_spaces'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => '  '
                       },
                       'source_info' => {
@@ -1138,7 +1164,7 @@ $result_trees{'commands_and_spaces'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '   
 '
                   },
@@ -1147,9 +1173,11 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => '   ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => '   '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 56,
@@ -1158,7 +1186,9 @@ $result_trees{'commands_and_spaces'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
@@ -1194,7 +1224,7 @@ $result_trees{'commands_and_spaces'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '  '
               },
               'source_info' => {
@@ -1248,7 +1278,7 @@ $result_trees{'commands_and_spaces'} = {
                 }
               ],
               'cmdname' => 'math',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1315,7 +1345,9 @@ $result_trees{'commands_and_spaces'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'category',
+                        'def_role' => 'category'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => ' '
                       },
@@ -1340,7 +1372,9 @@ $result_trees{'commands_and_spaces'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'name',
+                        'def_role' => 'name'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => ' '
                       },
@@ -1365,7 +1399,9 @@ $result_trees{'commands_and_spaces'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => ' '
                       },
@@ -1390,7 +1426,9 @@ $result_trees{'commands_and_spaces'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => '  '
                       },
@@ -1415,7 +1453,9 @@ $result_trees{'commands_and_spaces'} = {
                         }
                       ],
                       'extra' => {
-                        'def_role' => 'arg',
+                        'def_role' => 'arg'
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' ',
                         'spaces_before_argument' => '  '
                       },
@@ -1491,7 +1531,7 @@ $result_trees{'commands_and_spaces'} = {
                       'text' => 'deffn'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1500,9 +1540,11 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 66,
@@ -1510,7 +1552,7 @@ $result_trees{'commands_and_spaces'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1552,7 +1594,9 @@ $result_trees{'commands_and_spaces'} = {
             ]
           }
         ],
-        'normalized' => 'a',
+        'normalized' => 'a'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1706,6 +1750,7 @@ $result_nodes{'commands_and_spaces'} = {
   'extra' => {
     'normalized' => 'a'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'extra' => {
@@ -1742,6 +1787,7 @@ $result_menus{'commands_and_spaces'} = {
   'extra' => {
     'normalized' => 'a'
   },
+  'info' => {},
   'structure' => {}
 };
 
@@ -1767,7 +1813,8 @@ $result_floats{'commands_and_spaces'} = {
           'cmdname' => 'caption',
           'extra' => {
             'float' => {}
-          }
+          },
+          'info' => {}
         },
         'normalized' => 'b',
         'shortcaption' => {
@@ -1785,6 +1832,7 @@ $result_floats{'commands_and_spaces'} = {
           'normalized' => 'ff'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index 3318b6a3cf..087fa36e23 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -18,7 +18,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'command_as_argument_inserted'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -77,7 +77,9 @@ $result_trees{'comments_end_lines'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => '  '
                   },
                   'type' => 'line_arg'
@@ -85,9 +87,11 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -112,7 +116,7 @@ $result_trees{'comments_end_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -145,7 +149,9 @@ $result_trees{'comments_end_lines'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -153,9 +159,11 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -191,7 +199,7 @@ $result_trees{'comments_end_lines'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -212,7 +220,7 @@ $result_trees{'comments_end_lines'} = {
                               'text' => 'it'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -220,7 +228,7 @@ $result_trees{'comments_end_lines'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -259,7 +267,9 @@ $result_trees{'comments_end_lines'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -267,9 +277,11 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -278,7 +290,9 @@ $result_trees{'comments_end_lines'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -295,7 +309,7 @@ $result_trees{'comments_end_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -337,7 +351,9 @@ $result_trees{'comments_end_lines'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -345,9 +361,11 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -369,7 +387,7 @@ $result_trees{'comments_end_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -411,7 +429,9 @@ $result_trees{'comments_end_lines'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -419,9 +439,11 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -443,7 +465,7 @@ $result_trees{'comments_end_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -485,7 +507,9 @@ $result_trees{'comments_end_lines'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -493,9 +517,11 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -526,7 +552,7 @@ $result_trees{'comments_end_lines'} = {
                           'text' => '0.4 0.6'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -538,7 +564,9 @@ $result_trees{'comments_end_lines'} = {
                     'misc_args' => [
                       '0.4',
                       '0.6'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -641,7 +669,9 @@ $result_trees{'comments_end_lines'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -649,9 +679,11 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -661,7 +693,9 @@ $result_trees{'comments_end_lines'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -691,7 +725,7 @@ $result_trees{'comments_end_lines'} = {
                   'text' => 'g'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -733,7 +767,9 @@ $result_trees{'comments_end_lines'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => '  '
                   },
                   'type' => 'line_arg'
@@ -741,9 +777,11 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -756,7 +794,6 @@ $result_trees{'comments_end_lines'} = {
               {}
             ],
             'normalized' => 'g',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -764,6 +801,9 @@ $result_trees{'comments_end_lines'} = {
               'normalized' => 'f'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 28,
@@ -778,7 +818,7 @@ $result_trees{'comments_end_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -820,7 +860,9 @@ $result_trees{'comments_end_lines'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -828,9 +870,11 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -852,7 +896,7 @@ $result_trees{'comments_end_lines'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -894,7 +938,9 @@ $result_trees{'comments_end_lines'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => ' '
                   },
                   'type' => 'line_arg'
@@ -902,9 +948,11 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'raggedright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -1010,6 +1058,7 @@ $result_floats{'comments_end_lines'} = {
           'normalized' => 'f'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl 
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index bcf3d1de60..4afbd96325 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -75,7 +75,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -84,9 +84,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -95,7 +97,9 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -133,7 +137,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -175,7 +181,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -184,9 +190,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -194,7 +202,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -238,7 +246,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -280,7 +290,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -289,9 +299,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -300,7 +312,9 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -349,7 +363,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -391,7 +407,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'itemize'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -400,9 +416,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -411,7 +429,9 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -485,7 +505,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -494,9 +514,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -505,7 +527,9 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => '1',
+            'enumerate_specification' => '1'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -543,7 +567,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -585,7 +611,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'enumerate'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -594,9 +620,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -605,7 +633,9 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'enumerate_specification' => 'a',
+            'enumerate_specification' => 'a'
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -649,7 +679,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -669,7 +701,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                               'text' => 'it'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -677,7 +709,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -700,7 +732,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -709,9 +741,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -720,7 +754,9 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -777,7 +813,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -786,9 +822,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -796,7 +834,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -834,7 +872,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -859,7 +899,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -868,9 +908,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
@@ -878,7 +920,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -935,7 +977,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'group'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -944,9 +986,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 39,
@@ -954,7 +998,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1011,7 +1055,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1020,9 +1064,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 43,
@@ -1030,7 +1076,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1097,7 +1143,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
@@ -1123,7 +1171,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1132,9 +1180,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 47,
@@ -1142,7 +1192,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1172,7 +1222,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'text' => 'second'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -1199,7 +1249,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
@@ -1225,7 +1277,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1234,9 +1286,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 51,
@@ -1244,7 +1298,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1282,7 +1336,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                   'text' => 'third'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -1309,7 +1363,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
@@ -1335,7 +1391,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1344,9 +1400,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 55,
@@ -1354,7 +1412,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1411,7 +1469,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'display'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1420,9 +1478,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 59,
@@ -1430,7 +1490,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1472,7 +1532,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                             ]
                           }
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_after_argument' => ' '
                       },
                       'type' => 'line_arg'
@@ -1483,7 +1545,9 @@ $result_trees{'comments_on_block_command_lines'} = {
                     'misc_args' => [
                       '0.4',
                       '0.6'
-                    ],
+                    ]
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1570,7 +1634,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1579,9 +1643,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 63,
@@ -1591,7 +1657,9 @@ $result_trees{'comments_on_block_command_lines'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'max_columns' => 2,
+            'max_columns' => 2
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1645,7 +1713,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -1725,7 +1795,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'multitable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1734,9 +1804,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 67,
@@ -1759,7 +1831,9 @@ $result_trees{'comments_on_block_command_lines'} = {
                 ],
                 'type' => 'bracketed_multitable_prototype'
               }
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1805,7 +1879,9 @@ $result_trees{'comments_on_block_command_lines'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'block_line_arg'
@@ -1830,7 +1906,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1839,9 +1915,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 71,
@@ -1854,7 +1932,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               {}
             ],
             'normalized' => 'g',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -1862,6 +1939,9 @@ $result_trees{'comments_on_block_command_lines'} = {
               'normalized' => 'f'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 69,
@@ -1916,7 +1996,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'flushright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1925,9 +2005,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 75,
@@ -1935,7 +2017,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1992,7 +2074,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                       'text' => 'raggedright'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2001,9 +2083,11 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'raggedright'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 79,
@@ -2011,7 +2095,7 @@ $result_trees{'comments_on_block_command_lines'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2186,6 +2270,7 @@ $result_floats{'comments_on_block_command_lines'} = {
           'normalized' => 'f'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => 1
       }
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 176f84abf5..7429a3c218 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
@@ -33,7 +33,9 @@ $result_trees{'comments_on_misc_command_line'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => '  '
               },
               'type' => 'line_arg'
@@ -41,9 +43,11 @@ $result_trees{'comments_on_misc_command_line'} = {
           ],
           'cmdname' => 'setfilename',
           'extra' => {
-            'spaces_before_argument' => '  ',
             'text_arg' => 'comments_on_misc_command_line.info'
           },
+          'info' => {
+            'spaces_before_argument' => '  '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -74,7 +78,9 @@ $result_trees{'comments_on_misc_command_line'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => '  '
               },
               'type' => 'line_arg'
@@ -86,7 +92,9 @@ $result_trees{'comments_on_misc_command_line'} = {
               'phoo',
               ';',
               ':'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -119,7 +127,9 @@ $result_trees{'comments_on_misc_command_line'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
@@ -129,7 +139,9 @@ $result_trees{'comments_on_misc_command_line'} = {
           'extra' => {
             'misc_args' => [
               'none'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -187,14 +199,16 @@ $result_trees{'comments_on_misc_command_line'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
             }
           ],
           'cmdname' => 'pagesizes',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -236,14 +250,16 @@ $result_trees{'comments_on_misc_command_line'} = {
 '
                     ]
                   }
-                },
+                }
+              },
+              'info' => {
                 'spaces_after_argument' => ' '
               },
               'type' => 'line_arg'
             }
           ],
           'cmdname' => 'everyheading',
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
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 91f81f46f0..687e5fc023 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -88,7 +88,7 @@ $result_trees{'image_inline_or_not'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -108,7 +108,9 @@ $result_trees{'image_inline_or_not'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -125,7 +127,7 @@ $result_trees{'image_inline_or_not'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -210,7 +212,7 @@ $result_trees{'image_inline_or_not'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -296,7 +298,7 @@ $result_trees{'image_inline_or_not'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -305,9 +307,11 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -352,7 +356,7 @@ $result_trees{'image_inline_or_not'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -394,7 +398,7 @@ $result_trees{'image_inline_or_not'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -403,9 +407,11 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -413,7 +419,7 @@ $result_trees{'image_inline_or_not'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -441,7 +447,7 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -480,7 +486,7 @@ $result_trees{'image_inline_or_not'} = {
                               }
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -488,7 +494,7 @@ $result_trees{'image_inline_or_not'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -614,7 +620,7 @@ $result_trees{'image_inline_or_not'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -623,9 +629,11 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -634,7 +642,9 @@ $result_trees{'image_inline_or_not'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -651,7 +661,7 @@ $result_trees{'image_inline_or_not'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -906,7 +916,7 @@ $result_trees{'image_inline_or_not'} = {
                       'text' => 'menu'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -915,9 +925,11 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 39,
@@ -937,7 +949,8 @@ $result_trees{'image_inline_or_not'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -972,7 +985,7 @@ $result_trees{'image_inline_or_not'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -992,7 +1005,9 @@ $result_trees{'image_inline_or_not'} = {
             'normalized' => 'node_005fimage'
           }
         ],
-        'normalized' => 'node_005fimage',
+        'normalized' => 'node_005fimage'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1027,7 +1042,7 @@ $result_trees{'image_inline_or_not'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -1085,7 +1100,7 @@ $result_trees{'image_inline_or_not'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
@@ -1160,7 +1175,7 @@ $result_trees{'image_inline_or_not'} = {
                 }
               ],
               'cmdname' => 'footnote',
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => '
 '
               },
@@ -1198,7 +1213,7 @@ $result_trees{'image_inline_or_not'} = {
                   'text' => 'g'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1322,7 +1337,7 @@ $result_trees{'image_inline_or_not'} = {
                       'text' => 'float'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1331,9 +1346,11 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 60,
@@ -1348,7 +1365,6 @@ $result_trees{'image_inline_or_not'} = {
               {}
             ],
             'normalized' => 'g',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {}
@@ -1356,6 +1372,9 @@ $result_trees{'image_inline_or_not'} = {
               'normalized' => 'F'
             }
           },
+          'info' => {
+            'spaces_before_argument' => ' '
+          },
           'source_info' => {
             'file_name' => '',
             'line_nr' => 55,
@@ -1363,7 +1382,8 @@ $result_trees{'image_inline_or_not'} = {
           }
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1514,9 +1534,11 @@ $result_sectioning{'image_inline_or_not'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -1527,9 +1549,11 @@ $result_sectioning{'image_inline_or_not'} = {
                   'extra' => {
                     'normalized' => 'node_005fimage'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -1558,6 +1582,7 @@ $result_nodes{'image_inline_or_not'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'menus' => [
@@ -1567,6 +1592,7 @@ $result_nodes{'image_inline_or_not'} = {
     ],
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
@@ -1574,12 +1600,14 @@ $result_nodes{'image_inline_or_not'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'node_005fimage'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -1597,12 +1625,14 @@ $result_menus{'image_inline_or_not'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'normalized' => 'node_005fimage'
       },
+      'info' => {},
       'structure' => {
         'menu_next' => {
           'extra' => {
@@ -1641,6 +1671,7 @@ $result_floats{'image_inline_or_not'} = {
         'float_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
@@ -1655,6 +1686,7 @@ $result_floats{'image_inline_or_not'} = {
           'normalized' => 'F'
         }
       },
+      'info' => {},
       'structure' => {
         'float_number' => '1.1'
       }
diff --git a/tp/t/results/xml_tests/macro_and_args.pl 
b/tp/t/results/xml_tests/macro_and_args.pl
index 32f8f7e3a9..5333e5f48c 100644
--- a/tp/t/results/xml_tests/macro_and_args.pl
+++ b/tp/t/results/xml_tests/macro_and_args.pl
@@ -34,7 +34,7 @@ $result_trees{'macro_and_args'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -43,9 +43,11 @@ $result_trees{'macro_and_args'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -97,7 +99,7 @@ $result_trees{'macro_and_args'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -106,9 +108,11 @@ $result_trees{'macro_and_args'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
diff --git a/tp/t/results/xml_tests/node_and_bye.pl 
b/tp/t/results/xml_tests/node_and_bye.pl
index c0ba5e4c7d..f7050871d3 100644
--- a/tp/t/results/xml_tests/node_and_bye.pl
+++ b/tp/t/results/xml_tests/node_and_bye.pl
@@ -19,7 +19,7 @@ $result_trees{'node_and_bye'} = [
                 'text' => 'Top'
               }
             ],
-            'extra' => {
+            'info' => {
               'spaces_after_argument' => '
 '
             },
@@ -46,7 +46,9 @@ $result_trees{'node_and_bye'} = [
               'normalized' => 'Top'
             }
           ],
-          'normalized' => 'Top',
+          'normalized' => 'Top'
+        },
+        'info' => {
           'spaces_before_argument' => ' '
         },
         'source_info' => {
@@ -86,6 +88,7 @@ $result_nodes{'node_and_bye'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'structure' => {
@@ -104,6 +107,7 @@ $result_menus{'node_and_bye'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'associated_unit' => {
       'structure' => {
diff --git a/tp/t/results/xml_tests/node_no_section.pl 
b/tp/t/results/xml_tests/node_no_section.pl
index ba4fd01fc4..a4562191da 100644
--- a/tp/t/results/xml_tests/node_no_section.pl
+++ b/tp/t/results/xml_tests/node_no_section.pl
@@ -18,7 +18,7 @@ $result_trees{'node_no_section'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'node_no_section'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -63,14 +65,16 @@ $result_nodes{'node_no_section'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'node_no_section'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'node_no_section'} = [];
diff --git a/tp/t/results/xml_tests/raw.pl b/tp/t/results/xml_tests/raw.pl
index 887cc47fdf..7cb83ee795 100644
--- a/tp/t/results/xml_tests/raw.pl
+++ b/tp/t/results/xml_tests/raw.pl
@@ -12,7 +12,7 @@ $result_trees{'raw'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -38,7 +38,7 @@ $result_trees{'raw'} = {
                       'text' => 'tex'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -47,9 +47,11 @@ $result_trees{'raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -77,7 +79,7 @@ $result_trees{'raw'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -103,7 +105,7 @@ $result_trees{'raw'} = {
                           'text' => 'xml'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -112,9 +114,11 @@ $result_trees{'raw'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'xml'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 8,
diff --git a/tp/t/results/xml_tests/raw_and_comments.pl 
b/tp/t/results/xml_tests/raw_and_comments.pl
index 8127410cb1..c33a7ea9bb 100644
--- a/tp/t/results/xml_tests/raw_and_comments.pl
+++ b/tp/t/results/xml_tests/raw_and_comments.pl
@@ -68,7 +68,9 @@ $result_trees{'raw_and_comments'} = {
 '
                         ]
                       }
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_after_argument' => '  '
                   },
                   'type' => 'line_arg'
@@ -76,9 +78,11 @@ $result_trees{'raw_and_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -86,7 +90,7 @@ $result_trees{'raw_and_comments'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
@@ -165,7 +169,9 @@ $result_trees{'raw_and_comments'} = {
 '
                             ]
                           }
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_after_argument' => '  '
                       },
                       'type' => 'line_arg'
@@ -173,9 +179,11 @@ $result_trees{'raw_and_comments'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'xml'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 8,
@@ -183,7 +191,7 @@ $result_trees{'raw_and_comments'} = {
                   }
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
diff --git a/tp/t/results/xml_tests/spaces_info_lost.pl 
b/tp/t/results/xml_tests/spaces_info_lost.pl
index 54d0427704..f69fa32f9d 100644
--- a/tp/t/results/xml_tests/spaces_info_lost.pl
+++ b/tp/t/results/xml_tests/spaces_info_lost.pl
@@ -17,7 +17,7 @@ $result_trees{'spaces_info_lost'} = {
                   'text' => 'text on display line'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -43,7 +43,7 @@ $result_trees{'spaces_info_lost'} = {
                       'text' => 'display'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -52,9 +52,11 @@ $result_trees{'spaces_info_lost'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'display'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -62,7 +64,7 @@ $result_trees{'spaces_info_lost'} = {
               }
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_before_argument' => '  '
           },
           'source_info' => {
@@ -79,7 +81,7 @@ $result_trees{'spaces_info_lost'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '  
 '
               },
@@ -101,7 +103,7 @@ $result_trees{'spaces_info_lost'} = {
                       'text' => 'verbatim'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => ' 
 '
                   },
@@ -110,9 +112,11 @@ $result_trees{'spaces_info_lost'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => '  ',
                 'text_arg' => 'verbatim'
               },
+              'info' => {
+                'spaces_before_argument' => '  '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
diff --git a/tp/t/results/xtable/accent_on_table_line.pl 
b/tp/t/results/xtable/accent_on_table_line.pl
index 28e3dc084a..9132a35820 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -27,7 +27,7 @@ $result_trees{'accent_on_table_line'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -48,7 +48,7 @@ $result_trees{'accent_on_table_line'} = {
                               'text' => 'first item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -56,7 +56,7 @@ $result_trees{'accent_on_table_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -101,7 +101,7 @@ $result_trees{'accent_on_table_line'} = {
                               }
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -109,7 +109,7 @@ $result_trees{'accent_on_table_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -132,7 +132,7 @@ $result_trees{'accent_on_table_line'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -141,9 +141,11 @@ $result_trees{'accent_on_table_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -152,7 +154,9 @@ $result_trees{'accent_on_table_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -189,7 +193,7 @@ $result_trees{'accent_on_table_line'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -210,7 +214,7 @@ $result_trees{'accent_on_table_line'} = {
                               'text' => 'acc brace first item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -218,7 +222,7 @@ $result_trees{'accent_on_table_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -263,7 +267,7 @@ $result_trees{'accent_on_table_line'} = {
                               }
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -271,7 +275,7 @@ $result_trees{'accent_on_table_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -294,7 +298,7 @@ $result_trees{'accent_on_table_line'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -303,9 +307,11 @@ $result_trees{'accent_on_table_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -314,7 +320,9 @@ $result_trees{'accent_on_table_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 7ba7b7ec1d..ea7931da1e 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -18,7 +18,7 @@ $result_trees{'block_commands_in_table'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -38,7 +38,9 @@ $result_trees{'block_commands_in_table'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -55,7 +57,7 @@ $result_trees{'block_commands_in_table'} = {
               'text' => 'Element'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -83,7 +85,7 @@ $result_trees{'block_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -104,7 +106,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'first item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -112,7 +114,7 @@ $result_trees{'block_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -129,7 +131,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'second itemx'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -137,7 +139,7 @@ $result_trees{'block_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'itemx',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -188,7 +190,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'example'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -196,7 +198,7 @@ $result_trees{'block_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -213,7 +215,7 @@ $result_trees{'block_commands_in_table'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -248,7 +250,7 @@ $result_trees{'block_commands_in_table'} = {
                                   'text' => 'example'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -257,9 +259,11 @@ $result_trees{'block_commands_in_table'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 15,
@@ -291,7 +295,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'empty line'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -299,7 +303,7 @@ $result_trees{'block_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -345,7 +349,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'quotation'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -353,7 +357,7 @@ $result_trees{'block_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -370,7 +374,7 @@ $result_trees{'block_commands_in_table'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -396,7 +400,7 @@ $result_trees{'block_commands_in_table'} = {
                                   'text' => 'quotation'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -405,9 +409,11 @@ $result_trees{'block_commands_in_table'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'quotation'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 22,
@@ -444,7 +450,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'quotation after a blank line'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -452,7 +458,7 @@ $result_trees{'block_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -474,7 +480,7 @@ $result_trees{'block_commands_in_table'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -500,7 +506,7 @@ $result_trees{'block_commands_in_table'} = {
                                   'text' => 'quotation'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -509,9 +515,11 @@ $result_trees{'block_commands_in_table'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'spaces_before_argument' => ' ',
                             'text_arg' => 'quotation'
                           },
+                          'info' => {
+                            'spaces_before_argument' => ' '
+                          },
                           'source_info' => {
                             'file_name' => '',
                             'line_nr' => 28,
@@ -539,7 +547,7 @@ $result_trees{'block_commands_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -548,9 +556,11 @@ $result_trees{'block_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -559,7 +569,9 @@ $result_trees{'block_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -587,7 +599,7 @@ $result_trees{'block_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -608,7 +620,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'item before ignored lines'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -628,7 +640,9 @@ $result_trees{'block_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -663,7 +677,7 @@ $result_trees{'block_commands_in_table'} = {
                                   'text' => 'vindex'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -683,7 +697,9 @@ $result_trees{'block_commands_in_table'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
                               'index_type_command' => 'vindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -704,7 +720,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'itemx now'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -724,7 +740,9 @@ $result_trees{'block_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -766,7 +784,7 @@ $result_trees{'block_commands_in_table'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -775,9 +793,11 @@ $result_trees{'block_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -786,7 +806,9 @@ $result_trees{'block_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -809,7 +831,7 @@ $result_trees{'block_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -830,7 +852,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -850,7 +872,9 @@ $result_trees{'block_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -877,7 +901,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'itemx after an empty line'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -897,7 +921,9 @@ $result_trees{'block_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -944,7 +970,7 @@ $result_trees{'block_commands_in_table'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -953,9 +979,11 @@ $result_trees{'block_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 46,
@@ -964,7 +992,9 @@ $result_trees{'block_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1001,7 +1031,7 @@ $result_trees{'block_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1022,7 +1052,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'in item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1030,7 +1060,7 @@ $result_trees{'block_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1071,7 +1101,7 @@ $result_trees{'block_commands_in_table'} = {
                               'text' => 'second item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1079,7 +1109,7 @@ $result_trees{'block_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1116,7 +1146,7 @@ $result_trees{'block_commands_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1125,9 +1155,11 @@ $result_trees{'block_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 54,
@@ -1136,7 +1168,9 @@ $result_trees{'block_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1155,7 +1189,8 @@ $result_trees{'block_commands_in_table'} = {
           'type' => 'paragraph'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -1303,9 +1338,11 @@ $result_sectioning{'block_commands_in_table'} = {
             'cmdname' => 'node',
             'extra' => {
               'normalized' => 'Top'
-            }
+            },
+            'info' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_level' => 0,
           'section_up' => {}
@@ -1323,17 +1360,20 @@ $result_nodes{'block_commands_in_table'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_menus{'block_commands_in_table'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top'
-  }
+  },
+  'info' => {}
 };
 
 $result_errors{'block_commands_in_table'} = [];
diff --git a/tp/t/results/xtable/comment_and_itemx_before_item.pl 
b/tp/t/results/xtable/comment_and_itemx_before_item.pl
index 865a6788fc..597c760707 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -23,7 +23,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
                               'text' => 'in itemx'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -73,7 +73,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
                         }
                       ],
                       'cmdname' => 'itemx',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -96,7 +96,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -105,9 +105,11 @@ $result_trees{'comment_and_itemx_before_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -116,7 +118,9 @@ $result_trees{'comment_and_itemx_before_item'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/xtable/definfoenclose_on_table_line.pl 
b/tp/t/results/xtable/definfoenclose_on_table_line.pl
index fdcbe6aee5..fae06e35ec 100644
--- a/tp/t/results/xtable/definfoenclose_on_table_line.pl
+++ b/tp/t/results/xtable/definfoenclose_on_table_line.pl
@@ -17,7 +17,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                   'text' => 'phi,:,:'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -30,7 +30,9 @@ $result_trees{'definfoenclose_on_table_line'} = {
               'phi',
               ':',
               ':'
-            ],
+            ]
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -62,7 +64,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                   'type' => 'definfoenclose_command'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -83,7 +85,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -91,7 +93,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -108,7 +110,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                               'text' => 'item x'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -116,7 +118,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                         }
                       ],
                       'cmdname' => 'itemx',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -158,7 +160,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -167,9 +169,11 @@ $result_trees{'definfoenclose_on_table_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -178,7 +182,9 @@ $result_trees{'definfoenclose_on_table_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/xtable/empty_item_itemx.pl 
b/tp/t/results/xtable/empty_item_itemx.pl
index 510e6b8d01..f3130ada1d 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -23,7 +23,7 @@ $result_trees{'empty_item_itemx'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -68,7 +68,7 @@ $result_trees{'empty_item_itemx'} = {
                               'text' => 'first item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -87,7 +87,9 @@ $result_trees{'empty_item_itemx'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -99,7 +101,7 @@ $result_trees{'empty_item_itemx'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -124,7 +126,7 @@ $result_trees{'empty_item_itemx'} = {
                               'text' => 'after an empty itemx, before an empty 
item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -143,7 +145,9 @@ $result_trees{'empty_item_itemx'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -165,7 +169,7 @@ $result_trees{'empty_item_itemx'} = {
                     {
                       'args' => [
                         {
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => ' 
 '
                           },
@@ -200,7 +204,7 @@ $result_trees{'empty_item_itemx'} = {
                               'text' => 'in item before end table'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -219,7 +223,9 @@ $result_trees{'empty_item_itemx'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -242,7 +248,7 @@ $result_trees{'empty_item_itemx'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -251,9 +257,11 @@ $result_trees{'empty_item_itemx'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -262,7 +270,9 @@ $result_trees{'empty_item_itemx'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/xtable/headitem_in_table.pl 
b/tp/t/results/xtable/headitem_in_table.pl
index 5953f9052b..7aa60fe540 100644
--- a/tp/t/results/xtable/headitem_in_table.pl
+++ b/tp/t/results/xtable/headitem_in_table.pl
@@ -23,7 +23,7 @@ $result_trees{'headitem_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -81,7 +81,7 @@ $result_trees{'headitem_in_table'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -89,7 +89,7 @@ $result_trees{'headitem_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -112,7 +112,7 @@ $result_trees{'headitem_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -121,9 +121,11 @@ $result_trees{'headitem_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -132,7 +134,9 @@ $result_trees{'headitem_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl 
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index 4f232fa00d..93641dd467 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -24,7 +24,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               'text' => 'Top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -44,7 +44,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             'normalized' => 'Top'
           }
         ],
-        'normalized' => 'Top',
+        'normalized' => 'Top'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -61,7 +63,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               'text' => 'top'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -76,7 +78,8 @@ $result_trees{'inter_item_commands_in_table'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -93,7 +96,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               'text' => 'chapter'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -113,7 +116,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             'normalized' => 'chapter'
           }
         ],
-        'normalized' => 'chapter',
+        'normalized' => 'chapter'
+      },
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -130,7 +135,7 @@ $result_trees{'inter_item_commands_in_table'} = {
               'text' => 'chap'
             }
           ],
-          'extra' => {
+          'info' => {
             'spaces_after_argument' => '
 '
           },
@@ -158,7 +163,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -200,7 +205,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'acode--b'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -220,7 +225,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -257,7 +264,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -266,9 +273,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -277,7 +286,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -305,7 +316,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -326,7 +337,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'aasis--b'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -346,7 +357,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -384,7 +397,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'b'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -404,7 +417,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
                           'index_type_command' => 'vtable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -441,7 +456,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'vtable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -450,9 +465,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -461,7 +478,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -489,7 +508,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -510,7 +529,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'avar--b'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -530,7 +549,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -549,7 +570,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                                   'text' => 'index entry between item and 
itemx'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -569,7 +590,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
                               'index_type_command' => 'cindex'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -622,7 +645,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'b'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -642,7 +665,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -683,7 +708,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'c'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -703,7 +728,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -751,7 +778,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'd'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -771,7 +798,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
                           'index_type_command' => 'ftable'
-                        },
+                        }
+                      },
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -820,7 +849,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'ftable'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -829,9 +858,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'ftable'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -840,7 +871,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -868,7 +901,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -887,7 +920,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'text' => 'cindex in table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' 
 '
                       },
@@ -907,7 +940,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -948,7 +983,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'abb'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -956,7 +991,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -993,7 +1028,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1002,9 +1037,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 41,
@@ -1013,7 +1050,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1041,7 +1080,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1060,7 +1099,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'text' => 'cindex in table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' 
 '
                       },
@@ -1080,7 +1119,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1114,7 +1155,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'abb'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1122,7 +1163,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1145,7 +1186,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1154,9 +1195,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 47,
@@ -1165,7 +1208,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1193,7 +1238,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1212,7 +1257,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'text' => 'samp cindex in table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' 
 '
                       },
@@ -1232,7 +1277,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1273,7 +1320,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'asamp--bb'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1281,7 +1328,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1318,7 +1365,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1327,9 +1374,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 54,
@@ -1338,7 +1387,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1366,7 +1417,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1385,7 +1436,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'text' => 'samp cindex in table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => ' 
 '
                       },
@@ -1405,7 +1456,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1439,7 +1492,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'asamp--bb'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1447,7 +1500,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1470,7 +1523,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1479,9 +1532,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 60,
@@ -1490,7 +1545,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1518,7 +1575,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -1542,7 +1599,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'text' => 'cindex between lines'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1562,7 +1619,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1592,7 +1651,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'asamp--bb1'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1600,7 +1659,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1623,7 +1682,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1632,9 +1691,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 67,
@@ -1643,7 +1704,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1671,7 +1734,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -1690,7 +1753,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'text' => 'cindex before line'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1710,7 +1773,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1740,7 +1805,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'asamp--bb2'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1748,7 +1813,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1771,7 +1836,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1780,9 +1845,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 73,
@@ -1791,7 +1858,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1819,7 +1888,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -1843,7 +1912,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'text' => 'cindex after line'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1863,7 +1932,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1888,7 +1959,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'asamp--bb2'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1896,7 +1967,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -1919,7 +1990,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1928,9 +1999,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 79,
@@ -1939,7 +2012,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -1967,7 +2042,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => ' 
 '
               },
@@ -1986,7 +2061,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'text' => 'cindex first'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2006,7 +2081,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -2040,7 +2117,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'text' => 'second'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2060,7 +2137,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -2078,7 +2157,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'text' => 'third'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -2098,7 +2177,9 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
                       'index_type_command' => 'cindex'
-                    },
+                    }
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -2123,7 +2204,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                               'text' => 'asamp--bb2'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -2131,7 +2212,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -2154,7 +2235,7 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -2163,9 +2244,11 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 87,
@@ -2174,7 +2257,9 @@ $result_trees{'inter_item_commands_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
@@ -2194,7 +2279,8 @@ $result_trees{'inter_item_commands_in_table'} = {
           'type' => 'empty_line'
         }
       ],
-      'extra' => {
+      'extra' => {},
+      'info' => {
         'spaces_before_argument' => ' '
       },
       'source_info' => {
@@ -2446,9 +2532,11 @@ $result_sectioning{'inter_item_commands_in_table'} = {
             'extra' => {
               'normalized' => 'Top'
             },
+            'info' => {},
             'structure' => {}
           }
         },
+        'info' => {},
         'structure' => {
           'section_childs' => [
             {
@@ -2459,9 +2547,11 @@ $result_sectioning{'inter_item_commands_in_table'} = {
                   'extra' => {
                     'normalized' => 'chapter'
                   },
+                  'info' => {},
                   'structure' => {}
                 }
               },
+              'info' => {},
               'structure' => {
                 'section_level' => 1,
                 'section_number' => 1,
@@ -2490,10 +2580,12 @@ $result_nodes{'inter_item_commands_in_table'} = {
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {},
+      'info' => {},
       'structure' => {}
     },
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
@@ -2501,12 +2593,14 @@ $result_nodes{'inter_item_commands_in_table'} = {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {},
+          'info' => {},
           'structure' => {
             'section_number' => 1
           }
         },
         'normalized' => 'chapter'
       },
+      'info' => {},
       'structure' => {
         'node_prev' => {},
         'node_up' => {}
@@ -2522,6 +2616,7 @@ $result_menus{'inter_item_commands_in_table'} = {
   'extra' => {
     'normalized' => 'Top'
   },
+  'info' => {},
   'structure' => {}
 };
 
diff --git a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl 
b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
index 907c4cfc26..60a17aafe4 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
@@ -16,7 +16,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -39,7 +39,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -60,7 +60,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                                   'text' => 'a--b'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -68,7 +68,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -89,7 +89,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                                           'text' => 'index entry between item 
and itemx'
                                         }
                                       ],
-                                      'extra' => {
+                                      'info' => {
                                         'spaces_after_argument' => '
 '
                                       },
@@ -108,7 +108,9 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                                       'index_ignore_chars' => {},
                                       'index_name' => 'cp',
                                       'index_type_command' => 'cindex'
-                                    },
+                                    }
+                                  },
+                                  'info' => {
                                     'spaces_before_argument' => ' '
                                   },
                                   'source_info' => {
@@ -164,7 +166,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                                   'text' => 'b'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -172,7 +174,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                             }
                           ],
                           'cmdname' => 'itemx',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -204,7 +206,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                                   'text' => 'c'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -212,7 +214,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                             }
                           ],
                           'cmdname' => 'itemx',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -253,7 +255,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                                   'text' => 'd'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -261,7 +263,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -284,7 +286,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -293,9 +295,11 @@ $result_trees{'inter_item_commands_in_table_in_example'} = 
{
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 12,
@@ -304,7 +308,9 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -321,7 +327,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -330,9 +336,11 @@ $result_trees{'inter_item_commands_in_table_in_example'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
diff --git a/tp/t/results/xtable/invalid_command_and_brace_in_table.pl 
b/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
index 690f6f3bcf..c6f4634011 100644
--- a/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
+++ b/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
@@ -23,7 +23,7 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -65,7 +65,7 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -74,9 +74,11 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -85,7 +87,9 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/xtable/itemx_before_item.pl 
b/tp/t/results/xtable/itemx_before_item.pl
index a1b30d3cc8..017b1d5a0f 100644
--- a/tp/t/results/xtable/itemx_before_item.pl
+++ b/tp/t/results/xtable/itemx_before_item.pl
@@ -23,7 +23,7 @@ $result_trees{'itemx_before_item'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -44,7 +44,7 @@ $result_trees{'itemx_before_item'} = {
                               'text' => 'in itemx'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -52,7 +52,7 @@ $result_trees{'itemx_before_item'} = {
                         }
                       ],
                       'cmdname' => 'itemx',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -75,7 +75,7 @@ $result_trees{'itemx_before_item'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -84,9 +84,11 @@ $result_trees{'itemx_before_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -95,7 +97,9 @@ $result_trees{'itemx_before_item'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/xtable/long_item.pl b/tp/t/results/xtable/long_item.pl
index 17474cc2a1..de13f31412 100644
--- a/tp/t/results/xtable/long_item.pl
+++ b/tp/t/results/xtable/long_item.pl
@@ -23,7 +23,7 @@ $result_trees{'long_item'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -44,7 +44,7 @@ $result_trees{'long_item'} = {
                               'text' => 'first item      
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -52,7 +52,7 @@ $result_trees{'long_item'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -69,7 +69,7 @@ $result_trees{'long_item'} = {
                               'text' => 'second itemx 
bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b b b b b b b b b b b b b'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -77,7 +77,7 @@ $result_trees{'long_item'} = {
                         }
                       ],
                       'cmdname' => 'itemx',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -119,7 +119,7 @@ $result_trees{'long_item'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -128,9 +128,11 @@ $result_trees{'long_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -139,7 +141,9 @@ $result_trees{'long_item'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl 
b/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
index c76db1c59d..db9fc216d3 100644
--- a/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
+++ b/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
@@ -27,7 +27,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -48,7 +48,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -56,7 +56,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -79,7 +79,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -88,9 +88,11 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -99,7 +101,9 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/xtable/no_argument_for_table.pl 
b/tp/t/results/xtable/no_argument_for_table.pl
index dfe0796f6c..a9eaddd168 100644
--- a/tp/t/results/xtable/no_argument_for_table.pl
+++ b/tp/t/results/xtable/no_argument_for_table.pl
@@ -16,7 +16,7 @@ $result_trees{'no_argument_for_table'} = {
               'type' => 'command_as_argument_inserted'
             },
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -37,7 +37,7 @@ $result_trees{'no_argument_for_table'} = {
                               'text' => 'item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -45,7 +45,7 @@ $result_trees{'no_argument_for_table'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -82,7 +82,7 @@ $result_trees{'no_argument_for_table'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -91,9 +91,11 @@ $result_trees{'no_argument_for_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index 5c3ae4b295..5ee3aa8fd9 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -131,7 +131,7 @@ $result_trees{'table_nested'} = {
                       'text' => 'macro'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -140,9 +140,11 @@ $result_trees{'table_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'macro'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -177,7 +179,7 @@ $result_trees{'table_nested'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -200,7 +202,7 @@ $result_trees{'table_nested'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -221,7 +223,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'first item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -240,7 +242,9 @@ $result_trees{'table_nested'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
                               'index_type_command' => 'vtable'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -257,7 +261,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'second itemx'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -276,7 +280,9 @@ $result_trees{'table_nested'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
                               'index_type_command' => 'vtable'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -327,7 +333,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'second item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -346,7 +352,9 @@ $result_trees{'table_nested'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
                               'index_type_command' => 'vtable'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -397,7 +405,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'last'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -416,7 +424,9 @@ $result_trees{'table_nested'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
                               'index_type_command' => 'vtable'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -439,7 +449,7 @@ $result_trees{'table_nested'} = {
                           'text' => 'vtable'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -448,9 +458,11 @@ $result_trees{'table_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'vtable'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 27,
@@ -459,7 +471,9 @@ $result_trees{'table_nested'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -496,7 +510,7 @@ $result_trees{'table_nested'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -517,7 +531,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'in item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -525,7 +539,7 @@ $result_trees{'table_nested'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -566,7 +580,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'second item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -574,7 +588,7 @@ $result_trees{'table_nested'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -611,7 +625,7 @@ $result_trees{'table_nested'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -620,9 +634,11 @@ $result_trees{'table_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 27,
@@ -631,7 +647,9 @@ $result_trees{'table_nested'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -657,7 +675,7 @@ $result_trees{'table_nested'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -666,9 +684,11 @@ $result_trees{'table_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -699,7 +719,7 @@ $result_trees{'table_nested'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -722,7 +742,7 @@ $result_trees{'table_nested'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -743,7 +763,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'first item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -762,7 +782,9 @@ $result_trees{'table_nested'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
                               'index_type_command' => 'vtable'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -779,7 +801,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'second itemx'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -798,7 +820,9 @@ $result_trees{'table_nested'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
                               'index_type_command' => 'vtable'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -849,7 +873,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'second item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -868,7 +892,9 @@ $result_trees{'table_nested'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
                               'index_type_command' => 'vtable'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -919,7 +945,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'last'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -938,7 +964,9 @@ $result_trees{'table_nested'} = {
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
                               'index_type_command' => 'vtable'
-                            },
+                            }
+                          },
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -961,7 +989,7 @@ $result_trees{'table_nested'} = {
                           'text' => 'vtable'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -970,9 +998,11 @@ $result_trees{'table_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'vtable'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 32,
@@ -981,7 +1011,9 @@ $result_trees{'table_nested'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1018,7 +1050,7 @@ $result_trees{'table_nested'} = {
                       'type' => 'command_as_argument'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1039,7 +1071,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'in item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1047,7 +1079,7 @@ $result_trees{'table_nested'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -1088,7 +1120,7 @@ $result_trees{'table_nested'} = {
                                   'text' => 'second item'
                                 }
                               ],
-                              'extra' => {
+                              'info' => {
                                 'spaces_after_argument' => '
 '
                               },
@@ -1096,7 +1128,7 @@ $result_trees{'table_nested'} = {
                             }
                           ],
                           'cmdname' => 'item',
-                          'extra' => {
+                          'info' => {
                             'spaces_before_argument' => ' '
                           },
                           'source_info' => {
@@ -1133,7 +1165,7 @@ $result_trees{'table_nested'} = {
                           'text' => 'table'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1142,9 +1174,11 @@ $result_trees{'table_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 32,
@@ -1153,7 +1187,9 @@ $result_trees{'table_nested'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
+                'command_as_argument' => {}
+              },
+              'info' => {
                 'spaces_before_argument' => ' '
               },
               'source_info' => {
@@ -1179,7 +1215,7 @@ $result_trees{'table_nested'} = {
                       'text' => 'example'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1188,9 +1224,11 @@ $result_trees{'table_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 33,
@@ -1221,7 +1259,7 @@ $result_trees{'table_nested'} = {
         {
           'args' => [
             {
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -1233,7 +1271,7 @@ $result_trees{'table_nested'} = {
             {
               'args' => [
                 {
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1256,7 +1294,7 @@ $result_trees{'table_nested'} = {
                           'type' => 'command_as_argument'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1277,7 +1315,7 @@ $result_trees{'table_nested'} = {
                                       'text' => 'first item'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -1296,7 +1334,9 @@ $result_trees{'table_nested'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'vr',
                                   'index_type_command' => 'vtable'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -1313,7 +1353,7 @@ $result_trees{'table_nested'} = {
                                       'text' => 'second itemx'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -1332,7 +1372,9 @@ $result_trees{'table_nested'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'vr',
                                   'index_type_command' => 'vtable'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -1383,7 +1425,7 @@ $result_trees{'table_nested'} = {
                                       'text' => 'second item'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -1402,7 +1444,9 @@ $result_trees{'table_nested'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'vr',
                                   'index_type_command' => 'vtable'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -1453,7 +1497,7 @@ $result_trees{'table_nested'} = {
                                       'text' => 'last'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -1472,7 +1516,9 @@ $result_trees{'table_nested'} = {
                                   'index_ignore_chars' => {},
                                   'index_name' => 'vr',
                                   'index_type_command' => 'vtable'
-                                },
+                                }
+                              },
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -1495,7 +1541,7 @@ $result_trees{'table_nested'} = {
                               'text' => 'vtable'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1504,9 +1550,11 @@ $result_trees{'table_nested'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'vtable'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 38,
@@ -1515,7 +1563,9 @@ $result_trees{'table_nested'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
+                    'command_as_argument' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1552,7 +1602,7 @@ $result_trees{'table_nested'} = {
                           'type' => 'command_as_argument'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1573,7 +1623,7 @@ $result_trees{'table_nested'} = {
                                       'text' => 'in item'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -1581,7 +1631,7 @@ $result_trees{'table_nested'} = {
                                 }
                               ],
                               'cmdname' => 'item',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -1622,7 +1672,7 @@ $result_trees{'table_nested'} = {
                                       'text' => 'second item'
                                     }
                                   ],
-                                  'extra' => {
+                                  'info' => {
                                     'spaces_after_argument' => '
 '
                                   },
@@ -1630,7 +1680,7 @@ $result_trees{'table_nested'} = {
                                 }
                               ],
                               'cmdname' => 'item',
-                              'extra' => {
+                              'info' => {
                                 'spaces_before_argument' => ' '
                               },
                               'source_info' => {
@@ -1667,7 +1717,7 @@ $result_trees{'table_nested'} = {
                               'text' => 'table'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -1676,9 +1726,11 @@ $result_trees{'table_nested'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' ',
                         'text_arg' => 'table'
                       },
+                      'info' => {
+                        'spaces_before_argument' => ' '
+                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 38,
@@ -1687,7 +1739,9 @@ $result_trees{'table_nested'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
+                    'command_as_argument' => {}
+                  },
+                  'info' => {
                     'spaces_before_argument' => ' '
                   },
                   'source_info' => {
@@ -1713,7 +1767,7 @@ $result_trees{'table_nested'} = {
                           'text' => 'quotation'
                         }
                       ],
-                      'extra' => {
+                      'info' => {
                         'spaces_after_argument' => '
 '
                       },
@@ -1722,9 +1776,11 @@ $result_trees{'table_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
+                  'info' => {
+                    'spaces_before_argument' => ' '
+                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 39,
@@ -1746,7 +1802,7 @@ $result_trees{'table_nested'} = {
                       'text' => 'quotation'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -1755,9 +1811,11 @@ $result_trees{'table_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 40,
diff --git a/tp/t/results/xtable/text_between_item_itemx.pl 
b/tp/t/results/xtable/text_between_item_itemx.pl
index dafa159f64..628e2cef71 100644
--- a/tp/t/results/xtable/text_between_item_itemx.pl
+++ b/tp/t/results/xtable/text_between_item_itemx.pl
@@ -23,7 +23,7 @@ $result_trees{'text_between_item_itemx'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -44,7 +44,7 @@ $result_trees{'text_between_item_itemx'} = {
                               'text' => 'in item'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -52,7 +52,7 @@ $result_trees{'text_between_item_itemx'} = {
                         }
                       ],
                       'cmdname' => 'item',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -83,7 +83,7 @@ $result_trees{'text_between_item_itemx'} = {
                               'text' => 'in itemx'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -91,7 +91,7 @@ $result_trees{'text_between_item_itemx'} = {
                         }
                       ],
                       'cmdname' => 'itemx',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -114,7 +114,7 @@ $result_trees{'text_between_item_itemx'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -123,9 +123,11 @@ $result_trees{'text_between_item_itemx'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -134,7 +136,9 @@ $result_trees{'text_between_item_itemx'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {
diff --git a/tp/t/results/xtable/title_and_itemx_before_item.pl 
b/tp/t/results/xtable/title_and_itemx_before_item.pl
index 9fcc704c8f..c071f7887c 100644
--- a/tp/t/results/xtable/title_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/title_and_itemx_before_item.pl
@@ -23,7 +23,7 @@ $result_trees{'title_and_itemx_before_item'} = {
                   'type' => 'command_as_argument'
                 }
               ],
-              'extra' => {
+              'info' => {
                 'spaces_after_argument' => '
 '
               },
@@ -58,7 +58,7 @@ $result_trees{'title_and_itemx_before_item'} = {
                               'text' => 'in itemx'
                             }
                           ],
-                          'extra' => {
+                          'info' => {
                             'spaces_after_argument' => '
 '
                           },
@@ -66,7 +66,7 @@ $result_trees{'title_and_itemx_before_item'} = {
                         }
                       ],
                       'cmdname' => 'itemx',
-                      'extra' => {
+                      'info' => {
                         'spaces_before_argument' => ' '
                       },
                       'source_info' => {
@@ -89,7 +89,7 @@ $result_trees{'title_and_itemx_before_item'} = {
                       'text' => 'table'
                     }
                   ],
-                  'extra' => {
+                  'info' => {
                     'spaces_after_argument' => '
 '
                   },
@@ -98,9 +98,11 @@ $result_trees{'title_and_itemx_before_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
+              'info' => {
+                'spaces_before_argument' => ' '
+              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -109,7 +111,9 @@ $result_trees{'title_and_itemx_before_item'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
+            'command_as_argument' => {}
+          },
+          'info' => {
             'spaces_before_argument' => ' '
           },
           'source_info' => {



reply via email to

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