[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sat, 28 Sep 2024 18:00:41 -0400 (EDT) |
branch: master
commit 885a63f114b163d95423258c22e23e89704fb318
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jun 2 23:09:15 2024 +0200
Type brace_command_container for brace_command_arg without spaces
* tp/Texinfo/Convert/Converter.pm (table_item_content_tree),
tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
tp/Texinfo/Convert/Plaintext.pm (_convert),
tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi),
tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm (_convert),
tp/Texinfo/ParserNonXS.pm (_print_command_args_texi)
(_expand_macro_arguments, _isolate_last_space, _handle_open_brace),
tp/Texinfo/XS/convert/converter.c (table_item_content_tree),
tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi),
tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
tp/Texinfo/XS/main/element_types.txt,
tp/Texinfo/XS/main/node_name_normalization.c
(convert_to_normalized_internal), tp/Texinfo/XS/parsetexi/end_line.c
(end_line_starting_block), tp/Texinfo/XS/parsetexi/macro.c
(expand_macro_arguments), tp/Texinfo/XS/parsetexi/parser.c
(isolate_last_space), tp/Texinfo/XS/parsetexi/separator.c
(handle_open_brace): use a different container for brace commands args
if the brace command is of the arguments type and the spaces are in
the info dataof the brace commands args, called
brace_command_container.
---
ChangeLog | 26 ++
tp/Texinfo/Convert/Converter.pm | 5 +
tp/Texinfo/Convert/NodeNameNormalization.pm | 3 +-
tp/Texinfo/Convert/Plaintext.pm | 2 +-
tp/Texinfo/Convert/Texinfo.pm | 1 +
tp/Texinfo/Convert/TexinfoMarkup.pm | 4 +-
tp/Texinfo/Convert/Text.pm | 3 +-
tp/Texinfo/ParserNonXS.pm | 22 +-
tp/Texinfo/XS/convert/converter.c | 5 +
tp/Texinfo/XS/main/convert_to_texinfo.c | 1 +
tp/Texinfo/XS/main/convert_to_text.c | 1 +
tp/Texinfo/XS/main/element_types.c | 1 +
tp/Texinfo/XS/main/element_types.h | 1 +
tp/Texinfo/XS/main/element_types.txt | 2 +
tp/Texinfo/XS/main/node_name_normalization.c | 1 +
tp/Texinfo/XS/parsetexi/counter.c | 2 +-
tp/Texinfo/XS/parsetexi/end_line.c | 8 +-
tp/Texinfo/XS/parsetexi/macro.c | 4 +-
tp/Texinfo/XS/parsetexi/parser.c | 1 +
tp/Texinfo/XS/parsetexi/separator.c | 15 +-
tp/Texinfo/command_data.txt | 2 +
tp/t/results/alias/alias_macro_target_removed.pl | 2 +-
tp/t/results/alias/alias_of_macro.pl | 2 +-
tp/t/results/alias/alias_of_macro_before_macro.pl | 2 +-
tp/t/results/alias/texinfo_command_alias.pl | 2 +-
.../alias/texinfo_command_alias_indirect.pl | 2 +-
.../conditionals/inlinefmtifelse_nesting.pl | 4 +-
.../conditionals/inlineiffmtifelse_not_closed.pl | 2 +-
.../inlineiffmtifelse_not_closed_three_arg.pl | 4 +-
.../inlineiffmtifelse_not_closed_two_arg.pl | 2 +-
.../conditionals/inlineifset_false_not_closed.pl | 2 +-
tp/t/results/conditionals/macro_in_ifset.pl | 2 +-
tp/t/results/conditionals/macro_in_ifset_set.pl | 2 +-
tp/t/results/conditionals/nested_ifset_ifclear.pl | 8 +-
.../results/converters_tests/at_commands_in_raw.pl | 10 +-
tp/t/results/converters_tests/commands_in_sc.pl | 48 ++--
tp/t/results/converters_tests/commands_in_var.pl | 48 ++--
tp/t/results/converters_tests/form_feeds.pl | 2 +-
tp/t/results/converters_tests/image_extension.pl | 10 +-
tp/t/results/converters_tests/image_formatting.pl | 150 +++++------
tp/t/results/converters_tests/image_with_spaces.pl | Bin 4213 -> 4261 bytes
tp/t/results/converters_tests/inline.pl | 44 ++--
tp/t/results/converters_tests/inline_expand_tex.pl | 28 +--
tp/t/results/converters_tests/inlinefmtifelse.pl | 38 +--
.../inlinefmtifelse_with_commands.pl | 24 +-
tp/t/results/converters_tests/inlinefmtspaces.pl | 10 +-
.../results/converters_tests/inlineifsetifclear.pl | 12 +-
.../converters_tests/inlineifsetifclearspaces.pl | 12 +-
tp/t/results/converters_tests/inlinerawspaces.pl | 10 +-
tp/t/results/converters_tests/link.pl | 24 +-
.../converters_tests/ref_error_formatting.pl | 278 ++++++++++-----------
tp/t/results/converters_tests/ref_in_sectioning.pl | 134 +++++-----
.../references_to_top_no_top_output.pl | 24 +-
tp/t/results/converters_tests/refs_formatting.pl | 258 +++++++++----------
.../some_at_commands_in_ref_nodes.pl | 10 +-
.../converters_tests/spaces_in_empty_node_names.pl | 6 +-
.../converters_tests/spaces_in_node_names.pl | 6 +-
.../converters_tests/things_before_setfilename.pl | 16 +-
.../things_before_setfilename_no_element.pl | 16 +-
tp/t/results/converters_tests/top_in_ref.pl | 258 +++++++++----------
tp/t/results/coverage/commands.pl | 4 +-
tp/t/results/coverage/commands_in_math.pl | 2 +-
tp/t/results/coverage/hyphenation.pl | 2 +-
tp/t/results/coverage/invalid_U.pl | 18 +-
.../coverage/spaces_after_braced_command.pl | 4 +-
tp/t/results/coverage/test_errormsg.pl | 4 +-
tp/t/results/coverage_braces/abbr_acronym.pl | 16 +-
tp/t/results/coverage_braces/anchor_not_closed.pl | 2 +-
.../coverage_braces/brace_opened_no_command.pl | 2 +-
.../coverage_braces/contain_plain_text_nestings.pl | 24 +-
.../results/coverage_braces/email_possibilities.pl | 10 +-
tp/t/results/coverage_braces/empty_commands.pl | 6 +-
tp/t/results/coverage_braces/empty_images.pl | 28 +--
.../coverage_braces/empty_line_in_anchor.pl | 2 +-
.../results/coverage_braces/empty_line_in_email.pl | 2 +-
tp/t/results/coverage_braces/empty_ref.pl | 14 +-
.../coverage_braces/empty_second_email_argument.pl | 4 +-
tp/t/results/coverage_braces/end_line_in_anchor.pl | 2 +-
.../coverage_braces/form_feed_in_brace_commands.pl | 6 +-
.../coverage_braces/inforef_too_much_args.pl | 6 +-
tp/t/results/coverage_braces/nested_args.pl | 8 +-
tp/t/results/coverage_braces/nested_in_sc.pl | 4 +-
.../one_argument_leading_trailing_spaces.pl | 4 +-
tp/t/results/coverage_braces/recursive_acronym.pl | 6 +-
.../recursive_acronym_definition.pl | 12 +-
tp/t/results/coverage_braces/ref_empty_node.pl | 34 +--
.../coverage_braces/ref_in_style_command.pl | 2 +-
.../coverage_braces/space_command_in_image.pl | 16 +-
tp/t/results/coverage_braces/space_in_anchor.pl | 2 +-
tp/t/results/coverage_braces/space_in_image.pl | 12 +-
tp/t/results/coverage_braces/test_image.pl | 110 ++++----
tp/t/results/coverage_braces/too_much_args.pl | 4 +-
tp/t/results/coverage_braces/uref_in_ref.pl | 26 +-
tp/t/results/coverage_braces/uref_url.pl | 44 ++--
.../uref_with_commands_characters.pl | 4 +-
tp/t/results/coverage_braces/verb_in_xref.pl | 6 +-
tp/t/results/def/ref_in_def.pl | 22 +-
.../docbook_tests/between_node_and_section.pl | 2 +-
tp/t/results/float/anchor_in_caption.pl | 2 +-
tp/t/results/float/complex_float.pl | 26 +-
tp/t/results/float/float_copying.pl | 6 +-
.../float/numbering_captions_listoffloats.pl | 32 +--
tp/t/results/float/ref_to_float.pl | 4 +-
.../accented_character_in_file_name.pl | 28 +--
.../formats_encodings/at_commands_in_refs.pl | 238 +++++++++---------
.../at_commands_in_refs_latin1.pl | 238 +++++++++---------
.../formats_encodings/at_commands_in_refs_utf8.pl | 238 +++++++++---------
.../char_latin1_latin1_in_refs.pl | 10 +-
.../char_latin2_latin2_in_refs.pl | 2 +-
.../char_us_ascii_latin1_in_refs.pl | 10 +-
.../formats_encodings/char_utf8_latin1_in_refs.pl | 10 +-
.../multiple_include_encodings.pl | 2 +-
tp/t/results/html_tests/U_in_index.pl | 6 +-
.../html_tests/acronym_in_node_and_section.pl | 10 +-
tp/t/results/html_tests/anchor_on_vtable_item.pl | 6 +-
tp/t/results/html_tests/check_htmlxref.pl | 18 +-
.../html_tests/check_htmlxref_ignore_ref_top_up.pl | 18 +-
tp/t/results/html_tests/check_htmlxref_menu.pl | 18 +-
.../html_tests/check_htmlxref_no_use_nodes.pl | 18 +-
.../html_tests/command_in_node_redirection.pl | 2 +-
.../command_in_node_redirection_multiple.pl | 8 +-
.../command_in_node_redirection_other_command.pl | 2 +-
.../command_in_node_redirection_same_command.pl | 2 +-
.../command_in_node_redirection_two_commands.pl | 2 +-
tp/t/results/html_tests/commands_in_abbr.pl | 8 +-
tp/t/results/html_tests/commands_in_alt.pl | 16 +-
tp/t/results/html_tests/commands_in_email.pl | 2 +-
.../html_tests/css_in_node_redirection_page.pl | 2 +-
tp/t/results/html_tests/documentdescription.pl | 2 +-
tp/t/results/html_tests/end_of_line_in_uref.pl | 4 +-
.../file_name_case_insensitive_conflict_node.pl | 6 +-
...se_insensitive_conflict_node_no_redirections.pl | 6 +-
..._name_case_insensitive_conflict_redirections.pl | 8 +-
.../html_tests/file_name_conflict_with_Top.pl | 2 +-
.../html_tests/file_name_conflict_with_section.pl | 2 +-
.../file_name_conflict_with_user_defined.pl | 2 +-
.../html_tests/filenameconflictwithnonsplit.pl | 2 +-
.../filenameconflictwithspecialelement.pl | 2 +-
tp/t/results/html_tests/float_copying.pl | 14 +-
.../html_tests/headings_after_lone_nodes.pl | 2 +-
tp/t/results/html_tests/image_link_prefix.pl | 2 +-
tp/t/results/html_tests/ref_in_preformatted.pl | 2 +-
.../html_tests/test_xrefautomaticsectiontitle.pl | 4 +-
.../test_xrefautomaticsectiontitle_off_first.pl | 4 +-
.../html_tests/transliterated_names_conflicts.pl | 2 +-
tp/t/results/html_tests/uref_accented_letter.pl | 2 +-
.../html_tests/uref_accented_letter_ascii.pl | 2 +-
.../html_tests/uref_accented_letter_latin1.pl | 2 +-
tp/t/results/htmlxref/htmlxref.pl | 44 ++--
tp/t/results/htmlxref/htmlxref_nodes.pl | 44 ++--
tp/t/results/htmlxref/htmlxref_only_mono.pl | 44 ++--
tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl | 44 ++--
tp/t/results/htmlxref/htmlxref_only_split.pl | 44 ++--
tp/t/results/htmlxref/htmlxref_only_split_nodes.pl | 44 ++--
tp/t/results/include/cpp_lines.pl | 34 +--
.../macro_and_commands_in_early_commands.pl | 6 +-
.../results/include/macro_definition_in_include.pl | 2 +-
tp/t/results/include/macro_in_early_commands.pl | 10 +-
tp/t/results/indices/double_seeentry_seealso.pl | 16 +-
tp/t/results/indices/explicit_sort_key.pl | 18 +-
.../indices/ignored_sort_char_empty_entries.pl | 2 +-
tp/t/results/indices/index_special_region.pl | 16 +-
.../index_special_region_no_insertcopying.pl | 16 +-
...egion_no_insertcopying_no_titlepage_no_nodes.pl | 16 +-
...l_region_no_insertcopying_titlepage_no_nodes.pl | 16 +-
...copying_titlepage_no_nodes_footnotes_default.pl | 16 +-
.../index_special_region_no_titlepage_no_nodes.pl | 16 +-
.../index_special_region_titlepage_no_nodes.pl | 16 +-
..._region_titlepage_no_nodes_footnotes_default.pl | 16 +-
.../multiple_index_text_sortas_seeentry_seealso.pl | 10 +-
tp/t/results/indices/same_only_seealso_seeentry.pl | 12 +-
tp/t/results/indices/same_seealso_seeentry.pl | 12 +-
tp/t/results/indices/seealso_duplicate.pl | 4 +-
tp/t/results/indices/seeentry.pl | 8 +-
tp/t/results/indices/sorted_subentries.pl | 6 +-
tp/t/results/indices/subentry_and_sortas.pl | 8 +-
tp/t/results/indices/subentry_and_sortas_spaces.pl | 8 +-
tp/t/results/info_tests/anchor_and_spaces.pl | 6 +-
tp/t/results/info_tests/anchor_in_command.pl | 2 +-
tp/t/results/info_tests/before_node_and_section.pl | 6 +-
tp/t/results/info_tests/center_flush.pl | 6 +-
tp/t/results/info_tests/def_in_copying.pl | 4 +-
tp/t/results/info_tests/empty_arguments.pl | 8 +-
.../end_of_line_command_in_node_lines.pl | 10 +-
tp/t/results/info_tests/file_only_png.pl | Bin 3528 -> 3540 bytes
tp/t/results/info_tests/image_and_punctuation.pl | Bin 7131 -> 7167 bytes
.../info_tests/image_and_spaces_formatting.pl | 50 ++--
tp/t/results/info_tests/image_extension.pl | Bin 4585 -> 4675 bytes
tp/t/results/info_tests/image_in_paragraph.pl | Bin 3027 -> 3051 bytes
tp/t/results/info_tests/image_not_found.pl | 2 +-
tp/t/results/info_tests/image_quotes.pl | Bin 2618 -> 2642 bytes
tp/t/results/info_tests/image_text_encoded.pl | 2 +-
.../info_tests/image_text_file_only_and_alt.pl | Bin 2742 -> 2766 bytes
.../info_tests/invalid_node_name_no_warning.pl | 10 +-
.../info_tests/invalid_node_name_warning.pl | 10 +-
.../info_tests/multiline_image_and_align.pl | 96 +++----
.../multitable_anchor_and_index_entry.pl | 8 +-
.../info_tests/nested_multitable_anchor_index.pl | 8 +-
tp/t/results/info_tests/novalidate_empty_refs.pl | 4 +-
.../info_tests/one_node_counted_elements.pl | 4 +-
tp/t/results/info_tests/pxref_test.pl | 12 +-
tp/t/results/info_tests/quote_node_names_info.pl | 100 ++++----
tp/t/results/info_tests/ref_tests.pl | 22 +-
tp/t/results/info_tests/test_index.pl | 4 +-
tp/t/results/info_tests/top_node_normalization.pl | 4 +-
tp/t/results/info_tests/xref_test.pl | 12 +-
.../init_files_tests/documentation_examples.pl | 14 +-
.../documentation_examples_texi2html.pl | 14 +-
tp/t/results/invalid_nestings/accents.pl | 2 +-
tp/t/results/invalid_nestings/center.pl | 2 +-
tp/t/results/invalid_nestings/footnote_in_ref.pl | 4 +-
tp/t/results/invalid_nestings/ignore_in_xref.pl | 4 +-
tp/t/results/invalid_nestings/in_errormsg.pl | 10 +-
tp/t/results/invalid_nestings/in_table.pl | 8 +-
tp/t/results/invalid_nestings/item_in_ref.pl | 6 +-
.../invalid_nestings/on_block_command_line.pl | 4 +-
tp/t/results/invalid_nestings/on_def_line.pl | 4 +-
.../invalid_nestings/on_index_entry_line.pl | 2 +-
tp/t/results/invalid_nestings/on_itemize_line.pl | 2 +-
tp/t/results/invalid_nestings/on_node_line.pl | 12 +-
tp/t/results/invalid_nestings/on_section_line.pl | 2 +-
.../results/invalid_nestings/on_subheading_line.pl | 2 +-
tp/t/results/invalid_nestings/quotation_in_ref.pl | 4 +-
tp/t/results/invalid_nestings/ref_in_ref.pl | 4 +-
.../invalid_nestings/ref_to_top_in_anchor.pl | 4 +-
tp/t/results/invalid_nestings/verbatim_in_ref.pl | 4 +-
tp/t/results/languages/documentlanguage.pl | 2 +-
tp/t/results/languages/documentlanguage_option.pl | 2 +-
tp/t/results/languages/documentlanguage_unknown.pl | 2 +-
tp/t/results/languages/multiple_lang_chapters.pl | 6 +-
.../languages/multiple_lang_chapters_latex.pl | 6 +-
.../languages/multiple_lang_chapters_texi2html.pl | 6 +-
tp/t/results/languages/unknown_language.pl | 4 +-
tp/t/results/latex_tests/anchor_before_top.pl | 4 +-
tp/t/results/latex_tests/anchor_in_copying.pl | 4 +-
.../anchor_in_copying_insertcopying_chap.pl | 6 +-
.../anchor_in_copying_insertcopying_titlepage.pl | 8 +-
...chor_in_copying_insertcopying_titlepage_chap.pl | 6 +-
.../anchor_links_xref_xrefautomaticsectiontitle.pl | 24 +-
tp/t/results/latex_tests/float_and_refs.pl | 90 +++----
tp/t/results/latex_tests/indices.pl | 6 +-
.../latex_tests/indices_disable_encoding.pl | 6 +-
tp/t/results/latex_tests/node_before_top.pl | 2 +-
.../latex_tests/top_no_sectioning_command.pl | 2 +-
.../linemacro/block_begin_end_in_linemacro_call.pl | 4 +-
.../linemacro/call_macro_in_linemacro_body.pl | 4 +-
.../linemacro/call_macro_in_linemacro_call.pl | 4 +-
.../comment_on_linemacro_call_macro_expansion.pl | 2 +-
tp/t/results/linemacro/paragraph_no_paragraph.pl | 2 +-
tp/t/results/macro/arg_body_expansion_order.pl | 4 +-
tp/t/results/macro/arg_not_closed.pl | 2 +-
tp/t/results/macro/arobase_brace_in_macro_call.pl | 4 +-
tp/t/results/macro/backslash_in_arg.pl | 4 +-
tp/t/results/macro/bib_example.pl | 24 +-
...losing_brace_in_macro_call_in_ignored_inline.pl | 8 +-
tp/t/results/macro/complete_macro_for_end.pl | 2 +-
tp/t/results/macro/complex_argument.pl | 10 +-
tp/t/results/macro/cpp_directives_after_macros.pl | 4 +-
tp/t/results/macro/cpp_directives_in_macro.pl | 2 +-
.../macro/cpp_directives_line_value_macro.pl | 6 +-
.../macro/definfoenclose_replaced_by_macro.pl | 2 +-
tp/t/results/macro/double_recursive_macro_call.pl | 4 +-
tp/t/results/macro/empty_macro_argument.pl | 16 +-
tp/t/results/macro/empty_macro_no_arg.pl | 2 +-
tp/t/results/macro/expand_two_same.pl | 4 +-
tp/t/results/macro/expansion_order.pl | 4 +-
tp/t/results/macro/form_feeds.pl | 4 +-
tp/t/results/macro/glossary.pl | 28 +--
tp/t/results/macro/ifclear_in_macro.pl | 2 +-
tp/t/results/macro/ifset_in_macro.pl | 2 +-
tp/t/results/macro/ifset_in_macro_set.pl | 2 +-
tp/t/results/macro/ignored_macro_definition.pl | 4 +-
tp/t/results/macro/implicit_quoting_one_arg.pl | 2 +-
tp/t/results/macro/implicit_quoting_recursion.pl | 24 +-
tp/t/results/macro/leading_spaces_no_ignore.pl | 2 +-
.../macro/line_end_accent_command_macro_call.pl | 4 +-
tp/t/results/macro/macro_after_paragraph.pl | 2 +-
.../macro/macro_alias_definfoenclose_defindex.pl | 4 +-
.../macro_before_specific_line_command_args.pl | 2 +-
tp/t/results/macro/macro_call_empty_middle_arg.pl | 18 +-
tp/t/results/macro/macro_call_empty_two_arg.pl | 40 +--
.../macro/macro_call_in_ignored_inlinefmtifelse.pl | 2 +-
.../macro/macro_call_in_inlinefmtifelse_format.pl | 6 +-
tp/t/results/macro/macro_call_in_node_manual.pl | 20 +-
.../macro/macro_end_call_in_ignored_inlinefmt.pl | 4 +-
.../macro_end_call_in_ignored_inlinefmtifelse.pl | 6 +-
...cro_end_call_in_ignored_inlinefmtifelse_else.pl | 6 +-
.../macro/macro_end_call_in_ignored_inlineraw.pl | 4 +-
.../results/macro/macro_end_call_in_ignored_raw.pl | 2 +-
tp/t/results/macro/macro_expands_to_empty.pl | 4 +-
tp/t/results/macro/macro_expansion.pl | 18 +-
.../macro_expansion_end_in_conditional_end.pl | 2 +-
.../macro_expansion_end_in_conditional_line.pl | 2 +-
...macro_expansion_end_in_ignored_ifset_content.pl | 2 +-
..._expansion_end_in_ignored_nested_conditional.pl | 2 +-
..._end_in_ignored_nested_different_conditional.pl | 2 +-
.../macro_expansion_in_multitable_prototype.pl | 10 +-
.../macro/macro_for_dot_in_menu_not_separator.pl | 4 +-
tp/t/results/macro/macro_for_end.pl | 2 +-
.../macro/macro_for_ignored_line_command.pl | 2 +-
tp/t/results/macro/macro_for_verb.pl | 2 +-
tp/t/results/macro/macro_in_accent.pl | 12 +-
tp/t/results/macro/macro_in_brace_command.pl | 6 +-
tp/t/results/macro/macro_in_def_delimiters.pl | 8 +-
tp/t/results/macro/macro_in_empty_menu_comment.pl | 2 +-
.../macro_in_empty_multitable_empty_before_item.pl | 2 +-
.../macro_in_empty_table_empty_before_item.pl | 2 +-
tp/t/results/macro/macro_in_empty_text.pl | 2 +-
tp/t/results/macro/macro_in_end_argument.pl | 2 +-
tp/t/results/macro/macro_in_index_commands.pl | 22 +-
.../macro/macro_in_invalid_documentencoding.pl | 2 +-
tp/t/results/macro/macro_in_macro_arg.pl | 4 +-
tp/t/results/macro/macro_in_macro_arg_simpler.pl | 4 +-
tp/t/results/macro/macro_in_menu.pl | 20 +-
.../macro_in_menu_comment_closed_by_detailmenu.pl | 2 +-
.../macro/macro_in_menu_comment_like_entry.pl | 8 +-
tp/t/results/macro/macro_in_menu_description.pl | 2 +-
tp/t/results/macro/macro_in_misc_commands.pl | 102 ++++----
.../macro/macro_in_multitable_empty_before_item.pl | 2 +-
.../macro/macro_in_table_empty_before_item.pl | 2 +-
.../macro_inlineifcond_end_in_empty_ignored.pl | 8 +-
.../macro/macro_inlineifcond_end_in_empty_set.pl | 12 +-
tp/t/results/macro/macro_name_with_digit.pl | 2 +-
tp/t/results/macro/macro_name_with_hyphen.pl | 4 +-
tp/t/results/macro/macro_no_arg_expansion.pl | 2 +-
.../macro_with_error_at_end_line_after_macro.pl | 2 +-
tp/t/results/macro/macro_zero.pl | 2 +-
tp/t/results/macro/nested_macro_call.pl | 4 +-
tp/t/results/macro/no_macrobody.pl | 2 +-
tp/t/results/macro/paragraph_and_macro.pl | 12 +-
tp/t/results/macro/protect_in_body.pl | 4 +-
tp/t/results/macro/protect_in_body_one_arg.pl | 2 +-
tp/t/results/macro/recursive_call_in_argument.pl | 2 +-
tp/t/results/macro/recursive_call_in_macro.pl | 2 +-
tp/t/results/macro/recursive_call_in_rmacro.pl | 200 +++++++--------
tp/t/results/macro/redefine_texinfo_macro.pl | 2 +-
tp/t/results/macro/simple_imbricated_macro.pl | 4 +-
.../macro/simple_imbricated_macro_rmacro.pl | 4 +-
tp/t/results/macro/space_macro_after_end.pl | 2 +-
.../macro/space_macro_after_end_verbatim.pl | 2 +-
tp/t/results/macro/too_much_args.pl | 4 +-
tp/t/results/macro/two_macros_on_a_line.pl | 12 +-
.../macro/unpaired_backslash_in_macro_body.pl | 2 +-
.../macro/verb_with_arobase_in_macro_call.pl | 4 +-
.../results/macro/verb_with_brace_in_macro_call.pl | 4 +-
.../menu/commands_in_nodedescriptionblock.pl | 14 +-
tp/t/results/menu/formats_in_menu.pl | 2 +-
tp/t/results/menu/inlineraw_in_menu_description.pl | 4 +-
tp/t/results/menu/menu_pointing_to_anchor.pl | 2 +-
.../codequoteundirected_codequotebacktick.pl | 24 +-
tp/t/results/misc_commands/kbdinputstyle.pl | 6 +-
.../misc_commands/kbdinputstyle_in_table.pl | 6 +-
tp/t/results/misc_commands/ref_in_center.pl | 8 +-
tp/t/results/misc_commands/test_allowcodebreaks.pl | 22 +-
tp/t/results/moresectioning/anchor_in_footnote.pl | 4 +-
.../moresectioning/anchor_in_footnote_separate.pl | 4 +-
.../anchor_in_footnote_separate_split_node.pl | 4 +-
.../anchor_in_footnote_split_node.pl | 4 +-
.../moresectioning/character_and_spaces_in_refs.pl | 42 ++--
.../character_and_spaces_in_refs_out.pl | 42 ++--
.../equivalent_nodes_defined_linked.pl | 4 +-
tp/t/results/moresectioning/no_element.pl | 12 +-
.../moresectioning/nodes_before_after_top_xref.pl | 8 +-
.../non_automatic_internal_top_node_up.pl | 18 +-
.../non_automatic_top_node_up_and_url.pl | 18 +-
.../moresectioning/placed_things_before_element.pl | 16 +-
.../placed_things_before_element_no_use_node.pl | 16 +-
.../moresectioning/placed_things_before_node.pl | 16 +-
.../moresectioning/special_spaces_in_nodes.pl | 2 +-
tp/t/results/multitable/ref_in_multitable.pl | 10 +-
tp/t/results/paragraph/image_in_paragraph.pl | 10 +-
tp/t/results/paragraph/no_paragraph_commands.pl | 10 +-
tp/t/results/paragraph/paragraph_command.pl | 4 +-
tp/t/results/paragraph/sole_image.pl | 2 +-
.../plaintext_tests/U_with_utf8_enable_encoding.pl | 2 +-
.../plaintext_tests/anchor_and_empty_lines.pl | 2 +-
.../at_commands_glued_in_example.pl | 14 +-
.../at_commands_glued_in_paragraph.pl | 14 +-
.../plaintext_tests/del_quote_linebreaking.pl | 60 ++---
.../plaintext_tests/lone_braces_in_inlineraw.pl | 4 +-
.../plaintext_tests/long_uref_after_item.pl | 2 +-
.../plaintext_tests/multiline_image_and_align.pl | 16 +-
.../plaintext_tests/no_empty_line_after_section.pl | 2 +-
.../plaintext_tests/punctuation_abbr_acronym.pl | 24 +-
.../plaintext_tests/punctuation_at_end_command.pl | 4 +-
.../plaintext_tests/punctuation_in_command.pl | 4 +-
.../punctuation_in_command_end_line.pl | 4 +-
tp/t/results/plaintext_tests/quote_node_names.pl | 100 ++++----
.../plaintext_tests/star_at_command_formatting.pl | 6 +-
.../plaintext_tests/xref_quote_long_item.pl | 8 +-
.../example_invalid_at_commands_arguments.pl | 10 +-
tp/t/results/raw/inline_in_example.pl | 14 +-
tp/t/results/raw/inline_missing_first_arg.pl | 4 +-
tp/t/results/raw/inlinefmt.pl | 10 +-
tp/t/results/raw/inlinefmt_with_empty_line.pl | 10 +-
tp/t/results/raw/inlineraw.pl | 10 +-
tp/t/results/raw/inlineraw_with_empty_line.pl | 10 +-
tp/t/results/regions/anchor_in_copying.pl | 4 +-
.../regions/anchor_in_copying_in_footnote.pl | 4 +-
tp/t/results/regions/anchor_in_titlepage.pl | 4 +-
.../regions/anchor_in_titlepage_titlepage.pl | 4 +-
tp/t/results/regions/ref_in_copying.pl | 2 +-
.../regions/ref_in_copying_insert_in_chapter.pl | 2 +-
tp/t/results/sectioning/anchor_zero.pl | 4 +-
.../results/sectioning/double_node_anchor_float.pl | 4 +-
...double_recursive_self_section_node_reference.pl | 4 +-
.../double_recursive_self_section_reference.pl | 4 +-
tp/t/results/sectioning/double_top.pl | 2 +-
tp/t/results/sectioning/email_in_node.pl | 10 +-
tp/t/results/sectioning/empty_anchor.pl | 4 +-
tp/t/results/sectioning/empty_ref_arg.pl | 22 +-
tp/t/results/sectioning/empty_refs.pl | 4 +-
tp/t/results/sectioning/equivalent_labels.pl | 2 +-
tp/t/results/sectioning/equivalent_nodes.pl | 2 +-
.../sectioning/equivalent_nodes_novalidate.pl | 2 +-
tp/t/results/sectioning/node_referenced_in_ref.pl | 2 +-
tp/t/results/sectioning/nodename_parentheses.pl | 6 +-
tp/t/results/sectioning/novalidate.pl | 2 +-
.../one_node_explicit_directions_anchor.pl | 4 +-
..._node_explicit_directions_anchor_no_use_node.pl | 4 +-
.../sectioning/protected_node_parentheses.pl | 4 +-
.../sectioning/recursive_self_section_reference.pl | 2 +-
tp/t/results/sectioning/ref_to_top.pl | 2 +-
tp/t/results/sectioning/ref_to_unknown_node.pl | 2 +-
.../reference_to_only_special_spaces_node.pl | 8 +-
.../transformations/protect_colon_source_mark.pl | 2 +-
.../transformations/protect_comma_source_mark.pl | 2 +-
...st_parenthesis_after_parenthesis_source_mark.pl | 4 +-
.../protect_first_parenthesis_source_mark.pl | 4 +-
...otect_hashchar_at_line_beginning_source_mark.pl | 6 +-
...ct_node_after_label_source_mark_in_protected.pl | 2 +-
.../closing_brace_in_value_in_ignored_inline.pl | 6 +-
tp/t/results/value/ignored_value_definition.pl | 2 +-
tp/t/results/value/value_in_node.pl | 2 +-
.../value_and_macro/comma_value_in_macro_arg.pl | 2 +-
.../results/value_and_macro/value_in_macro_body.pl | 2 +-
.../brace_commands_spaces_end_of_lines.pl | 20 +-
tp/t/results/xml_tests/commands_and_spaces.pl | 20 +-
tp/t/results/xml_tests/image_inline_or_not.pl | 48 ++--
tp/t/results/xml_tests/inline_commands.pl | 20 +-
.../xml_tests/inlineifset_empty_second_arg.pl | 4 +-
tp/t/results/xtable/table_nested.pl | 6 +-
442 files changed, 3129 insertions(+), 3063 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 507fbb55f4..9662c4671a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,32 @@
Update test result
+2024-06-01 Patrice Dumas <pertusus@free.fr>
+
+ Type brace_command_container for brace_command_arg without spaces
+
+ * tp/Texinfo/Convert/Converter.pm (table_item_content_tree),
+ tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
+ tp/Texinfo/Convert/Plaintext.pm (_convert),
+ tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi),
+ tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+ tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm (_convert),
+ tp/Texinfo/ParserNonXS.pm (_print_command_args_texi)
+ (_expand_macro_arguments, _isolate_last_space, _handle_open_brace),
+ tp/Texinfo/XS/convert/converter.c (table_item_content_tree),
+ tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi),
+ tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
+ tp/Texinfo/XS/main/element_types.txt,
+ tp/Texinfo/XS/main/node_name_normalization.c
+ (convert_to_normalized_internal), tp/Texinfo/XS/parsetexi/end_line.c
+ (end_line_starting_block), tp/Texinfo/XS/parsetexi/macro.c
+ (expand_macro_arguments), tp/Texinfo/XS/parsetexi/parser.c
+ (isolate_last_space), tp/Texinfo/XS/parsetexi/separator.c
+ (handle_open_brace): use a different container for brace commands args
+ if the brace command is of the arguments type and the spaces are in
+ the info dataof the brace commands args, called
+ brace_command_container.
+
2024-06-01 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/parsetexi/def.c (parse_def),
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 9333e18aa3..bbfbedff73 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1504,6 +1504,11 @@ sub table_item_content_tree($$)
'parent' => $arg};
$arg->{'contents'} = [$paragraph];
}
+ } elsif ($Texinfo::Commands::brace_commands{$command_as_argument_cmdname}
+ eq 'arguments') {
+ $arg = {'type' => 'brace_command_container',
+ 'contents' => [$element->{'args'}->[0]],
+ 'parent' => $command,};
} else {
$arg = {'type' => 'brace_command_arg',
'contents' => [$element->{'args'}->[0]],
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index 8b37fe781a..d69a3320ea 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -313,7 +313,8 @@ sub _convert($)
# more than one arg the first one is used.
} elsif ($element->{'args'} and $element->{'args'}->[0]
and (($element->{'args'}->[0]->{'type'}
- and $element->{'args'}->[0]->{'type'} eq 'brace_command_arg')
+ and ($element->{'args'}->[0]->{'type'} eq 'brace_command_arg'
+ or $element->{'args'}->[0]->{'type'} eq
'brace_command_container'))
or $cmdname eq 'math')) {
return _convert($element->{'args'}->[0]);
}
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index c2cb1f8432..650b667b83 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -2872,7 +2872,7 @@ sub _convert($$)
[{'text' => ' ('},
{'cmdname' => 'pxref',
'args' => [
- {'type' => 'brace_command_arg',
+ {'type' => 'brace_command_container',
'contents' => [
$self->{'current_node'}->{'args'}->[0],
{'text' => "-Footnote-$self->{'footnote_index'}"}
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index ffd2a27a08..3dccb62e21 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -262,6 +262,7 @@ sub _expand_cmd_args_to_texi($) {
$braces = 1 if (scalar(@{$cmd->{'args'}})
and ($cmd->{'args'}->[0]->{'type'}
and ($cmd->{'args'}->[0]->{'type'} eq
'brace_command_arg'
+ or $cmd->{'args'}->[0]->{'type'} eq
'brace_command_container'
or $cmd->{'args'}->[0]->{'type'} eq
'brace_command_context')));
$result .= '{' if ($braces);
if ($cmdname eq 'verb') {
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 2b667d40cb..eaaf13ddd7 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -653,7 +653,9 @@ sub _convert($$;$)
push @$attributes, ['spacesaftercmd',
$element->{'info'}->{'spaces_after_cmd_before_arg'}->{'text'}];
}
- if ($element->{'args'}->[0]->{'type'} ne 'brace_command_arg') {
+ if ($element->{'args'}->[0]->{'type'} ne 'brace_command_arg'
+ and $element->{'args'}->[0]->{'type'}
+ ne 'brace_command_container') {
push @$attributes, ['bracketed', 'off'];
}
}
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 79e7933202..6b0da1b809 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -585,7 +585,8 @@ sub _convert($$)
return $result;
} elsif ($element->{'args'} and $element->{'args'}->[0]
and (($element->{'args'}->[0]->{'type'}
- and $element->{'args'}->[0]->{'type'} eq 'brace_command_arg')
+ and ($element->{'args'}->[0]->{'type'} eq 'brace_command_arg')
+ or $element->{'args'}->[0]->{'type'} eq
'brace_command_container')
or ($Texinfo::Commands::math_commands{$element->{'cmdname'}}
and defined($Texinfo::Commands::brace_commands{
$element->{'cmdname'}})))) {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index a1e9f13085..2358e4fa31 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1155,6 +1155,7 @@ sub _print_command_args_texi($)
if ($current->{'args'} and @{$current->{'args'}}) {
$with_brace
= ($current->{'args'}->[0]->{'type'} eq 'brace_command_arg'
+ or $current->{'args'}->[0]->{'type'} eq 'brace_command_container'
or $current->{'args'}->[0]->{'type'} eq 'brace_command_context');
$args .= '{' if ($with_brace);
foreach my $arg (@{$current->{'args'}}) {
@@ -2642,7 +2643,7 @@ sub _expand_macro_arguments($$$$$)
my $braces_level = 1;
- my $argument = {'type' => 'brace_command_arg',
+ my $argument = {'type' => 'brace_command_container',
'contents' => [],
'parent' => $current};
push @{$current->{'args'}}, $argument;
@@ -2687,7 +2688,7 @@ sub _expand_macro_arguments($$$$$)
if (scalar(@{$current->{'args'}}) < $args_total) {
_remove_empty_content($self, $argument);
- $argument = {'type' => 'brace_command_arg',
+ $argument = {'type' => 'brace_command_container',
'contents' => [],
'parent' => $current};
push @{$current->{'args'}}, $argument;
@@ -3079,11 +3080,13 @@ sub _isolate_last_space
return if (!$current->{'contents'});
# $current->{'type'} is always set, to line_arg, block_line_arg,
- # brace_command_arg, bracketed_arg or menu_entry_node
+ # brace_command_arg, brace_command_container, bracketed_arg or
menu_entry_node
# Store a final comment command in the 'info' hash, except for brace
# commands
- if (not ($current->{'type'} and $current->{'type'} eq 'brace_command_arg')
+ if (not ($current->{'type'}
+ and ($current->{'type'} eq 'brace_command_arg'
+ or $current->{'type'} eq 'brace_command_container'))
and scalar(@{$current->{'contents'}}) >= 1
and $current->{'contents'}->[-1]->{'cmdname'}
and ($current->{'contents'}->[-1]->{'cmdname'} eq 'c'
@@ -4261,8 +4264,10 @@ sub _end_line_starting_block($$$)
and (!$command_as_argument->{'args'}
or !scalar(@{$command_as_argument->{'args'}})
or !$command_as_argument->{'args'}->[0]->{'type'}
- or $command_as_argument->{'args'}->[0]->{'type'}
- ne 'brace_command_arg')) {
+ or ($command_as_argument->{'args'}->[0]->{'type'}
+ ne 'brace_command_arg'
+ and $command_as_argument->{'args'}->[0]->{'type'}
+ ne 'brace_command_container'))) {
my $cmdname = $command_as_argument->{'cmdname'};
if (defined($brace_commands{$cmdname})
and $brace_commands{$cmdname} ne 'noarg') {
@@ -6213,11 +6218,11 @@ sub _handle_open_brace($$$$)
};
$self->{'internal_space_holder'} = $current->{'parent'};
} else {
- $current->{'type'} = 'brace_command_arg';
# Commands that disregard leading whitespace.
if ($brace_commands{$command}
and ($brace_commands{$command} eq 'arguments'
or $brace_commands{$command} eq 'inline')) {
+ $current->{'type'} = 'brace_command_container';
# internal_spaces_before_argument is a transient internal type,
# which should end up in info spaces_before_argument.
push @{$current->{'contents'}}, {
@@ -6226,6 +6231,8 @@ sub _handle_open_brace($$$$)
'parent' => $current,
};
$self->{'internal_space_holder'} = $current;
+ } else {
+ $current->{'type'} = 'brace_command_arg';
}
$self->_push_context('ct_inlineraw', $command)
if ($command eq 'inlineraw');
@@ -6582,6 +6589,7 @@ sub _handle_comma($$$$)
# line of block command (float or example) or line (node).
my $type = $current->{'type'};
#die ("type: $type\n") if ($type ne 'brace_command_arg'
+ # and $type ne 'brace_command_container'
# and $type ne 'block_line_arg'
# and $type ne 'line_arg');
$current = $current->{'parent'};
diff --git a/tp/Texinfo/XS/convert/converter.c
b/tp/Texinfo/XS/convert/converter.c
index 21a24e0f25..2485b65280 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -578,6 +578,11 @@ table_item_content_tree (CONVERTER *self, const ELEMENT
*element)
add_to_element_contents (arg, paragraph);
}
}
+ else if (builtin_command_data[data_cmd].data == BRACE_arguments)
+ {
+ arg = new_element_added (tree, ET_brace_command_container);
+ add_to_contents_as_array (arg, element->c->args.list[0]);
+ }
else
{
arg = new_element_added (tree, ET_brace_command_arg);
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index d2d43a8c07..ada39ae5a6 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -75,6 +75,7 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
int with_commas = 0;
braces = (e->c->args.list[0]->type == ET_brace_command_arg
+ || e->c->args.list[0]->type == ET_brace_command_container
|| e->c->args.list[0]->type == ET_brace_command_context);
if (braces)
ADD("{");
diff --git a/tp/Texinfo/XS/main/convert_to_text.c
b/tp/Texinfo/XS/main/convert_to_text.c
index 87ef0d7f8b..1a79d4b7c3 100644
--- a/tp/Texinfo/XS/main/convert_to_text.c
+++ b/tp/Texinfo/XS/main/convert_to_text.c
@@ -773,6 +773,7 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
}
else if (element->c->args.number > 0
&& (element->c->args.list[0]->type == ET_brace_command_arg
+ || element->c->args.list[0]->type ==
ET_brace_command_container
|| (builtin_command_data[data_cmd].flags & CF_brace
&& builtin_command_data[data_cmd].flags & CF_math)))
{
diff --git a/tp/Texinfo/XS/main/element_types.c
b/tp/Texinfo/XS/main/element_types.c
index b199880073..606047170a 100644
--- a/tp/Texinfo/XS/main/element_types.c
+++ b/tp/Texinfo/XS/main/element_types.c
@@ -32,6 +32,7 @@ TYPE_DATA type_data[] = {
"rawpreformatted", 0,
"brace_command_arg", 0,
"brace_command_context", 0,
+"brace_command_container", 0,
"block_line_arg", 0,
"line_arg", 0,
"following_arg", 0,
diff --git a/tp/Texinfo/XS/main/element_types.h
b/tp/Texinfo/XS/main/element_types.h
index 2f303f2402..7ea20832c4 100644
--- a/tp/Texinfo/XS/main/element_types.h
+++ b/tp/Texinfo/XS/main/element_types.h
@@ -31,6 +31,7 @@ ET_preformatted,
ET_rawpreformatted,
ET_brace_command_arg,
ET_brace_command_context,
+ET_brace_command_container,
ET_block_line_arg,
ET_line_arg,
ET_following_arg,
diff --git a/tp/Texinfo/XS/main/element_types.txt
b/tp/Texinfo/XS/main/element_types.txt
index 22abd2cba3..a0c3630583 100644
--- a/tp/Texinfo/XS/main/element_types.txt
+++ b/tp/Texinfo/XS/main/element_types.txt
@@ -52,6 +52,8 @@ rawpreformatted
# @-commands arguments containers
brace_command_arg
brace_command_context
+# with separate leading spaces in info, and trailing (if not in inline)
+brace_command_container
block_line_arg
line_arg
following_arg
diff --git a/tp/Texinfo/XS/main/node_name_normalization.c
b/tp/Texinfo/XS/main/node_name_normalization.c
index 862357cfd2..d19638443f 100644
--- a/tp/Texinfo/XS/main/node_name_normalization.c
+++ b/tp/Texinfo/XS/main/node_name_normalization.c
@@ -149,6 +149,7 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT
*result)
}
else if (e->c->args.number > 0
&& (e->c->args.list[0]->type == ET_brace_command_arg
+ || e->c->args.list[0]->type == ET_brace_command_container
|| e->cmd == CM_math))
{
convert_to_normalized_internal (e->c->args.list[0], result);
diff --git a/tp/Texinfo/XS/parsetexi/counter.c
b/tp/Texinfo/XS/parsetexi/counter.c
index 8e098b814c..7420bee323 100644
--- a/tp/Texinfo/XS/parsetexi/counter.c
+++ b/tp/Texinfo/XS/parsetexi/counter.c
@@ -106,7 +106,7 @@ counter_value (COUNTER *c, ELEMENT *elt)
return -1;
}
-/* If NOT_EMPTY_LESSAGE is set, check that the counter values list
+/* If NOT_EMPTY_MESSAGE is set, check that the counter values list
is empty, if not, show a debugging message */
void
counter_reset (COUNTER *c, const char* not_empty_message)
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index c8d5ffe5ad..8765310023 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1008,8 +1008,12 @@ end_line_starting_block (ELEMENT *current)
a brace command and not a mark (noarg) command, warn */
if (k_command_as_arg
&& (k_command_as_arg->k.element->c->args.number <= 0
- || k_command_as_arg->k.element->c->args.list[0]->type
- != ET_brace_command_arg))
+ /* FIXME this condition looks strange, verify what could
be
+ there if not brace_command_arg/brace_command_container
*/
+ || (k_command_as_arg->k.element->c->args.list[0]->type
+ != ET_brace_command_arg)
+ && k_command_as_arg->k.element->c->args.list[0]->type
+ != ET_brace_command_container))
{
enum command_id as_argument_cmd =
k_command_as_arg->k.element->cmd;
if ((command_data(as_argument_cmd).flags & CF_brace)
diff --git a/tp/Texinfo/XS/parsetexi/macro.c b/tp/Texinfo/XS/parsetexi/macro.c
index 2cf5abe997..c8ac12ca2d 100644
--- a/tp/Texinfo/XS/parsetexi/macro.c
+++ b/tp/Texinfo/XS/parsetexi/macro.c
@@ -311,7 +311,7 @@ expand_macro_arguments (const ELEMENT *macro, const char
**line_inout,
int braces_level = 1;
int args_total;
int whitespaces_len;
- ELEMENT *argument = new_element (ET_brace_command_arg);
+ ELEMENT *argument = new_element (ET_brace_command_container);
ELEMENT *argument_content = new_text_element (ET_other_text);
add_to_element_args (current, argument);
@@ -401,7 +401,7 @@ expand_macro_arguments (const ELEMENT *macro, const char
**line_inout,
remove_empty_content (argument);
/* new argument */
- argument = new_element (ET_brace_command_arg);
+ argument = new_element (ET_brace_command_container);
argument_content = new_text_element (ET_other_text);
add_to_element_args (current, argument);
add_to_element_contents (argument, argument_content);
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index ea273b7ac0..e516814a33 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -961,6 +961,7 @@ isolate_last_space (ELEMENT *current)
/* Store a final comment command in the 'info' hash, except for brace
commands */
if (current->type != ET_brace_command_arg
+ && current->type != ET_brace_command_container
&& (last_contents_child (current)->cmd == CM_c
|| last_contents_child (current)->cmd == CM_comment))
{
diff --git a/tp/Texinfo/XS/parsetexi/separator.c
b/tp/Texinfo/XS/parsetexi/separator.c
index 47fb8ac535..d04daceafb 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -62,6 +62,9 @@ handle_open_brace (ELEMENT *current, const char **line_inout)
if (current->c->contents.number > 0)
gather_spaces_after_cmd_before_arg (current);
+ if (command_data(command).flags & CF_contain_basic_inline)
+ push_command (&nesting_context.basic_inline_stack, command);
+
counter_push (&count_remaining_args, current,
command_data(current->cmd).args_number);
counter_dec (&count_remaining_args);
@@ -69,8 +72,6 @@ handle_open_brace (ELEMENT *current, const char **line_inout)
arg = new_element (ET_NONE);
add_to_element_args (current, arg);
current = arg;
- if (command_data(command).flags & CF_contain_basic_inline)
- push_command (&nesting_context.basic_inline_stack, command);
if (command == CM_verb)
{
@@ -78,12 +79,11 @@ handle_open_brace (ELEMENT *current, const char
**line_inout)
/* the delimiter may be in macro expansion */
if (!*line)
line = new_line (current);
- /* Save the deliminating character in 'type'. */
+ /* Save the deliminating character in 'delimiter'. */
if (!*line || *line == '\n')
{
line_error ("@verb without associated character");
add_info_string_dup (current->parent, "delimiter", "");
- current->parent->type = 0;
}
else
{
@@ -178,12 +178,11 @@ handle_open_brace (ELEMENT *current, const char
**line_inout)
}
else /* not context brace */
{
- current->type = ET_brace_command_arg;
-
/* Commands that disregard leading whitespace. */
if (command_data(command).data == BRACE_arguments
|| command_data(command).data == BRACE_inline)
{
+ current->type = ET_brace_command_container;
ELEMENT *e;
e = new_text_element (ET_internal_spaces_before_argument);
add_to_element_contents (current, e);
@@ -192,6 +191,10 @@ handle_open_brace (ELEMENT *current, const char
**line_inout)
if (command == CM_inlineraw)
push_context (ct_inlineraw, command);
}
+ else
+ {
+ current->type = ET_brace_command_arg;
+ }
}
debug_nonl ("OPENED @%s, remaining: %d ",
command_name (current->parent->cmd),
diff --git a/tp/Texinfo/command_data.txt b/tp/Texinfo/command_data.txt
index 034d86557b..13493d6f31 100644
--- a/tp/Texinfo/command_data.txt
+++ b/tp/Texinfo/command_data.txt
@@ -417,6 +417,8 @@ r brace
BRACE_style_no_code
# context brace commands - commands that enclose full texts
# not in the main document context. They can contain multiple paragraphs.
+# They hold leading and trailing spaces. They contain a brace_command_context
+# type element.
footnote brace,global BRACE_context
caption brace,close_paragraph,no_paragraph,non_formatted_brace
BRACE_context
shortcaption
brace,close_paragraph,contain_basic_inline,no_paragraph,non_formatted_brace
BRACE_context
diff --git a/tp/t/results/alias/alias_macro_target_removed.pl
b/tp/t/results/alias/alias_macro_target_removed.pl
index 9fcb17f685..4036c97104 100644
--- a/tp/t/results/alias/alias_macro_target_removed.pl
+++ b/tp/t/results/alias/alias_macro_target_removed.pl
@@ -116,7 +116,7 @@ $result_trees{'alias_macro_target_removed'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/alias/alias_of_macro.pl
b/tp/t/results/alias/alias_of_macro.pl
index 6231681937..facc6abd57 100644
--- a/tp/t/results/alias/alias_of_macro.pl
+++ b/tp/t/results/alias/alias_of_macro.pl
@@ -116,7 +116,7 @@ $result_trees{'alias_of_macro'} = {
'text' => 'tt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/alias/alias_of_macro_before_macro.pl
b/tp/t/results/alias/alias_of_macro_before_macro.pl
index af4ab2fe78..d62094930e 100644
--- a/tp/t/results/alias/alias_of_macro_before_macro.pl
+++ b/tp/t/results/alias/alias_of_macro_before_macro.pl
@@ -116,7 +116,7 @@ $result_trees{'alias_of_macro_before_macro'} = {
'text' => 'tt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/alias/texinfo_command_alias.pl
b/tp/t/results/alias/texinfo_command_alias.pl
index b8d2160fe6..388c0c8d59 100644
--- a/tp/t/results/alias/texinfo_command_alias.pl
+++ b/tp/t/results/alias/texinfo_command_alias.pl
@@ -116,7 +116,7 @@ $result_trees{'texinfo_command_alias'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect.pl
b/tp/t/results/alias/texinfo_command_alias_indirect.pl
index b45ce0d8b3..fd5a9f68ea 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect.pl
@@ -154,7 +154,7 @@ $result_trees{'texinfo_command_alias_indirect'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
index 7c7d8c0bb9..9836112073 100644
--- a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
+++ b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
@@ -19,7 +19,7 @@ $result_trees{'inlinefmtifelse_nesting'} = {
'text' => 'info'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -54,7 +54,7 @@ $result_trees{'inlinefmtifelse_nesting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
diff --git a/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
index d62d1ae3a1..6faf0ece0d 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
@@ -19,7 +19,7 @@ $result_trees{'inlineiffmtifelse_not_closed'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
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 379510889d..82c09fd940 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
@@ -19,7 +19,7 @@ $result_trees{'inlineiffmtifelse_not_closed_three_arg'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -42,7 +42,7 @@ $result_trees{'inlineiffmtifelse_not_closed_three_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
diff --git a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
index ef835b4eb1..f345c7dc41 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
@@ -19,7 +19,7 @@ $result_trees{'inlineiffmtifelse_not_closed_two_arg'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/conditionals/inlineifset_false_not_closed.pl
b/tp/t/results/conditionals/inlineifset_false_not_closed.pl
index bcd0d06026..f0a077937f 100644
--- a/tp/t/results/conditionals/inlineifset_false_not_closed.pl
+++ b/tp/t/results/conditionals/inlineifset_false_not_closed.pl
@@ -19,7 +19,7 @@ $result_trees{'inlineifset_false_not_closed'} = {
'text' => 'aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl
b/tp/t/results/conditionals/macro_in_ifset.pl
index 548a619438..e8aa74e191 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -165,7 +165,7 @@ $result_trees{'macro_in_ifset'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index 81a31de60e..cc33305d23 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -239,7 +239,7 @@ $result_trees{'macro_in_ifset_set'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index cebcd0f24c..49cab3bb9b 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -146,7 +146,7 @@ $result_trees{'nested_ifset_ifclear'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -429,7 +429,7 @@ $result_trees{'nested_ifset_ifclear'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -711,7 +711,7 @@ $result_trees{'nested_ifset_ifclear'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -898,7 +898,7 @@ $result_trees{'nested_ifset_ifclear'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
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 0ba0434ec3..5f0b856d10 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -243,7 +243,7 @@ $result_trees{'at_commands_in_raw'} = {
'text' => 'anchor in html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -709,7 +709,7 @@ $result_trees{'at_commands_in_raw'} = {
},
'normalized' => 'anchor-in-html'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -747,7 +747,7 @@ $result_trees{'at_commands_in_raw'} = {
},
'normalized' => 'anchor-in-tex'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -935,7 +935,7 @@ $result_trees{'at_commands_in_raw'} = {
'text' => 'FF'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -992,7 +992,7 @@ $result_trees{'at_commands_in_raw'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl
b/tp/t/results/converters_tests/commands_in_sc.pl
index ffa912f7ee..e14f813e1b 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -195,7 +195,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'myimage'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -225,7 +225,7 @@ $result_trees{'commands_in_sc'} = {
},
'normalized' => 'chap'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -265,7 +265,7 @@ $result_trees{'commands_in_sc'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -292,10 +292,10 @@ $result_trees{'commands_in_sc'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -303,7 +303,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -311,7 +311,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'argf'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -330,7 +330,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'latex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -364,7 +364,7 @@ $result_trees{'commands_in_sc'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -387,7 +387,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'inanchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -411,7 +411,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'hyphena-te'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'hyphenation',
@@ -433,7 +433,7 @@ $result_trees{'commands_in_sc'} = {
'text' => '00ff'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -496,7 +496,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'la'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -515,7 +515,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -523,7 +523,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -542,7 +542,7 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -550,7 +550,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'lb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -565,10 +565,10 @@ $result_trees{'commands_in_sc'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -576,7 +576,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'c'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -601,7 +601,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'c'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -614,7 +614,7 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -633,7 +633,7 @@ $result_trees{'commands_in_sc'} = {
'text' => 'ab'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -646,7 +646,7 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
diff --git a/tp/t/results/converters_tests/commands_in_var.pl
b/tp/t/results/converters_tests/commands_in_var.pl
index ee8fa1f23c..8338b0569d 100644
--- a/tp/t/results/converters_tests/commands_in_var.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -195,7 +195,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'myimage'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -225,7 +225,7 @@ $result_trees{'commands_in_var'} = {
},
'normalized' => 'chap'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -265,7 +265,7 @@ $result_trees{'commands_in_var'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -292,10 +292,10 @@ $result_trees{'commands_in_var'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -303,7 +303,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -311,7 +311,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'argf'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -330,7 +330,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'latex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -364,7 +364,7 @@ $result_trees{'commands_in_var'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -387,7 +387,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'inanchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -411,7 +411,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'hyphena-te'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'hyphenation',
@@ -433,7 +433,7 @@ $result_trees{'commands_in_var'} = {
'text' => '00ff'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -496,7 +496,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'la'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -515,7 +515,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -523,7 +523,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -542,7 +542,7 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -550,7 +550,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'lb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -565,10 +565,10 @@ $result_trees{'commands_in_var'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -576,7 +576,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'c'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -601,7 +601,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'c'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -614,7 +614,7 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -633,7 +633,7 @@ $result_trees{'commands_in_var'} = {
'text' => 'ab'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -646,7 +646,7 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
diff --git a/tp/t/results/converters_tests/form_feeds.pl
b/tp/t/results/converters_tests/form_feeds.pl
index 7cbbc29e8d..f1a9f224e4 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -246,7 +246,7 @@ $result_trees{'form_feeds'} = {
},
'normalized' => 'chap-node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/converters_tests/image_extension.pl
b/tp/t/results/converters_tests/image_extension.pl
index ef52f18bdb..122e98de8a 100644
--- a/tp/t/results/converters_tests/image_extension.pl
+++ b/tp/t/results/converters_tests/image_extension.pl
@@ -17,16 +17,16 @@ $result_trees{'image_extension'} = {
'text' => 'f---ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -34,7 +34,7 @@ $result_trees{'image_extension'} = {
'text' => '.gr--a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/converters_tests/image_formatting.pl
b/tp/t/results/converters_tests/image_formatting.pl
index c989019d1f..515f02dab0 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -172,7 +172,7 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -226,7 +226,7 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -234,7 +234,7 @@ $result_trees{'image_formatting'} = {
'text' => 'l--i'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -288,10 +288,10 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -299,7 +299,7 @@ $result_trees{'image_formatting'} = {
'text' => 'l--e'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -353,13 +353,13 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -367,7 +367,7 @@ $result_trees{'image_formatting'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -421,16 +421,16 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -438,7 +438,7 @@ $result_trees{'image_formatting'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -492,7 +492,7 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -500,7 +500,7 @@ $result_trees{'image_formatting'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -508,7 +508,7 @@ $result_trees{'image_formatting'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -516,7 +516,7 @@ $result_trees{'image_formatting'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -524,7 +524,7 @@ $result_trees{'image_formatting'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -575,7 +575,7 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -583,7 +583,7 @@ $result_trees{'image_formatting'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -591,7 +591,7 @@ $result_trees{'image_formatting'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -599,10 +599,10 @@ $result_trees{'image_formatting'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -656,7 +656,7 @@ $result_trees{'image_formatting'} = {
'text' => 'f-ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -664,10 +664,10 @@ $result_trees{'image_formatting'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -675,7 +675,7 @@ $result_trees{'image_formatting'} = {
'text' => 'a--lt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -793,7 +793,7 @@ $result_trees{'image_formatting'} = {
'cmdname' => '.'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -801,7 +801,7 @@ $result_trees{'image_formatting'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -809,7 +809,7 @@ $result_trees{'image_formatting'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -817,7 +817,7 @@ $result_trees{'image_formatting'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -844,7 +844,7 @@ $result_trees{'image_formatting'} = {
'cmdname' => '}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -867,7 +867,7 @@ $result_trees{'image_formatting'} = {
'text' => 'image'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -889,7 +889,7 @@ $result_trees{'image_formatting'} = {
'text' => 'image'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -967,7 +967,7 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1021,7 +1021,7 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1029,7 +1029,7 @@ $result_trees{'image_formatting'} = {
'text' => 'l--i'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1083,10 +1083,10 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1094,7 +1094,7 @@ $result_trees{'image_formatting'} = {
'text' => 'l--e'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1148,13 +1148,13 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1162,7 +1162,7 @@ $result_trees{'image_formatting'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1216,16 +1216,16 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1233,7 +1233,7 @@ $result_trees{'image_formatting'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1287,7 +1287,7 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1295,7 +1295,7 @@ $result_trees{'image_formatting'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1303,7 +1303,7 @@ $result_trees{'image_formatting'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1311,7 +1311,7 @@ $result_trees{'image_formatting'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1319,7 +1319,7 @@ $result_trees{'image_formatting'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1373,7 +1373,7 @@ $result_trees{'image_formatting'} = {
'text' => 'f-ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1381,10 +1381,10 @@ $result_trees{'image_formatting'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1392,7 +1392,7 @@ $result_trees{'image_formatting'} = {
'text' => 'a--lt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1510,7 +1510,7 @@ $result_trees{'image_formatting'} = {
'cmdname' => '.'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1518,7 +1518,7 @@ $result_trees{'image_formatting'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1526,7 +1526,7 @@ $result_trees{'image_formatting'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1534,7 +1534,7 @@ $result_trees{'image_formatting'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1561,7 +1561,7 @@ $result_trees{'image_formatting'} = {
'cmdname' => '}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1584,7 +1584,7 @@ $result_trees{'image_formatting'} = {
'text' => 'image'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1606,7 +1606,7 @@ $result_trees{'image_formatting'} = {
'text' => 'image'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1672,13 +1672,13 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1686,7 +1686,7 @@ $result_trees{'image_formatting'} = {
'text' => 'a very long alt argument that could span more
than one line who knows'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1720,13 +1720,13 @@ $result_trees{'image_formatting'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1734,7 +1734,7 @@ $result_trees{'image_formatting'} = {
'text' => 'a very long alt argument that could span more
than one line who knows'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/converters_tests/image_with_spaces.pl
b/tp/t/results/converters_tests/image_with_spaces.pl
index db90d0f869..6ea39112f8 100644
Binary files a/tp/t/results/converters_tests/image_with_spaces.pl and
b/tp/t/results/converters_tests/image_with_spaces.pl differ
diff --git a/tp/t/results/converters_tests/inline.pl
b/tp/t/results/converters_tests/inline.pl
index b785eb5975..4db22a5945 100644
--- a/tp/t/results/converters_tests/inline.pl
+++ b/tp/t/results/converters_tests/inline.pl
@@ -24,7 +24,7 @@ $result_trees{'inline'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -37,7 +37,7 @@ $result_trees{'inline'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -61,7 +61,7 @@ $result_trees{'inline'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -74,7 +74,7 @@ $result_trees{'inline'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -98,7 +98,7 @@ $result_trees{'inline'} = {
'text' => 'xml'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -111,7 +111,7 @@ $result_trees{'inline'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -135,7 +135,7 @@ $result_trees{'inline'} = {
'text' => 'docbook'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -148,7 +148,7 @@ $result_trees{'inline'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -172,7 +172,7 @@ $result_trees{'inline'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -204,7 +204,7 @@ $result_trees{'inline'} = {
'text' => 'latex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -285,7 +285,7 @@ $result_trees{'inline'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -324,7 +324,7 @@ $result_trees{'inline'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -337,7 +337,7 @@ $result_trees{'inline'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
@@ -361,7 +361,7 @@ $result_trees{'inline'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -374,7 +374,7 @@ $result_trees{'inline'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
@@ -398,7 +398,7 @@ $result_trees{'inline'} = {
'text' => 'xml'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -411,7 +411,7 @@ $result_trees{'inline'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
@@ -435,7 +435,7 @@ $result_trees{'inline'} = {
'text' => 'docbook'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -448,7 +448,7 @@ $result_trees{'inline'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
@@ -472,7 +472,7 @@ $result_trees{'inline'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -504,7 +504,7 @@ $result_trees{'inline'} = {
'text' => 'latex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -572,7 +572,7 @@ $result_trees{'inline'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
diff --git a/tp/t/results/converters_tests/inline_expand_tex.pl
b/tp/t/results/converters_tests/inline_expand_tex.pl
index 8a887ab083..460180e540 100644
--- a/tp/t/results/converters_tests/inline_expand_tex.pl
+++ b/tp/t/results/converters_tests/inline_expand_tex.pl
@@ -24,7 +24,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -56,7 +56,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -88,7 +88,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'xml'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -120,7 +120,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'docbook'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -152,7 +152,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -181,7 +181,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -205,7 +205,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'latex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -252,7 +252,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -284,7 +284,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -316,7 +316,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'xml'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -348,7 +348,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'docbook'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -380,7 +380,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -437,7 +437,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
@@ -461,7 +461,7 @@ $result_trees{'inline_expand_tex'} = {
'text' => 'latex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/converters_tests/inlinefmtifelse.pl
b/tp/t/results/converters_tests/inlinefmtifelse.pl
index bbf3fbfce8..7abf284d9b 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse.pl
@@ -19,7 +19,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -36,7 +36,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'else html no if'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -60,7 +60,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -77,7 +77,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'else html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -111,7 +111,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -144,7 +144,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -161,7 +161,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'else plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -195,7 +195,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'xml'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -207,7 +207,7 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'elided_brace_command_arg'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -249,7 +249,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -271,7 +271,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -313,7 +313,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -335,7 +335,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -369,7 +369,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'docbook'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -386,7 +386,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'else docbook'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -420,7 +420,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -437,7 +437,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'else tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -471,7 +471,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'latex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -488,7 +488,7 @@ $result_trees{'inlinefmtifelse'} = {
'text' => 'else latex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
diff --git a/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
b/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
index b6e870a462..7bdca1c524 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
@@ -19,7 +19,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -52,7 +52,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -86,7 +86,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -119,7 +119,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -153,7 +153,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => 'xml'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -191,7 +191,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -233,7 +233,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -274,7 +274,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -308,7 +308,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -341,7 +341,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => ' tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
@@ -375,7 +375,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => 'latex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -408,7 +408,7 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => ' latex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
diff --git a/tp/t/results/converters_tests/inlinefmtspaces.pl
b/tp/t/results/converters_tests/inlinefmtspaces.pl
index 8591269a20..4b0cffb61d 100644
--- a/tp/t/results/converters_tests/inlinefmtspaces.pl
+++ b/tp/t/results/converters_tests/inlinefmtspaces.pl
@@ -30,7 +30,7 @@ $result_trees{'inlinefmtspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -57,7 +57,7 @@ $result_trees{'inlinefmtspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -94,7 +94,7 @@ $result_trees{'inlinefmtspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -109,7 +109,7 @@ $result_trees{'inlinefmtspaces'} = {
'text' => 'HTML'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -126,7 +126,7 @@ $result_trees{'inlinefmtspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
diff --git a/tp/t/results/converters_tests/inlineifsetifclear.pl
b/tp/t/results/converters_tests/inlineifsetifclear.pl
index 04809a5e46..9f156d0ec2 100644
--- a/tp/t/results/converters_tests/inlineifsetifclear.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclear.pl
@@ -19,7 +19,7 @@ $result_trees{'inlineifsetifclear'} = {
'text' => 'aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -32,7 +32,7 @@ $result_trees{'inlineifsetifclear'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineifclear',
@@ -66,7 +66,7 @@ $result_trees{'inlineifsetifclear'} = {
'text' => 'aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -130,7 +130,7 @@ $result_trees{'inlineifsetifclear'} = {
'text' => 'aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -172,7 +172,7 @@ $result_trees{'inlineifsetifclear'} = {
'text' => 'aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -185,7 +185,7 @@ $result_trees{'inlineifsetifclear'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineifset',
diff --git a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
index 74c0404a02..f5fd0f0151 100644
--- a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
@@ -27,7 +27,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -40,7 +40,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineifclear',
@@ -88,7 +88,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -166,7 +166,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -221,7 +221,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -234,7 +234,7 @@ $result_trees{'inlineifsetifclearspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineifset',
diff --git a/tp/t/results/converters_tests/inlinerawspaces.pl
b/tp/t/results/converters_tests/inlinerawspaces.pl
index 75db595e16..da13b01b1b 100644
--- a/tp/t/results/converters_tests/inlinerawspaces.pl
+++ b/tp/t/results/converters_tests/inlinerawspaces.pl
@@ -30,7 +30,7 @@ $result_trees{'inlinerawspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -57,7 +57,7 @@ $result_trees{'inlinerawspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
@@ -89,7 +89,7 @@ $result_trees{'inlinerawspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -104,7 +104,7 @@ $result_trees{'inlinerawspaces'} = {
'text' => 'HTML'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -121,7 +121,7 @@ $result_trees{'inlinerawspaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
diff --git a/tp/t/results/converters_tests/link.pl
b/tp/t/results/converters_tests/link.pl
index 9462f2b749..afe4d0f287 100644
--- a/tp/t/results/converters_tests/link.pl
+++ b/tp/t/results/converters_tests/link.pl
@@ -180,7 +180,7 @@ $result_trees{'link'} = {
},
'normalized' => 'One'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'link',
@@ -218,7 +218,7 @@ $result_trees{'link'} = {
},
'normalized' => 'One'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -231,7 +231,7 @@ $result_trees{'link'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'link',
@@ -315,7 +315,7 @@ $result_trees{'link'} = {
},
'normalized' => 'One'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'link',
@@ -353,7 +353,7 @@ $result_trees{'link'} = {
},
'normalized' => 'One'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -366,7 +366,7 @@ $result_trees{'link'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'link',
@@ -417,10 +417,10 @@ $result_trees{'link'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -428,7 +428,7 @@ $result_trees{'link'} = {
'text' => 'bash'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'link',
@@ -465,7 +465,7 @@ $result_trees{'link'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -473,7 +473,7 @@ $result_trees{'link'} = {
'text' => 'Bash'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -481,7 +481,7 @@ $result_trees{'link'} = {
'text' => 'bash'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'link',
diff --git a/tp/t/results/converters_tests/ref_error_formatting.pl
b/tp/t/results/converters_tests/ref_error_formatting.pl
index b45feea1fb..009ed635e9 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -63,7 +63,7 @@ $result_trees{'ref_error_formatting'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -119,7 +119,7 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -127,7 +127,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -173,10 +173,10 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -184,7 +184,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -230,13 +230,13 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -244,7 +244,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -290,16 +290,16 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -307,7 +307,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -366,7 +366,7 @@ $result_trees{'ref_error_formatting'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -374,7 +374,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -433,10 +433,10 @@ $result_trees{'ref_error_formatting'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -444,7 +444,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -502,13 +502,13 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -516,7 +516,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -574,16 +574,16 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -591,7 +591,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -650,7 +650,7 @@ $result_trees{'ref_error_formatting'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -658,7 +658,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -666,10 +666,10 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -727,7 +727,7 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -735,10 +735,10 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -746,7 +746,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -804,7 +804,7 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -812,13 +812,13 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -826,7 +826,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -884,7 +884,7 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -892,7 +892,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -900,7 +900,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -908,7 +908,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -966,7 +966,7 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -974,7 +974,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -982,10 +982,10 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -993,7 +993,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1051,7 +1051,7 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1059,7 +1059,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1067,7 +1067,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1080,7 +1080,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1093,7 +1093,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1151,10 +1151,10 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1162,7 +1162,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1170,7 +1170,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1228,10 +1228,10 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1239,10 +1239,10 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1250,7 +1250,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1308,10 +1308,10 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1319,7 +1319,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1332,7 +1332,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1345,7 +1345,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1403,13 +1403,13 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1417,7 +1417,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1425,7 +1425,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1471,7 +1471,7 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1479,7 +1479,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1487,10 +1487,10 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1536,7 +1536,7 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1544,10 +1544,10 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1555,7 +1555,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1601,7 +1601,7 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1609,13 +1609,13 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1623,7 +1623,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1669,7 +1669,7 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1677,7 +1677,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1685,7 +1685,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1693,7 +1693,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1739,7 +1739,7 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1747,7 +1747,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1755,10 +1755,10 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1766,7 +1766,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1812,7 +1812,7 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1820,7 +1820,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1828,7 +1828,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1841,7 +1841,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1854,7 +1854,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1900,10 +1900,10 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1911,7 +1911,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1919,7 +1919,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1965,10 +1965,10 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1976,10 +1976,10 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1987,7 +1987,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2033,10 +2033,10 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2044,7 +2044,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2057,7 +2057,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2070,7 +2070,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2116,13 +2116,13 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2130,7 +2130,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2138,7 +2138,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2194,7 +2194,7 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2207,7 +2207,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2253,10 +2253,10 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2264,7 +2264,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2310,7 +2310,7 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2318,7 +2318,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2331,7 +2331,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2374,7 +2374,7 @@ $result_trees{'ref_error_formatting'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2442,7 +2442,7 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2455,7 +2455,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2468,7 +2468,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2527,7 +2527,7 @@ $result_trees{'ref_error_formatting'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2586,7 +2586,7 @@ $result_trees{'ref_error_formatting'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2599,7 +2599,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2657,10 +2657,10 @@ $result_trees{'ref_error_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2668,7 +2668,7 @@ $result_trees{'ref_error_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index abaeafe44e..dc3016b960 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -85,7 +85,7 @@ $result_trees{'ref_in_sectioning'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -112,7 +112,7 @@ $result_trees{'ref_in_sectioning'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -138,13 +138,13 @@ $result_trees{'ref_in_sectioning'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -157,7 +157,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -170,7 +170,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -405,10 +405,10 @@ $result_trees{'ref_in_sectioning'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -416,7 +416,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -429,7 +429,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -442,7 +442,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -534,7 +534,7 @@ $result_trees{'ref_in_sectioning'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -598,7 +598,7 @@ $result_trees{'ref_in_sectioning'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -625,7 +625,7 @@ $result_trees{'ref_in_sectioning'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -651,13 +651,13 @@ $result_trees{'ref_in_sectioning'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -670,7 +670,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -683,7 +683,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -744,7 +744,7 @@ $result_trees{'ref_in_sectioning'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -757,7 +757,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -831,10 +831,10 @@ $result_trees{'ref_in_sectioning'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -860,7 +860,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -933,13 +933,13 @@ $result_trees{'ref_in_sectioning'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -952,7 +952,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1012,16 +1012,16 @@ $result_trees{'ref_in_sectioning'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1037,7 +1037,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1097,16 +1097,16 @@ $result_trees{'ref_in_sectioning'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1122,7 +1122,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1170,16 +1170,16 @@ $result_trees{'ref_in_sectioning'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1195,7 +1195,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1243,13 +1243,13 @@ $result_trees{'ref_in_sectioning'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1262,7 +1262,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1322,7 +1322,7 @@ $result_trees{'ref_in_sectioning'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1335,7 +1335,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1348,7 +1348,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -1419,13 +1419,13 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1441,7 +1441,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -1492,13 +1492,13 @@ $result_trees{'ref_in_sectioning'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1514,7 +1514,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -1574,13 +1574,13 @@ $result_trees{'ref_in_sectioning'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1588,7 +1588,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => 'filename'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1636,13 +1636,13 @@ $result_trees{'ref_in_sectioning'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1650,7 +1650,7 @@ $result_trees{'ref_in_sectioning'} = {
'text' => 'filename'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 35b96ec7f6..f82b05abd2 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
@@ -92,7 +92,7 @@ $result_trees{'references_to_top_no_top_output'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -235,7 +235,7 @@ $result_trees{'references_to_top_no_top_output'} = {
'text' => 'a in top'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -270,7 +270,7 @@ $result_trees{'references_to_top_no_top_output'} = {
'text' => 'a in paragraph in top'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -313,7 +313,7 @@ $result_trees{'references_to_top_no_top_output'} = {
'text' => 'a in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -413,7 +413,7 @@ $result_trees{'references_to_top_no_top_output'} = {
'text' => 'a in float'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -449,7 +449,7 @@ $result_trees{'references_to_top_no_top_output'} = {
'text' => 'a in caption'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -673,7 +673,7 @@ $result_trees{'references_to_top_no_top_output'} = {
},
'normalized' => 'a-in-copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -701,7 +701,7 @@ $result_trees{'references_to_top_no_top_output'} = {
},
'normalized' => 'a-in-top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -729,7 +729,7 @@ $result_trees{'references_to_top_no_top_output'} = {
},
'normalized' => 'a-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -757,7 +757,7 @@ $result_trees{'references_to_top_no_top_output'} = {
},
'normalized' => 'a-in-float'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -785,7 +785,7 @@ $result_trees{'references_to_top_no_top_output'} = {
},
'normalized' => 'a-in-caption'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -813,7 +813,7 @@ $result_trees{'references_to_top_no_top_output'} = {
},
'normalized' => 'a-in-paragraph-in-top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
diff --git a/tp/t/results/converters_tests/refs_formatting.pl
b/tp/t/results/converters_tests/refs_formatting.pl
index dcdc0fda5c..e56d084182 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -114,7 +114,7 @@ $result_trees{'refs_formatting'} = {
},
'normalized' => 'chapter'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -122,7 +122,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -181,10 +181,10 @@ $result_trees{'refs_formatting'} = {
},
'normalized' => 'chapter'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -192,7 +192,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -250,13 +250,13 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -264,7 +264,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -322,16 +322,16 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -339,7 +339,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -398,7 +398,7 @@ $result_trees{'refs_formatting'} = {
},
'normalized' => 'chapter'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -406,7 +406,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -414,10 +414,10 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -475,7 +475,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -483,10 +483,10 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -494,7 +494,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -552,7 +552,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -560,13 +560,13 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -574,7 +574,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -632,7 +632,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -640,7 +640,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -648,7 +648,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -656,7 +656,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -714,7 +714,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -722,7 +722,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -730,10 +730,10 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -741,7 +741,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -799,7 +799,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -807,7 +807,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -815,7 +815,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -828,7 +828,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -841,7 +841,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -899,10 +899,10 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -910,7 +910,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -918,7 +918,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -976,10 +976,10 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -987,10 +987,10 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -998,7 +998,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1056,10 +1056,10 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1067,7 +1067,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1080,7 +1080,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1093,7 +1093,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1151,13 +1151,13 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1165,7 +1165,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1173,7 +1173,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1255,7 +1255,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1263,7 +1263,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1335,10 +1335,10 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1346,7 +1346,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1418,13 +1418,13 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1432,7 +1432,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1504,16 +1504,16 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1521,7 +1521,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1593,7 +1593,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1601,7 +1601,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1609,10 +1609,10 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1684,7 +1684,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1692,10 +1692,10 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1703,7 +1703,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1775,7 +1775,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1783,13 +1783,13 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1797,7 +1797,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1869,7 +1869,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1877,7 +1877,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1885,7 +1885,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1893,7 +1893,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1965,7 +1965,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1973,7 +1973,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1981,10 +1981,10 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1992,7 +1992,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2064,7 +2064,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2072,7 +2072,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2080,7 +2080,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2093,7 +2093,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2106,7 +2106,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2178,10 +2178,10 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2189,7 +2189,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2197,7 +2197,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2269,10 +2269,10 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2280,10 +2280,10 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2291,7 +2291,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2363,10 +2363,10 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2374,7 +2374,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2387,7 +2387,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2400,7 +2400,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2472,13 +2472,13 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2486,7 +2486,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2494,7 +2494,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2562,7 +2562,7 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2575,7 +2575,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2588,7 +2588,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2647,7 +2647,7 @@ $result_trees{'refs_formatting'} = {
},
'normalized' => 'chapter'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2706,7 +2706,7 @@ $result_trees{'refs_formatting'} = {
},
'normalized' => 'chapter'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2719,7 +2719,7 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2777,10 +2777,10 @@ $result_trees{'refs_formatting'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2788,7 +2788,7 @@ $result_trees{'refs_formatting'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
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 6f828a81f7..4e6ffe9013 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
@@ -1003,13 +1003,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1017,7 +1017,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1271,7 +1271,7 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
},
'normalized' =>
'A-sc-_00f1-_00e5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 62778860e2..ece5b3ca95 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
@@ -408,7 +408,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
},
'normalized' => '-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -463,7 +463,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
},
'normalized' => '-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -514,7 +514,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
},
'normalized' => '-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 993bb0ac91..c83643a053 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -441,7 +441,7 @@ $result_trees{'spaces_in_node_names'} = {
},
'normalized' => 'chap-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -500,7 +500,7 @@ $result_trees{'spaces_in_node_names'} = {
},
'normalized' => 'b-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -555,7 +555,7 @@ $result_trees{'spaces_in_node_names'} = {
},
'normalized' => 'c-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 6df96c6ec9..7c5d049679 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -34,7 +34,7 @@ $result_trees{'things_before_setfilename'} = {
'text' => 'An anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -79,7 +79,7 @@ $result_trees{'things_before_setfilename'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -122,7 +122,7 @@ $result_trees{'things_before_setfilename'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -171,7 +171,7 @@ $result_trees{'things_before_setfilename'} = {
'text' => 'Anchor in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -216,7 +216,7 @@ $result_trees{'things_before_setfilename'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -363,7 +363,7 @@ $result_trees{'things_before_setfilename'} = {
},
'normalized' => 'float-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -942,7 +942,7 @@ $result_trees{'things_before_setfilename'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -985,7 +985,7 @@ $result_trees{'things_before_setfilename'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 07bf0d11aa..ecffccceef 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
@@ -34,7 +34,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
'text' => 'An anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -79,7 +79,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -122,7 +122,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -171,7 +171,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
'text' => 'Anchor in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -216,7 +216,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -363,7 +363,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
},
'normalized' => 'float-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -815,7 +815,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -858,7 +858,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/converters_tests/top_in_ref.pl
b/tp/t/results/converters_tests/top_in_ref.pl
index 4e67efff20..d90f0108eb 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -121,7 +121,7 @@ $result_trees{'top_in_ref'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -129,7 +129,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -188,10 +188,10 @@ $result_trees{'top_in_ref'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -199,7 +199,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -257,13 +257,13 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -271,7 +271,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -329,16 +329,16 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -346,7 +346,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -405,7 +405,7 @@ $result_trees{'top_in_ref'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -413,7 +413,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -421,10 +421,10 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -482,7 +482,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -490,10 +490,10 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -501,7 +501,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -559,7 +559,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -567,13 +567,13 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -581,7 +581,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -639,7 +639,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -647,7 +647,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -655,7 +655,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -663,7 +663,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -721,7 +721,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -729,7 +729,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -737,10 +737,10 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -748,7 +748,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -806,7 +806,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -814,7 +814,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -822,7 +822,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -835,7 +835,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -848,7 +848,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -906,10 +906,10 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -917,7 +917,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -925,7 +925,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -983,10 +983,10 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -994,10 +994,10 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1005,7 +1005,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1063,10 +1063,10 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1074,7 +1074,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1087,7 +1087,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1100,7 +1100,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1158,13 +1158,13 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1172,7 +1172,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1180,7 +1180,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1262,7 +1262,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1270,7 +1270,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1342,10 +1342,10 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1353,7 +1353,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1425,13 +1425,13 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1439,7 +1439,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1511,16 +1511,16 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1528,7 +1528,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1600,7 +1600,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1608,7 +1608,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1616,10 +1616,10 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1691,7 +1691,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1699,10 +1699,10 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1710,7 +1710,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1782,7 +1782,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1790,13 +1790,13 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1804,7 +1804,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1876,7 +1876,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1884,7 +1884,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1892,7 +1892,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1900,7 +1900,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1972,7 +1972,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1980,7 +1980,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1988,10 +1988,10 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1999,7 +1999,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2071,7 +2071,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2079,7 +2079,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'cross ref name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2087,7 +2087,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2100,7 +2100,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2113,7 +2113,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2185,10 +2185,10 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2196,7 +2196,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2204,7 +2204,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2276,10 +2276,10 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2287,10 +2287,10 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2298,7 +2298,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2370,10 +2370,10 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2381,7 +2381,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2394,7 +2394,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2407,7 +2407,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2479,13 +2479,13 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2493,7 +2493,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2501,7 +2501,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -2569,7 +2569,7 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2582,7 +2582,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2595,7 +2595,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2654,7 +2654,7 @@ $result_trees{'top_in_ref'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2713,7 +2713,7 @@ $result_trees{'top_in_ref'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2726,7 +2726,7 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -2784,10 +2784,10 @@ $result_trees{'top_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2795,7 +2795,7 @@ $result_trees{'top_in_ref'} = {
'text' => 'file name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
diff --git a/tp/t/results/coverage/commands.pl
b/tp/t/results/coverage/commands.pl
index 55c5d220c1..b89e221435 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -188,7 +188,7 @@ $result_trees{'commands'} = {
'text' => 'a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -201,7 +201,7 @@ $result_trees{'commands'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/coverage/commands_in_math.pl
b/tp/t/results/coverage/commands_in_math.pl
index 34342c35c6..e02036382b 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -876,7 +876,7 @@ $result_trees{'commands_in_math'} = {
'text' => '0075'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
diff --git a/tp/t/results/coverage/hyphenation.pl
b/tp/t/results/coverage/hyphenation.pl
index d5902e4558..ebb9e25a01 100644
--- a/tp/t/results/coverage/hyphenation.pl
+++ b/tp/t/results/coverage/hyphenation.pl
@@ -27,7 +27,7 @@ $result_trees{'hyphenation'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'hyphenation',
diff --git a/tp/t/results/coverage/invalid_U.pl
b/tp/t/results/coverage/invalid_U.pl
index 28bb80f049..92ddced894 100644
--- a/tp/t/results/coverage/invalid_U.pl
+++ b/tp/t/results/coverage/invalid_U.pl
@@ -25,7 +25,7 @@ $result_trees{'invalid_U'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -44,7 +44,7 @@ $result_trees{'invalid_U'} = {
'text' => 'z'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -63,7 +63,7 @@ $result_trees{'invalid_U'} = {
'text' => 'abc'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -82,7 +82,7 @@ $result_trees{'invalid_U'} = {
'text' => '9999999999999'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -101,7 +101,7 @@ $result_trees{'invalid_U'} = {
'text' => '110000'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -120,7 +120,7 @@ $result_trees{'invalid_U'} = {
'text' => '10FFFF'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -148,7 +148,7 @@ $result_trees{'invalid_U'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -167,7 +167,7 @@ $result_trees{'invalid_U'} = {
'text' => 'FFFD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -194,7 +194,7 @@ $result_trees{'invalid_U'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
diff --git a/tp/t/results/coverage/spaces_after_braced_command.pl
b/tp/t/results/coverage/spaces_after_braced_command.pl
index 72c38199fb..b701090970 100644
--- a/tp/t/results/coverage/spaces_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_after_braced_command.pl
@@ -121,7 +121,7 @@ $result_trees{'spaces_after_braced_command'} = {
'text' => 'a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -138,7 +138,7 @@ $result_trees{'spaces_after_braced_command'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/coverage/test_errormsg.pl
b/tp/t/results/coverage/test_errormsg.pl
index 3028c8eb59..5ddd730387 100644
--- a/tp/t/results/coverage/test_errormsg.pl
+++ b/tp/t/results/coverage/test_errormsg.pl
@@ -58,7 +58,7 @@ $result_trees{'test_errormsg'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'errormsg',
@@ -86,7 +86,7 @@ $result_trees{'test_errormsg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'errormsg',
diff --git a/tp/t/results/coverage_braces/abbr_acronym.pl
b/tp/t/results/coverage_braces/abbr_acronym.pl
index f13ff4cac4..daf48e4eeb 100644
--- a/tp/t/results/coverage_braces/abbr_acronym.pl
+++ b/tp/t/results/coverage_braces/abbr_acronym.pl
@@ -19,7 +19,7 @@ $result_trees{'abbr_acronym'} = {
'text' => '--a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -27,7 +27,7 @@ $result_trees{'abbr_acronym'} = {
'text' => 'an accronym'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -47,7 +47,7 @@ $result_trees{'abbr_acronym'} = {
'text' => '--a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -67,7 +67,7 @@ $result_trees{'abbr_acronym'} = {
'text' => '--a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -100,7 +100,7 @@ $result_trees{'abbr_acronym'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -160,7 +160,7 @@ $result_trees{'abbr_acronym'} = {
'text' => 'A.'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -222,7 +222,7 @@ $result_trees{'abbr_acronym'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -272,7 +272,7 @@ $result_trees{'abbr_acronym'} = {
'text' => 'A.'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
diff --git a/tp/t/results/coverage_braces/anchor_not_closed.pl
b/tp/t/results/coverage_braces/anchor_not_closed.pl
index 3f3dd37d99..694f666f32 100644
--- a/tp/t/results/coverage_braces/anchor_not_closed.pl
+++ b/tp/t/results/coverage_braces/anchor_not_closed.pl
@@ -23,7 +23,7 @@ $result_trees{'anchor_not_closed'} = {
'type' => 'empty_line'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/coverage_braces/brace_opened_no_command.pl
b/tp/t/results/coverage_braces/brace_opened_no_command.pl
index c6bdbb8d78..0e09aa12f2 100644
--- a/tp/t/results/coverage_braces/brace_opened_no_command.pl
+++ b/tp/t/results/coverage_braces/brace_opened_no_command.pl
@@ -28,7 +28,7 @@ $result_trees{'brace_opened_no_command'} = {
'text' => 'truc'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
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 870957935f..adfc8c74db 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -197,7 +197,7 @@ $result_trees{'contain_plain_text_nestings'} = {
'text' => ' text'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'hyphenation',
@@ -282,7 +282,7 @@ $result_trees{'contain_plain_text_nestings'} = {
'text' => ' text'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -363,7 +363,7 @@ $result_trees{'contain_plain_text_nestings'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -376,7 +376,7 @@ $result_trees{'contain_plain_text_nestings'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -420,7 +420,7 @@ $result_trees{'contain_plain_text_nestings'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -433,7 +433,7 @@ $result_trees{'contain_plain_text_nestings'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -445,7 +445,7 @@ $result_trees{'contain_plain_text_nestings'} = {
'text' => ' text'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'hyphenation',
@@ -479,7 +479,7 @@ $result_trees{'contain_plain_text_nestings'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -492,7 +492,7 @@ $result_trees{'contain_plain_text_nestings'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -547,7 +547,7 @@ $result_trees{'contain_plain_text_nestings'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -560,7 +560,7 @@ $result_trees{'contain_plain_text_nestings'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -572,7 +572,7 @@ $result_trees{'contain_plain_text_nestings'} = {
'text' => ' text'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
diff --git a/tp/t/results/coverage_braces/email_possibilities.pl
b/tp/t/results/coverage_braces/email_possibilities.pl
index 16877f8627..1f051813bb 100644
--- a/tp/t/results/coverage_braces/email_possibilities.pl
+++ b/tp/t/results/coverage_braces/email_possibilities.pl
@@ -19,7 +19,7 @@ $result_trees{'email_possibilities'} = {
'text' => '--a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -27,7 +27,7 @@ $result_trees{'email_possibilities'} = {
'text' => '--b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -42,7 +42,7 @@ $result_trees{'email_possibilities'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -50,7 +50,7 @@ $result_trees{'email_possibilities'} = {
'text' => '--b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -70,7 +70,7 @@ $result_trees{'email_possibilities'} = {
'text' => '--a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/coverage_braces/empty_commands.pl
b/tp/t/results/coverage_braces/empty_commands.pl
index 4d46dc90c8..67904f0346 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -35,7 +35,7 @@ $result_trees{'empty_commands'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -49,7 +49,7 @@ $result_trees{'empty_commands'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -63,7 +63,7 @@ $result_trees{'empty_commands'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/coverage_braces/empty_images.pl
b/tp/t/results/coverage_braces/empty_images.pl
index 6f7e0b35f5..6cfedf0020 100644
--- a/tp/t/results/coverage_braces/empty_images.pl
+++ b/tp/t/results/coverage_braces/empty_images.pl
@@ -12,7 +12,7 @@ $result_trees{'empty_images'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -40,7 +40,7 @@ $result_trees{'empty_images'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -48,7 +48,7 @@ $result_trees{'empty_images'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -56,7 +56,7 @@ $result_trees{'empty_images'} = {
'text' => 'bb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -69,7 +69,7 @@ $result_trees{'empty_images'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -77,7 +77,7 @@ $result_trees{'empty_images'} = {
'text' => 'dd'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -100,13 +100,13 @@ $result_trees{'empty_images'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -114,7 +114,7 @@ $result_trees{'empty_images'} = {
'cmdname' => ' '
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -132,13 +132,13 @@ $result_trees{'empty_images'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -146,7 +146,7 @@ $result_trees{'empty_images'} = {
'cmdname' => ':'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/coverage_braces/empty_line_in_anchor.pl
b/tp/t/results/coverage_braces/empty_line_in_anchor.pl
index 417e5e5c73..96163efc36 100644
--- a/tp/t/results/coverage_braces/empty_line_in_anchor.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_anchor.pl
@@ -23,7 +23,7 @@ $result_trees{'empty_line_in_anchor'} = {
'type' => 'empty_line'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
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 c59d4b3d27..84699fe42f 100644
--- a/tp/t/results/coverage_braces/empty_line_in_email.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_email.pl
@@ -27,7 +27,7 @@ $result_trees{'empty_line_in_email'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/coverage_braces/empty_ref.pl
b/tp/t/results/coverage_braces/empty_ref.pl
index be7a027f06..b3d29b9afc 100644
--- a/tp/t/results/coverage_braces/empty_ref.pl
+++ b/tp/t/results/coverage_braces/empty_ref.pl
@@ -19,7 +19,7 @@ $result_trees{'empty_ref'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -33,10 +33,10 @@ $result_trees{'empty_ref'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -44,7 +44,7 @@ $result_trees{'empty_ref'} = {
'text' => 'something'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -63,7 +63,7 @@ $result_trees{'empty_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -86,7 +86,7 @@ $result_trees{'empty_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -99,7 +99,7 @@ $result_trees{'empty_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
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 1e252aab70..2f92093e6f 100644
--- a/tp/t/results/coverage_braces/empty_second_email_argument.pl
+++ b/tp/t/results/coverage_braces/empty_second_email_argument.pl
@@ -30,7 +30,7 @@ $result_trees{'empty_second_email_argument'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -38,7 +38,7 @@ $result_trees{'empty_second_email_argument'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/coverage_braces/end_line_in_anchor.pl
b/tp/t/results/coverage_braces/end_line_in_anchor.pl
index 2f78ed5fc5..e9fa5dc20c 100644
--- a/tp/t/results/coverage_braces/end_line_in_anchor.pl
+++ b/tp/t/results/coverage_braces/end_line_in_anchor.pl
@@ -21,7 +21,7 @@ $result_trees{'end_line_in_anchor'} = {
'text' => 'anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
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 e5eeeaf9a1..7caf528c03 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
@@ -38,7 +38,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -79,7 +79,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -92,7 +92,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
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 df16e5396c..ad62373d36 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -51,7 +51,7 @@ $result_trees{'inforef_too_much_args'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -64,7 +64,7 @@ $result_trees{'inforef_too_much_args'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -77,7 +77,7 @@ $result_trees{'inforef_too_much_args'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
diff --git a/tp/t/results/coverage_braces/nested_args.pl
b/tp/t/results/coverage_braces/nested_args.pl
index f7d202a3b1..0a9d53ca3f 100644
--- a/tp/t/results/coverage_braces/nested_args.pl
+++ b/tp/t/results/coverage_braces/nested_args.pl
@@ -47,7 +47,7 @@ $result_trees{'nested_args'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -76,7 +76,7 @@ $result_trees{'nested_args'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -108,7 +108,7 @@ $result_trees{'nested_args'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -135,7 +135,7 @@ $result_trees{'nested_args'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl
b/tp/t/results/coverage_braces/nested_in_sc.pl
index 92f250be74..273db06df6 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -129,7 +129,7 @@ $result_trees{'nested_in_sc'} = {
'text' => 'ABr'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -142,7 +142,7 @@ $result_trees{'nested_in_sc'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
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 cbcddc0f5d..4b391e5906 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' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'hyphenation',
@@ -153,7 +153,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
diff --git a/tp/t/results/coverage_braces/recursive_acronym.pl
b/tp/t/results/coverage_braces/recursive_acronym.pl
index 26b696cd41..07f0f6bbe3 100644
--- a/tp/t/results/coverage_braces/recursive_acronym.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym.pl
@@ -19,7 +19,7 @@ $result_trees{'recursive_acronym'} = {
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -31,7 +31,7 @@ $result_trees{'recursive_acronym'} = {
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -48,7 +48,7 @@ $result_trees{'recursive_acronym'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
diff --git a/tp/t/results/coverage_braces/recursive_acronym_definition.pl
b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
index e5dfb8325a..4dd75908f1 100644
--- a/tp/t/results/coverage_braces/recursive_acronym_definition.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
@@ -19,7 +19,7 @@ $result_trees{'recursive_acronym_definition'} = {
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -31,7 +31,7 @@ $result_trees{'recursive_acronym_definition'} = {
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -43,7 +43,7 @@ $result_trees{'recursive_acronym_definition'} = {
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -56,7 +56,7 @@ $result_trees{'recursive_acronym_definition'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -73,7 +73,7 @@ $result_trees{'recursive_acronym_definition'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -90,7 +90,7 @@ $result_trees{'recursive_acronym_definition'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
diff --git a/tp/t/results/coverage_braces/ref_empty_node.pl
b/tp/t/results/coverage_braces/ref_empty_node.pl
index d90331fd1f..3e53f7fdf8 100644
--- a/tp/t/results/coverage_braces/ref_empty_node.pl
+++ b/tp/t/results/coverage_braces/ref_empty_node.pl
@@ -19,13 +19,13 @@ $result_trees{'ref_empty_node'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -33,7 +33,7 @@ $result_trees{'ref_empty_node'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -47,13 +47,13 @@ $result_trees{'ref_empty_node'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -61,7 +61,7 @@ $result_trees{'ref_empty_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -74,7 +74,7 @@ $result_trees{'ref_empty_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -88,10 +88,10 @@ $result_trees{'ref_empty_node'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -99,7 +99,7 @@ $result_trees{'ref_empty_node'} = {
'text' => 'imanual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inforef',
@@ -119,7 +119,7 @@ $result_trees{'ref_empty_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -132,7 +132,7 @@ $result_trees{'ref_empty_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -145,7 +145,7 @@ $result_trees{'ref_empty_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -158,7 +158,7 @@ $result_trees{'ref_empty_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -171,7 +171,7 @@ $result_trees{'ref_empty_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/coverage_braces/ref_in_style_command.pl
b/tp/t/results/coverage_braces/ref_in_style_command.pl
index ed110df712..0c6ff88820 100644
--- a/tp/t/results/coverage_braces/ref_in_style_command.pl
+++ b/tp/t/results/coverage_braces/ref_in_style_command.pl
@@ -44,7 +44,7 @@ $result_trees{'ref_in_style_command'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/coverage_braces/space_command_in_image.pl
b/tp/t/results/coverage_braces/space_command_in_image.pl
index 296c710ef7..771050268f 100644
--- a/tp/t/results/coverage_braces/space_command_in_image.pl
+++ b/tp/t/results/coverage_braces/space_command_in_image.pl
@@ -17,13 +17,13 @@ $result_trees{'space_command_in_image'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -31,7 +31,7 @@ $result_trees{'space_command_in_image'} = {
'cmdname' => ' '
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -53,13 +53,13 @@ $result_trees{'space_command_in_image'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -67,7 +67,7 @@ $result_trees{'space_command_in_image'} = {
'cmdname' => ':'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/coverage_braces/space_in_anchor.pl
b/tp/t/results/coverage_braces/space_in_anchor.pl
index 039dd655df..2770ad33b4 100644
--- a/tp/t/results/coverage_braces/space_in_anchor.pl
+++ b/tp/t/results/coverage_braces/space_in_anchor.pl
@@ -25,7 +25,7 @@ $result_trees{'space_in_anchor'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/coverage_braces/space_in_image.pl
b/tp/t/results/coverage_braces/space_in_image.pl
index 993c793a99..27c187f70f 100644
--- a/tp/t/results/coverage_braces/space_in_image.pl
+++ b/tp/t/results/coverage_braces/space_in_image.pl
@@ -25,7 +25,7 @@ $result_trees{'space_in_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -33,7 +33,7 @@ $result_trees{'space_in_image'} = {
'text' => 'bb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -46,7 +46,7 @@ $result_trees{'space_in_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -59,7 +59,7 @@ $result_trees{'space_in_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -72,7 +72,7 @@ $result_trees{'space_in_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -104,7 +104,7 @@ $result_trees{'space_in_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index 63ad692a32..abc6f9cb0b 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -100,7 +100,7 @@ $result_trees{'test_image'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -177,16 +177,16 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -242,7 +242,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -332,7 +332,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -340,7 +340,7 @@ $result_trees{'test_image'} = {
'text' => '1in'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -353,7 +353,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -459,7 +459,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -515,7 +515,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -642,7 +642,7 @@ $result_trees{'test_image'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -720,16 +720,16 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -785,7 +785,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -872,7 +872,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -880,7 +880,7 @@ $result_trees{'test_image'} = {
'text' => '1in'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -893,7 +893,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -999,7 +999,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1055,7 +1055,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1138,7 +1138,7 @@ $result_trees{'test_image'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1213,16 +1213,16 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1278,7 +1278,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1363,7 +1363,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1371,7 +1371,7 @@ $result_trees{'test_image'} = {
'text' => '1in'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1384,7 +1384,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1490,7 +1490,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1546,7 +1546,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1650,7 +1650,7 @@ $result_trees{'test_image'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1725,16 +1725,16 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1790,7 +1790,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1877,7 +1877,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1885,7 +1885,7 @@ $result_trees{'test_image'} = {
'text' => '1in'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1898,7 +1898,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2004,7 +2004,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2060,7 +2060,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -2103,7 +2103,7 @@ $result_trees{'test_image'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2178,16 +2178,16 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2243,7 +2243,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -2330,7 +2330,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2338,7 +2338,7 @@ $result_trees{'test_image'} = {
'text' => '1in'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2351,7 +2351,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2457,7 +2457,7 @@ $result_trees{'test_image'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2513,7 +2513,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/coverage_braces/too_much_args.pl
b/tp/t/results/coverage_braces/too_much_args.pl
index d07508b993..7a46e9f938 100644
--- a/tp/t/results/coverage_braces/too_much_args.pl
+++ b/tp/t/results/coverage_braces/too_much_args.pl
@@ -19,7 +19,7 @@ $result_trees{'too_much_args'} = {
'text' => 'AZE'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -32,7 +32,7 @@ $result_trees{'too_much_args'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
diff --git a/tp/t/results/coverage_braces/uref_in_ref.pl
b/tp/t/results/coverage_braces/uref_in_ref.pl
index f2596d7ac7..5ecc2c5a3c 100644
--- a/tp/t/results/coverage_braces/uref_in_ref.pl
+++ b/tp/t/results/coverage_braces/uref_in_ref.pl
@@ -40,7 +40,7 @@ $result_trees{'uref_in_ref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -55,7 +55,7 @@ $result_trees{'uref_in_ref'} = {
'text' => 'href://http/myhost.com/index.html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -63,7 +63,7 @@ $result_trees{'uref_in_ref'} = {
'text' => 'uref1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -77,7 +77,7 @@ $result_trees{'uref_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -92,7 +92,7 @@ $result_trees{'uref_in_ref'} = {
'text' => 'href://http/myhost.com/index2.html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -100,7 +100,7 @@ $result_trees{'uref_in_ref'} = {
'text' => 'uref2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -114,7 +114,7 @@ $result_trees{'uref_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -129,7 +129,7 @@ $result_trees{'uref_in_ref'} = {
'text' => 'href://http/myhost.com/index3.html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -137,7 +137,7 @@ $result_trees{'uref_in_ref'} = {
'text' => 'uref3'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -151,7 +151,7 @@ $result_trees{'uref_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -166,7 +166,7 @@ $result_trees{'uref_in_ref'} = {
'text' => 'href://http/myhost.com/index4.html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -174,7 +174,7 @@ $result_trees{'uref_in_ref'} = {
'text' => 'uref4'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -188,7 +188,7 @@ $result_trees{'uref_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/coverage_braces/uref_url.pl
b/tp/t/results/coverage_braces/uref_url.pl
index d48878a011..4144f48b17 100644
--- a/tp/t/results/coverage_braces/uref_url.pl
+++ b/tp/t/results/coverage_braces/uref_url.pl
@@ -19,7 +19,7 @@ $result_trees{'uref_url'} = {
'text' => '--a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -27,7 +27,7 @@ $result_trees{'uref_url'} = {
'text' => '--b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -47,7 +47,7 @@ $result_trees{'uref_url'} = {
'text' => '--c'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -62,7 +62,7 @@ $result_trees{'uref_url'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -70,7 +70,7 @@ $result_trees{'uref_url'} = {
'text' => '--d'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -90,7 +90,7 @@ $result_trees{'uref_url'} = {
'text' => '--e'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -98,7 +98,7 @@ $result_trees{'uref_url'} = {
'text' => '--f'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -106,7 +106,7 @@ $result_trees{'uref_url'} = {
'text' => '--g'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -121,7 +121,7 @@ $result_trees{'uref_url'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -129,7 +129,7 @@ $result_trees{'uref_url'} = {
'text' => '--h'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -137,7 +137,7 @@ $result_trees{'uref_url'} = {
'text' => '--i'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -157,10 +157,10 @@ $result_trees{'uref_url'} = {
'text' => '--j'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -168,7 +168,7 @@ $result_trees{'uref_url'} = {
'text' => '--k'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -183,10 +183,10 @@ $result_trees{'uref_url'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -194,7 +194,7 @@ $result_trees{'uref_url'} = {
'text' => '--l'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -214,7 +214,7 @@ $result_trees{'uref_url'} = {
'text' => '--m'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -222,7 +222,7 @@ $result_trees{'uref_url'} = {
'text' => '--n'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -242,7 +242,7 @@ $result_trees{'uref_url'} = {
'text' => '--o'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -250,7 +250,7 @@ $result_trees{'uref_url'} = {
'text' => '--p'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -258,7 +258,7 @@ $result_trees{'uref_url'} = {
'text' => '--q'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
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 52f8d1746e..f0d8060bc4 100644
--- a/tp/t/results/coverage_braces/uref_with_commands_characters.pl
+++ b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
@@ -56,7 +56,7 @@ $result_trees{'uref_with_commands_characters'} = {
'text' => 's\\s p+h#aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -93,7 +93,7 @@ $result_trees{'uref_with_commands_characters'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl
b/tp/t/results/coverage_braces/verb_in_xref.pl
index 9ce9fef8b8..3cc88acadf 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -17,7 +17,7 @@ $result_trees{'verb_in_xref'} = {
'text' => 'point'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -57,7 +57,7 @@ $result_trees{'verb_in_xref'} = {
},
'normalized' => 'point'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -102,7 +102,7 @@ $result_trees{'verb_in_xref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index ce0c573769..16e6f4a0d2 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -68,7 +68,7 @@ $result_trees{'ref_in_def'} = {
},
'normalized' => 'myanchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -106,7 +106,7 @@ $result_trees{'ref_in_def'} = {
},
'normalized' => 'myanchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -144,7 +144,7 @@ $result_trees{'ref_in_def'} = {
},
'normalized' => 'myanchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -185,7 +185,7 @@ $result_trees{'ref_in_def'} = {
},
'normalized' => 'myanchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -223,7 +223,7 @@ $result_trees{'ref_in_def'} = {
},
'normalized' => 'myanchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -286,7 +286,7 @@ $result_trees{'ref_in_def'} = {
},
'normalized' => 'myanchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -324,7 +324,7 @@ $result_trees{'ref_in_def'} = {
},
'normalized' => 'myanchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -362,7 +362,7 @@ $result_trees{'ref_in_def'} = {
},
'normalized' => 'myanchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -403,7 +403,7 @@ $result_trees{'ref_in_def'} = {
},
'normalized' => 'myanchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -441,7 +441,7 @@ $result_trees{'ref_in_def'} = {
},
'normalized' => 'myanchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -553,7 +553,7 @@ $result_trees{'ref_in_def'} = {
'text' => 'myanchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
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 f4bb008864..c0959a43de 100644
--- a/tp/t/results/docbook_tests/between_node_and_section.pl
+++ b/tp/t/results/docbook_tests/between_node_and_section.pl
@@ -180,7 +180,7 @@ $result_trees{'between_node_and_section'} = {
'text' => 'Old name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/float/anchor_in_caption.pl
b/tp/t/results/float/anchor_in_caption.pl
index 6df7fd7e97..16a73ef674 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -161,7 +161,7 @@ $result_trees{'anchor_in_caption'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index 3ed3be0d62..a8eb172d8f 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -722,7 +722,7 @@ $result_trees{'complex_float'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -730,7 +730,7 @@ $result_trees{'complex_float'} = {
'text' => 'xref Text with features'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -869,7 +869,7 @@ $result_trees{'complex_float'} = {
'text' => 'an_url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -1077,7 +1077,7 @@ $result_trees{'complex_float'} = {
'text' => 'Anchor in caption'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1618,7 +1618,7 @@ $result_trees{'complex_float'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1626,7 +1626,7 @@ $result_trees{'complex_float'} = {
'text' => 'xref Text with features caption'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1765,7 +1765,7 @@ $result_trees{'complex_float'} = {
'text' => 'an_url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -1986,7 +1986,7 @@ $result_trees{'complex_float'} = {
'text' => 'an_url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -2875,7 +2875,7 @@ $result_trees{'complex_float'} = {
'text' => 'Anchor in caption 2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -2919,7 +2919,7 @@ $result_trees{'complex_float'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2927,7 +2927,7 @@ $result_trees{'complex_float'} = {
'text' => 'xref Text with features caption'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -3066,7 +3066,7 @@ $result_trees{'complex_float'} = {
'text' => 'an_url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -3264,7 +3264,7 @@ $result_trees{'complex_float'} = {
},
'normalized' => 'text-with-a-lot-of-features'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/float/float_copying.pl
b/tp/t/results/float/float_copying.pl
index 977ac9dcc3..2c7c3cd7f6 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -113,7 +113,7 @@ $result_trees{'float_copying'} = {
'extra' => {
'element_region' =>
'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' =>
'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -236,7 +236,7 @@ $result_trees{'float_copying'} = {
},
'normalized' =>
'Copying-and-floats'
},
- 'type' => 'brace_command_arg'
+ 'type' =>
'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -295,7 +295,7 @@ $result_trees{'float_copying'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl
b/tp/t/results/float/numbering_captions_listoffloats.pl
index b132ce417d..dd5b86fbb9 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -4208,7 +4208,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
},
'normalized' => 'text-in-section'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -4239,7 +4239,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
},
'normalized' => 'text-in-chapter'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -4267,7 +4267,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
},
'normalized' => 'text-with-a-lot-of-features'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -4309,7 +4309,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
},
'normalized' => 'text-with-a-lot-of-features'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -4322,7 +4322,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -4335,7 +4335,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -4376,7 +4376,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -4389,7 +4389,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -4402,7 +4402,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -4415,7 +4415,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -4456,7 +4456,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -4469,7 +4469,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -4482,10 +4482,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -4498,7 +4498,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -4539,7 +4539,7 @@ $result_trees{'numbering_captions_listoffloats'} = {
},
'normalized' => 'label-but-no-type'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/float/ref_to_float.pl
b/tp/t/results/float/ref_to_float.pl
index fc80295075..5238a1b4dd 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -203,7 +203,7 @@ $result_trees{'ref_to_float'} = {
},
'normalized' => 'Label1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -241,7 +241,7 @@ $result_trees{'ref_to_float'} = {
},
'normalized' => 'Label2'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/formats_encodings/accented_character_in_file_name.pl
b/tp/t/results/formats_encodings/accented_character_in_file_name.pl
index 961e59b442..bb4a88920b 100644
--- a/tp/t/results/formats_encodings/accented_character_in_file_name.pl
+++ b/tp/t/results/formats_encodings/accented_character_in_file_name.pl
@@ -349,13 +349,13 @@ $result_trees{'accented_character_in_file_name'} = {
'text' => "an_\x{ef}mage"
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -363,7 +363,7 @@ $result_trees{'accented_character_in_file_name'} = {
'text' => "\x{f6}ld"
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -421,13 +421,13 @@ $result_trees{'accented_character_in_file_name'} = {
'text' => 'mage'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -452,7 +452,7 @@ $result_trees{'accented_character_in_file_name'} = {
'text' => 'ld'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -481,7 +481,7 @@ $result_trees{'accented_character_in_file_name'} = {
'text' => "txt_\x{e7}image"
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -510,13 +510,13 @@ $result_trees{'accented_character_in_file_name'} = {
'text' => "d\x{ee}rectory/im\x{e0}ge"
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -524,7 +524,7 @@ $result_trees{'accented_character_in_file_name'} = {
'text' => "\x{e2}lt"
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -532,7 +532,7 @@ $result_trees{'accented_character_in_file_name'} = {
'text' => ".\x{ea}xt"
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
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 1ee604240f..ca27f95a41 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -2198,7 +2198,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2211,7 +2211,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -2230,7 +2230,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -2249,7 +2249,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -2312,7 +2312,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2325,7 +2325,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -2344,7 +2344,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -2363,7 +2363,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -2432,7 +2432,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2445,7 +2445,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -2470,7 +2470,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -2531,7 +2531,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -2553,7 +2553,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2561,7 +2561,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2569,7 +2569,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2577,7 +2577,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2585,7 +2585,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -3460,7 +3460,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -3479,7 +3479,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -3492,7 +3492,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -3511,10 +3511,10 @@ $result_trees{'at_commands_in_refs'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -3522,7 +3522,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -7156,7 +7156,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7169,7 +7169,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7188,7 +7188,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7207,7 +7207,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7251,7 +7251,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7264,7 +7264,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7283,7 +7283,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7302,7 +7302,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7352,7 +7352,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7365,7 +7365,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7384,7 +7384,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7403,7 +7403,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7476,7 +7476,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7489,7 +7489,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7508,7 +7508,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7527,7 +7527,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7623,7 +7623,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7636,7 +7636,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7661,7 +7661,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7711,7 +7711,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7724,7 +7724,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7749,7 +7749,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7799,7 +7799,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -7821,7 +7821,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7829,7 +7829,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7837,7 +7837,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7845,7 +7845,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7853,7 +7853,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -7929,7 +7929,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -7951,7 +7951,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7959,7 +7959,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7967,7 +7967,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7975,7 +7975,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7983,7 +7983,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -9533,7 +9533,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9552,7 +9552,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9565,7 +9565,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9584,10 +9584,10 @@ $result_trees{'at_commands_in_refs'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9595,7 +9595,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -9639,7 +9639,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9658,7 +9658,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9671,7 +9671,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9690,10 +9690,10 @@ $result_trees{'at_commands_in_refs'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9701,7 +9701,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -9760,7 +9760,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '-_007b-_007d'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -9862,7 +9862,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '-_0021-_002e-_002e-_003f-_0040'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -9972,7 +9972,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '_0040-_007b-_007d-_005c-_0023'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10114,7 +10114,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' =>
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10240,7 +10240,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' =>
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10318,7 +10318,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '_2265-_2264-_2192'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10460,7 +10460,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10570,7 +10570,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '_21d2-_00b0-a-b-_00e5'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10824,7 +10824,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' =>
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11098,7 +11098,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' =>
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11275,7 +11275,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' =>
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11394,7 +11394,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '_0131-_1e14-_1e08'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11520,7 +11520,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11646,7 +11646,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11684,7 +11684,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' =>
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11718,7 +11718,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -11731,7 +11731,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -11750,7 +11750,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -11769,7 +11769,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -11790,7 +11790,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => 'AAA-AAA-BBB'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11849,7 +11849,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -11862,7 +11862,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -11881,7 +11881,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -11900,7 +11900,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -11921,7 +11921,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => 'CCC-CCC-DDD'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11999,7 +11999,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12012,7 +12012,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -12037,7 +12037,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -12056,7 +12056,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' =>
'someone_0040somewher-no_005fexplain_0040there'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12115,7 +12115,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -12137,7 +12137,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12145,7 +12145,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12153,7 +12153,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12161,7 +12161,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12169,7 +12169,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -12191,7 +12191,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => 'f_002d_002dile1-f_002d_002dile'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12246,7 +12246,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '-_0040-_007b_007d-_002e-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12541,7 +12541,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' =>
'cite-asis-in-_0040w-b-in-r-sc-str-t-var-dfn-i'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12734,7 +12734,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' =>
'env-code-option-samp-command-file-C_002dx-ESC'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12789,7 +12789,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => '8_002e27in'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12861,7 +12861,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => 'sansserif-slanted'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12912,7 +12912,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => 'indicateurl'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12984,7 +12984,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' => 'gH-3rd'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -13018,7 +13018,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -13037,7 +13037,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -13050,7 +13050,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -13069,10 +13069,10 @@ $result_trees{'at_commands_in_refs'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -13080,7 +13080,7 @@ $result_trees{'at_commands_in_refs'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -13101,7 +13101,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'normalized' =>
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 f133bd9789..a1985b87ee 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
@@ -2266,7 +2266,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2279,7 +2279,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -2298,7 +2298,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -2317,7 +2317,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -2380,7 +2380,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2393,7 +2393,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -2412,7 +2412,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -2431,7 +2431,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -2500,7 +2500,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2513,7 +2513,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -2538,7 +2538,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -2599,7 +2599,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -2621,7 +2621,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2629,7 +2629,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2637,7 +2637,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2645,7 +2645,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2653,7 +2653,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -3528,7 +3528,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -3547,7 +3547,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -3560,7 +3560,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -3579,10 +3579,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -3590,7 +3590,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -7224,7 +7224,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7237,7 +7237,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7256,7 +7256,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7275,7 +7275,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7319,7 +7319,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7332,7 +7332,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7351,7 +7351,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7370,7 +7370,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7420,7 +7420,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7433,7 +7433,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7452,7 +7452,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7471,7 +7471,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7544,7 +7544,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7557,7 +7557,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7576,7 +7576,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7595,7 +7595,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7691,7 +7691,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7704,7 +7704,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7729,7 +7729,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7779,7 +7779,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7792,7 +7792,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7817,7 +7817,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7867,7 +7867,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -7889,7 +7889,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7897,7 +7897,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7905,7 +7905,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7913,7 +7913,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7921,7 +7921,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -7997,7 +7997,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -8019,7 +8019,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -8027,7 +8027,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -8035,7 +8035,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -8043,7 +8043,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -8051,7 +8051,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -9601,7 +9601,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9620,7 +9620,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9633,7 +9633,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9652,10 +9652,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9663,7 +9663,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -9707,7 +9707,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9726,7 +9726,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9739,7 +9739,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9758,10 +9758,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9769,7 +9769,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -9828,7 +9828,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '-_007b-_007d'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -9930,7 +9930,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '-_0021-_002e-_002e-_003f-_0040'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10040,7 +10040,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '_0040-_007b-_007d-_005c-_0023'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10182,7 +10182,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' =>
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10308,7 +10308,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' =>
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10386,7 +10386,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '_2265-_2264-_2192'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10528,7 +10528,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10638,7 +10638,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '_21d2-_00b0-a-b-_00e5'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10892,7 +10892,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' =>
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11166,7 +11166,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' =>
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11343,7 +11343,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' =>
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11462,7 +11462,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '_0131-_1e14-_1e08'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11588,7 +11588,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11714,7 +11714,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11752,7 +11752,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' =>
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11786,7 +11786,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -11799,7 +11799,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -11818,7 +11818,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -11837,7 +11837,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -11858,7 +11858,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => 'AAA-AAA-BBB'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11917,7 +11917,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -11930,7 +11930,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -11949,7 +11949,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -11968,7 +11968,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -11989,7 +11989,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => 'CCC-CCC-DDD'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12067,7 +12067,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12080,7 +12080,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -12105,7 +12105,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -12124,7 +12124,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' =>
'someone_0040somewher-no_005fexplain_0040there'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12183,7 +12183,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -12205,7 +12205,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12213,7 +12213,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12221,7 +12221,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12229,7 +12229,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12237,7 +12237,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -12259,7 +12259,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => 'f_002d_002dile1-f_002d_002dile'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12314,7 +12314,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '-_0040-_007b_007d-_002e-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12609,7 +12609,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' =>
'cite-asis-in-_0040w-b-in-r-sc-str-t-var-dfn-i'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12802,7 +12802,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' =>
'env-code-option-samp-command-file-C_002dx-ESC'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12857,7 +12857,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => '8_002e27in'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12929,7 +12929,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => 'sansserif-slanted'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12980,7 +12980,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => 'indicateurl'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -13052,7 +13052,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' => 'gH-3rd'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -13086,7 +13086,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -13105,7 +13105,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -13118,7 +13118,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -13137,10 +13137,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -13148,7 +13148,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -13169,7 +13169,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'normalized' =>
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 d9ef0bffc9..b6707d9adc 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
@@ -2266,7 +2266,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2279,7 +2279,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -2298,7 +2298,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -2317,7 +2317,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -2380,7 +2380,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2393,7 +2393,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -2412,7 +2412,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -2431,7 +2431,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -2500,7 +2500,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2513,7 +2513,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -2538,7 +2538,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -2599,7 +2599,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -2621,7 +2621,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2629,7 +2629,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2637,7 +2637,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2645,7 +2645,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -2653,7 +2653,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -3528,7 +3528,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -3547,7 +3547,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -3560,7 +3560,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -3579,10 +3579,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -3590,7 +3590,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -7224,7 +7224,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7237,7 +7237,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7256,7 +7256,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7275,7 +7275,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7319,7 +7319,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7332,7 +7332,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7351,7 +7351,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7370,7 +7370,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -7420,7 +7420,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7433,7 +7433,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7452,7 +7452,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7471,7 +7471,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7544,7 +7544,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7557,7 +7557,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7576,7 +7576,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7595,7 +7595,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -7691,7 +7691,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7704,7 +7704,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7729,7 +7729,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7779,7 +7779,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7792,7 +7792,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7817,7 +7817,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -7867,7 +7867,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -7889,7 +7889,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7897,7 +7897,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7905,7 +7905,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7913,7 +7913,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -7921,7 +7921,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -7997,7 +7997,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -8019,7 +8019,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -8027,7 +8027,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -8035,7 +8035,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -8043,7 +8043,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -8051,7 +8051,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -9601,7 +9601,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9620,7 +9620,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9633,7 +9633,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9652,10 +9652,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9663,7 +9663,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -9707,7 +9707,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9726,7 +9726,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9739,7 +9739,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -9758,10 +9758,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -9769,7 +9769,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -9828,7 +9828,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '-_007b-_007d'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -9930,7 +9930,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '-_0021-_002e-_002e-_003f-_0040'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10040,7 +10040,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '_0040-_007b-_007d-_005c-_0023'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10182,7 +10182,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' =>
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10308,7 +10308,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' =>
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10386,7 +10386,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '_2265-_2264-_2192'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10528,7 +10528,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10638,7 +10638,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '_21d2-_00b0-a-b-_00e5'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -10892,7 +10892,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' =>
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11166,7 +11166,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' =>
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11343,7 +11343,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' =>
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11462,7 +11462,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '_0131-_1e14-_1e08'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11588,7 +11588,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11714,7 +11714,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11752,7 +11752,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' =>
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11786,7 +11786,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -11799,7 +11799,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -11818,7 +11818,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -11837,7 +11837,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -11858,7 +11858,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => 'AAA-AAA-BBB'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -11917,7 +11917,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -11930,7 +11930,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -11949,7 +11949,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'CCC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -11968,7 +11968,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'DDD'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -11989,7 +11989,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => 'CCC-CCC-DDD'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12067,7 +12067,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'somewher'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12080,7 +12080,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -12105,7 +12105,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'there'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -12124,7 +12124,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' =>
'someone_0040somewher-no_005fexplain_0040there'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12183,7 +12183,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'f--ile1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -12205,7 +12205,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12213,7 +12213,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'aze'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12221,7 +12221,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'az'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12229,7 +12229,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'alt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -12237,7 +12237,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'e--xt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -12259,7 +12259,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => 'f_002d_002dile1-f_002d_002dile'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12314,7 +12314,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '-_0040-_007b_007d-_002e-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12609,7 +12609,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' =>
'cite-asis-in-_0040w-b-in-r-sc-str-t-var-dfn-i'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12802,7 +12802,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' =>
'env-code-option-samp-command-file-C_002dx-ESC'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12857,7 +12857,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => '8_002e27in'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12929,7 +12929,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => 'sansserif-slanted'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -12980,7 +12980,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => 'indicateurl'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -13052,7 +13052,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' => 'gH-3rd'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -13086,7 +13086,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'http://somewhere_aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -13105,7 +13105,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -13118,7 +13118,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
@@ -13137,10 +13137,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => '/man.cgi/1/ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -13148,7 +13148,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'text' => 'ls'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -13169,7 +13169,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'normalized' =>
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 047620ee38..a78785d8ee 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
@@ -821,7 +821,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'normalized' =>
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -850,7 +850,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'normalized' => '_00e9'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -879,7 +879,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'normalized' => '_00e0-_00e8-_00f9'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -908,7 +908,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'normalized' =>
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -937,7 +937,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'normalized' => '_00e7'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 5e0f2c6f0d..1ac097de8f 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
@@ -144,7 +144,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'normalized' => '_0104-_0105-_02db-_0118-_0119'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
b/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
index 54217421e2..03d206115f 100644
--- a/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
@@ -821,7 +821,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
},
'normalized' =>
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -850,7 +850,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
},
'normalized' => '_00e9'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -879,7 +879,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
},
'normalized' => '_00e0-_00e8-_00f9'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -908,7 +908,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
},
'normalized' =>
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -937,7 +937,7 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
},
'normalized' => '_00e7'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
b/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
index 2ec608f6be..a39f78d9cd 100644
--- a/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
@@ -821,7 +821,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
},
'normalized' =>
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -850,7 +850,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
},
'normalized' => '_00e9'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -879,7 +879,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
},
'normalized' => '_00e0-_00e8-_00f9'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -908,7 +908,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
},
'normalized' =>
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -937,7 +937,7 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
},
'normalized' => '_00e7'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/formats_encodings/multiple_include_encodings.pl
b/tp/t/results/formats_encodings/multiple_include_encodings.pl
index 1f22f51750..0a682a743b 100644
--- a/tp/t/results/formats_encodings/multiple_include_encodings.pl
+++ b/tp/t/results/formats_encodings/multiple_include_encodings.pl
@@ -976,7 +976,7 @@ $result_trees{'multiple_include_encodings'} = {
},
'normalized' => '_0104-_0105-_02db-_0118-_0119'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/html_tests/U_in_index.pl
b/tp/t/results/html_tests/U_in_index.pl
index ad976b6cd4..144c44e4fa 100644
--- a/tp/t/results/html_tests/U_in_index.pl
+++ b/tp/t/results/html_tests/U_in_index.pl
@@ -144,7 +144,7 @@ $result_trees{'U_in_index'} = {
'text' => '0131'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -201,7 +201,7 @@ $result_trees{'U_in_index'} = {
'text' => '0074'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -258,7 +258,7 @@ $result_trees{'U_in_index'} = {
'text' => '00B5'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
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 016f6840cd..d90793618e 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
@@ -209,7 +209,7 @@ $result_trees{'acronym_in_node_and_section'} = {
'text' => 'GHJ'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -222,7 +222,7 @@ $result_trees{'acronym_in_node_and_section'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -270,7 +270,7 @@ $result_trees{'acronym_in_node_and_section'} = {
'text' => 'GHJ'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -317,7 +317,7 @@ $result_trees{'acronym_in_node_and_section'} = {
'text' => 'GHJ'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -355,7 +355,7 @@ $result_trees{'acronym_in_node_and_section'} = {
'text' => 'GHJ'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
diff --git a/tp/t/results/html_tests/anchor_on_vtable_item.pl
b/tp/t/results/html_tests/anchor_on_vtable_item.pl
index ba4706eaac..319f884e30 100644
--- a/tp/t/results/html_tests/anchor_on_vtable_item.pl
+++ b/tp/t/results/html_tests/anchor_on_vtable_item.pl
@@ -180,7 +180,7 @@ $result_trees{'anchor_on_vtable_item'} = {
'text' => 'label1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -263,7 +263,7 @@ $result_trees{'anchor_on_vtable_item'} = {
'text' => 'label2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -560,7 +560,7 @@ $result_trees{'anchor_on_vtable_item'} = {
},
'normalized' => 'label1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/html_tests/check_htmlxref.pl
b/tp/t/results/html_tests/check_htmlxref.pl
index b0d09297f7..8ce37adbd5 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -160,7 +160,7 @@ $result_trees{'check_htmlxref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -173,7 +173,7 @@ $result_trees{'check_htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -186,7 +186,7 @@ $result_trees{'check_htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -199,7 +199,7 @@ $result_trees{'check_htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -226,7 +226,7 @@ $result_trees{'check_htmlxref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -239,7 +239,7 @@ $result_trees{'check_htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -252,7 +252,7 @@ $result_trees{'check_htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -265,7 +265,7 @@ $result_trees{'check_htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -700,7 +700,7 @@ $result_trees{'check_htmlxref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 d761e36a16..26f57d6149 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
@@ -160,7 +160,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -173,7 +173,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -186,7 +186,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -199,7 +199,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -226,7 +226,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -239,7 +239,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -252,7 +252,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -265,7 +265,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -700,7 +700,7 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/html_tests/check_htmlxref_menu.pl
b/tp/t/results/html_tests/check_htmlxref_menu.pl
index 86aaab1b85..3319fdd41e 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -168,7 +168,7 @@ $result_trees{'check_htmlxref_menu'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -181,7 +181,7 @@ $result_trees{'check_htmlxref_menu'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -194,7 +194,7 @@ $result_trees{'check_htmlxref_menu'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -207,7 +207,7 @@ $result_trees{'check_htmlxref_menu'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -234,7 +234,7 @@ $result_trees{'check_htmlxref_menu'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -247,7 +247,7 @@ $result_trees{'check_htmlxref_menu'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -260,7 +260,7 @@ $result_trees{'check_htmlxref_menu'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -273,7 +273,7 @@ $result_trees{'check_htmlxref_menu'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -708,7 +708,7 @@ $result_trees{'check_htmlxref_menu'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 78b5f100df..51d11c2e83 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
@@ -168,7 +168,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -181,7 +181,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -194,7 +194,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -207,7 +207,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -234,7 +234,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -247,7 +247,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -260,7 +260,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -273,7 +273,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -708,7 +708,7 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/html_tests/command_in_node_redirection.pl
b/tp/t/results/html_tests/command_in_node_redirection.pl
index 90a4fd11cc..dd883302b8 100644
--- a/tp/t/results/html_tests/command_in_node_redirection.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection.pl
@@ -94,7 +94,7 @@ $result_trees{'command_in_node_redirection'} = {
'text' => 'yyyy'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/html_tests/command_in_node_redirection_multiple.pl
b/tp/t/results/html_tests/command_in_node_redirection_multiple.pl
index 6915a3164f..e542ab7c46 100644
--- a/tp/t/results/html_tests/command_in_node_redirection_multiple.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection_multiple.pl
@@ -94,7 +94,7 @@ $result_trees{'command_in_node_redirection_multiple'} = {
'text' => 'yyyy'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -137,7 +137,7 @@ $result_trees{'command_in_node_redirection_multiple'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -180,7 +180,7 @@ $result_trees{'command_in_node_redirection_multiple'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -242,7 +242,7 @@ $result_trees{'command_in_node_redirection_multiple'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git
a/tp/t/results/html_tests/command_in_node_redirection_other_command.pl
b/tp/t/results/html_tests/command_in_node_redirection_other_command.pl
index 024af4361f..a50f8d3fca 100644
--- a/tp/t/results/html_tests/command_in_node_redirection_other_command.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection_other_command.pl
@@ -107,7 +107,7 @@ $result_trees{'command_in_node_redirection_other_command'}
= {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git
a/tp/t/results/html_tests/command_in_node_redirection_same_command.pl
b/tp/t/results/html_tests/command_in_node_redirection_same_command.pl
index 96682b04b4..043a7b0384 100644
--- a/tp/t/results/html_tests/command_in_node_redirection_same_command.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection_same_command.pl
@@ -107,7 +107,7 @@ $result_trees{'command_in_node_redirection_same_command'} =
{
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git
a/tp/t/results/html_tests/command_in_node_redirection_two_commands.pl
b/tp/t/results/html_tests/command_in_node_redirection_two_commands.pl
index 2b8e7154e2..7295a3d4d4 100644
--- a/tp/t/results/html_tests/command_in_node_redirection_two_commands.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection_two_commands.pl
@@ -126,7 +126,7 @@ $result_trees{'command_in_node_redirection_two_commands'} =
{
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/html_tests/commands_in_abbr.pl
b/tp/t/results/html_tests/commands_in_abbr.pl
index 061e9b23eb..052b695d0c 100644
--- a/tp/t/results/html_tests/commands_in_abbr.pl
+++ b/tp/t/results/html_tests/commands_in_abbr.pl
@@ -19,7 +19,7 @@ $result_trees{'commands_in_abbr'} = {
'text' => 'A'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -48,7 +48,7 @@ $result_trees{'commands_in_abbr'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -92,7 +92,7 @@ $result_trees{'commands_in_abbr'} = {
'text' => 'A'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -121,7 +121,7 @@ $result_trees{'commands_in_abbr'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
diff --git a/tp/t/results/html_tests/commands_in_alt.pl
b/tp/t/results/html_tests/commands_in_alt.pl
index 6014c29a90..078ee75f8f 100644
--- a/tp/t/results/html_tests/commands_in_alt.pl
+++ b/tp/t/results/html_tests/commands_in_alt.pl
@@ -17,13 +17,13 @@ $result_trees{'commands_in_alt'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -47,7 +47,7 @@ $result_trees{'commands_in_alt'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -91,13 +91,13 @@ $result_trees{'commands_in_alt'} = {
'text' => 'f--ile'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -121,7 +121,7 @@ $result_trees{'commands_in_alt'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/html_tests/commands_in_email.pl
b/tp/t/results/html_tests/commands_in_email.pl
index 1becbbc9ce..559b11ed74 100644
--- a/tp/t/results/html_tests/commands_in_email.pl
+++ b/tp/t/results/html_tests/commands_in_email.pl
@@ -49,7 +49,7 @@ $result_trees{'commands_in_email'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/html_tests/css_in_node_redirection_page.pl
b/tp/t/results/html_tests/css_in_node_redirection_page.pl
index 8333e680e9..08a76c6b91 100644
--- a/tp/t/results/html_tests/css_in_node_redirection_page.pl
+++ b/tp/t/results/html_tests/css_in_node_redirection_page.pl
@@ -100,7 +100,7 @@ $result_trees{'css_in_node_redirection_page'} = {
'text' => 'spot'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/html_tests/documentdescription.pl
b/tp/t/results/html_tests/documentdescription.pl
index b05fd2b5cc..8b14b1fa13 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -168,7 +168,7 @@ $result_trees{'documentdescription'} = {
'text' => 'body'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/html_tests/end_of_line_in_uref.pl
b/tp/t/results/html_tests/end_of_line_in_uref.pl
index 97bbf79f53..e99c66ef6b 100644
--- a/tp/t/results/html_tests/end_of_line_in_uref.pl
+++ b/tp/t/results/html_tests/end_of_line_in_uref.pl
@@ -26,7 +26,7 @@ $result_trees{'end_of_line_in_uref'} = {
'text' => 'Spelling'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -39,7 +39,7 @@ $result_trees{'end_of_line_in_uref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
diff --git
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
index 16bbb8fd24..4ab87d2147 100644
--- a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
+++ b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
@@ -144,7 +144,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} =
{
'text' => 'fOO'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -388,7 +388,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} =
{
},
'normalized' => 'foo'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -426,7 +426,7 @@ $result_trees{'file_name_case_insensitive_conflict_node'} =
{
},
'normalized' => 'Foo'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
index c1c3ee5183..e0e825c1bf 100644
---
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
+++
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
@@ -144,7 +144,7 @@
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
'text' => 'fOO'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -388,7 +388,7 @@
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
},
'normalized' => 'foo'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -426,7 +426,7 @@
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
},
'normalized' => 'Foo'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
index 7123d2ed62..fa1073ce7c 100644
---
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
+++
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
@@ -182,7 +182,7 @@
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
'text' => 'foo'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -282,7 +282,7 @@
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
'text' => 'Foo'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -404,7 +404,7 @@
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
},
'normalized' => 'foo'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -442,7 +442,7 @@
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
},
'normalized' => 'Foo'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/html_tests/file_name_conflict_with_Top.pl
b/tp/t/results/html_tests/file_name_conflict_with_Top.pl
index 31a96d433f..0ccd9a2587 100644
--- a/tp/t/results/html_tests/file_name_conflict_with_Top.pl
+++ b/tp/t/results/html_tests/file_name_conflict_with_Top.pl
@@ -144,7 +144,7 @@ $result_trees{'file_name_conflict_with_Top'} = {
'text' => 'index'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/html_tests/file_name_conflict_with_section.pl
b/tp/t/results/html_tests/file_name_conflict_with_section.pl
index 03411200a5..41754ad5ab 100644
--- a/tp/t/results/html_tests/file_name_conflict_with_section.pl
+++ b/tp/t/results/html_tests/file_name_conflict_with_section.pl
@@ -73,7 +73,7 @@ $result_trees{'file_name_conflict_with_section'} = {
'text' => 'Chap'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl
b/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl
index 0a8565246a..78cd7ea9d1 100644
--- a/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl
+++ b/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl
@@ -144,7 +144,7 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
'text' => 'myanchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
index 9f82e15788..02953ffff3 100644
--- a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
+++ b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
@@ -78,7 +78,7 @@ $result_trees{'filenameconflictwithnonsplit'} = {
'text' => 'filenameconflictwithnonsplit'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
index 6f04569aee..2a03b96aa7 100644
--- a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
+++ b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
@@ -194,7 +194,7 @@ $result_trees{'filenameconflictwithspecialelement'} = {
'text' => 'filenameconflictwithspecialelement fot'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/html_tests/float_copying.pl
b/tp/t/results/html_tests/float_copying.pl
index 9a72c65adb..ecf48f9a14 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -169,7 +169,7 @@ $result_trees{'float_copying'} = {
'extra' => {
'element_region' =>
'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' =>
'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -295,7 +295,7 @@ $result_trees{'float_copying'} = {
},
'normalized' =>
'Copying-and-floats'
},
- 'type' => 'brace_command_arg'
+ 'type' =>
'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -356,7 +356,7 @@ $result_trees{'float_copying'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -681,7 +681,7 @@ $result_trees{'float_copying'} = {
},
'normalized' => 'public-domain-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -723,7 +723,7 @@ $result_trees{'float_copying'} = {
},
'normalized' => 'public-domain'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -975,7 +975,7 @@ $result_trees{'float_copying'} = {
},
'normalized' => 'public-domain-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1017,7 +1017,7 @@ $result_trees{'float_copying'} = {
},
'normalized' => 'public-domain'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/html_tests/headings_after_lone_nodes.pl
b/tp/t/results/html_tests/headings_after_lone_nodes.pl
index 194f22b19e..6030ca4c99 100644
--- a/tp/t/results/html_tests/headings_after_lone_nodes.pl
+++ b/tp/t/results/html_tests/headings_after_lone_nodes.pl
@@ -256,7 +256,7 @@ $result_trees{'headings_after_lone_nodes'} = {
'text' => 'toto'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/html_tests/image_link_prefix.pl
b/tp/t/results/html_tests/image_link_prefix.pl
index 0e32f392a9..b56c2dffc3 100644
--- a/tp/t/results/html_tests/image_link_prefix.pl
+++ b/tp/t/results/html_tests/image_link_prefix.pl
@@ -17,7 +17,7 @@ $result_trees{'image_link_prefix'} = {
'text' => 'image'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl
b/tp/t/results/html_tests/ref_in_preformatted.pl
index 3f73d45843..f7b9297584 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -174,7 +174,7 @@ $result_trees{'ref_in_preformatted'} = {
},
'normalized' => 'chap-nnn-the-node-name'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 3ecc6b1bbc..bce3c96183 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -286,7 +286,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
},
'normalized' => 'chap'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -361,7 +361,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
},
'normalized' => 'chap'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 1dc1005b8a..cfb3a9c64d 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -293,7 +293,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} =
{
},
'normalized' => 'chap'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -368,7 +368,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} =
{
},
'normalized' => 'chap'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/html_tests/transliterated_names_conflicts.pl
b/tp/t/results/html_tests/transliterated_names_conflicts.pl
index a06afc6962..bab336b089 100644
--- a/tp/t/results/html_tests/transliterated_names_conflicts.pl
+++ b/tp/t/results/html_tests/transliterated_names_conflicts.pl
@@ -246,7 +246,7 @@ $result_trees{'transliterated_names_conflicts'} = [
'text' => "Pr\x{ea}s"
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/html_tests/uref_accented_letter.pl
b/tp/t/results/html_tests/uref_accented_letter.pl
index d9b4185aad..75c3b95552 100644
--- a/tp/t/results/html_tests/uref_accented_letter.pl
+++ b/tp/t/results/html_tests/uref_accented_letter.pl
@@ -51,7 +51,7 @@ $result_trees{'uref_accented_letter'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
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 f156457a88..efc214416a 100644
--- a/tp/t/results/html_tests/uref_accented_letter_ascii.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_ascii.pl
@@ -87,7 +87,7 @@ $result_trees{'uref_accented_letter_ascii'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
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 28bf7fb767..f0eafd1beb 100644
--- a/tp/t/results/html_tests/uref_accented_letter_latin1.pl
+++ b/tp/t/results/html_tests/uref_accented_letter_latin1.pl
@@ -87,7 +87,7 @@ $result_trees{'uref_accented_letter_latin1'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
diff --git a/tp/t/results/htmlxref/htmlxref.pl
b/tp/t/results/htmlxref/htmlxref.pl
index f6ecc439e4..a6fb2af223 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -272,13 +272,13 @@ $result_trees{'htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -291,7 +291,7 @@ $result_trees{'htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -420,13 +420,13 @@ $result_trees{'htmlxref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -434,7 +434,7 @@ $result_trees{'htmlxref'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -568,13 +568,13 @@ $result_trees{'htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -587,7 +587,7 @@ $result_trees{'htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -730,7 +730,7 @@ $result_trees{'htmlxref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -890,13 +890,13 @@ $result_trees{'htmlxref'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -909,7 +909,7 @@ $result_trees{'htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1073,7 +1073,7 @@ $result_trees{'htmlxref'} = {
},
'normalized' =>
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1196,7 +1196,7 @@ $result_trees{'htmlxref'} = {
},
'normalized' =>
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1327,7 +1327,7 @@ $result_trees{'htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1455,7 +1455,7 @@ $result_trees{'htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1777,7 +1777,7 @@ $result_trees{'htmlxref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index dbc9b458af..d8d53dc8f5 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -272,13 +272,13 @@ $result_trees{'htmlxref_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -291,7 +291,7 @@ $result_trees{'htmlxref_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -420,13 +420,13 @@ $result_trees{'htmlxref_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -434,7 +434,7 @@ $result_trees{'htmlxref_nodes'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -568,13 +568,13 @@ $result_trees{'htmlxref_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -587,7 +587,7 @@ $result_trees{'htmlxref_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -730,7 +730,7 @@ $result_trees{'htmlxref_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -890,13 +890,13 @@ $result_trees{'htmlxref_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -909,7 +909,7 @@ $result_trees{'htmlxref_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1073,7 +1073,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'normalized' =>
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1196,7 +1196,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'normalized' =>
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1327,7 +1327,7 @@ $result_trees{'htmlxref_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1455,7 +1455,7 @@ $result_trees{'htmlxref_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1777,7 +1777,7 @@ $result_trees{'htmlxref_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 35be8c88c8..ac5bf056ad 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -272,13 +272,13 @@ $result_trees{'htmlxref_only_mono'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -291,7 +291,7 @@ $result_trees{'htmlxref_only_mono'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -420,13 +420,13 @@ $result_trees{'htmlxref_only_mono'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -434,7 +434,7 @@ $result_trees{'htmlxref_only_mono'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -568,13 +568,13 @@ $result_trees{'htmlxref_only_mono'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -587,7 +587,7 @@ $result_trees{'htmlxref_only_mono'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -730,7 +730,7 @@ $result_trees{'htmlxref_only_mono'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -890,13 +890,13 @@ $result_trees{'htmlxref_only_mono'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -909,7 +909,7 @@ $result_trees{'htmlxref_only_mono'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1073,7 +1073,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'normalized' =>
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1196,7 +1196,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'normalized' =>
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1327,7 +1327,7 @@ $result_trees{'htmlxref_only_mono'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1455,7 +1455,7 @@ $result_trees{'htmlxref_only_mono'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1777,7 +1777,7 @@ $result_trees{'htmlxref_only_mono'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 3827d6f0cd..a2700c2f62 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -272,13 +272,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -291,7 +291,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -420,13 +420,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -434,7 +434,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -568,13 +568,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -587,7 +587,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -730,7 +730,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -890,13 +890,13 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -909,7 +909,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1073,7 +1073,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'normalized' =>
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1196,7 +1196,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'normalized' =>
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1327,7 +1327,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1455,7 +1455,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1777,7 +1777,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index d873c6f0e0..ca01103867 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -272,13 +272,13 @@ $result_trees{'htmlxref_only_split'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -291,7 +291,7 @@ $result_trees{'htmlxref_only_split'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -420,13 +420,13 @@ $result_trees{'htmlxref_only_split'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -434,7 +434,7 @@ $result_trees{'htmlxref_only_split'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -568,13 +568,13 @@ $result_trees{'htmlxref_only_split'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -587,7 +587,7 @@ $result_trees{'htmlxref_only_split'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -730,7 +730,7 @@ $result_trees{'htmlxref_only_split'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -890,13 +890,13 @@ $result_trees{'htmlxref_only_split'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -909,7 +909,7 @@ $result_trees{'htmlxref_only_split'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1073,7 +1073,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'normalized' =>
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1196,7 +1196,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'normalized' =>
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1327,7 +1327,7 @@ $result_trees{'htmlxref_only_split'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1455,7 +1455,7 @@ $result_trees{'htmlxref_only_split'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1777,7 +1777,7 @@ $result_trees{'htmlxref_only_split'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index a448174321..e497195116 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -272,13 +272,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -291,7 +291,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -420,13 +420,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -434,7 +434,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -568,13 +568,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -587,7 +587,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -730,7 +730,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -890,13 +890,13 @@ $result_trees{'htmlxref_only_split_nodes'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -909,7 +909,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1073,7 +1073,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'normalized' =>
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1196,7 +1196,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'normalized' =>
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1327,7 +1327,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1455,7 +1455,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1777,7 +1777,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/include/cpp_lines.pl
b/tp/t/results/include/cpp_lines.pl
index b5aab4969a..ad52c27d7e 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -80,7 +80,7 @@ $result_trees{'cpp_lines'} = {
'text' => 'before top'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -314,7 +314,7 @@ $result_trees{'cpp_lines'} = {
'text' => 'after lacro def'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -337,7 +337,7 @@ $result_trees{'cpp_lines'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -386,7 +386,7 @@ $result_trees{'cpp_lines'} = {
'text' => 'after macro call'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -482,7 +482,7 @@ $result_trees{'cpp_lines'} = {
'text' => 'after macrotwo def'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -505,7 +505,7 @@ $result_trees{'cpp_lines'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -558,7 +558,7 @@ $result_trees{'cpp_lines'} = {
'text' => 'after macrotwo call'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -638,7 +638,7 @@ $result_trees{'cpp_lines'} = {
'text' => 'in'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -677,7 +677,7 @@ $result_trees{'cpp_lines'} = {
'text' => 'after inc'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -749,7 +749,7 @@ $result_trees{'cpp_lines'} = {
'text' => 'after verb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -888,7 +888,7 @@ $result_trees{'cpp_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -906,7 +906,7 @@ $result_trees{'cpp_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -943,7 +943,7 @@ $result_trees{'cpp_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -961,7 +961,7 @@ $result_trees{'cpp_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -998,7 +998,7 @@ $result_trees{'cpp_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1016,7 +1016,7 @@ $result_trees{'cpp_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -1055,7 +1055,7 @@ $result_trees{'cpp_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
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 4369ffdb47..76ce90453e 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
@@ -109,7 +109,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -232,7 +232,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -601,7 +601,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/include/macro_definition_in_include.pl
b/tp/t/results/include/macro_definition_in_include.pl
index 82b890983f..c77a0eeeb9 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -125,7 +125,7 @@ $result_trees{'macro_definition_in_include'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/include/macro_in_early_commands.pl
b/tp/t/results/include/macro_in_early_commands.pl
index 71fe07ec44..4e6605b4ee 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -146,7 +146,7 @@ $result_trees{'macro_in_early_commands'} = {
'text' => 'info'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -189,7 +189,7 @@ $result_trees{'macro_in_early_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -387,7 +387,7 @@ $result_trees{'macro_in_early_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -751,7 +751,7 @@ $result_trees{'macro_in_early_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -816,7 +816,7 @@ $result_trees{'macro_in_early_commands'} = {
'text' => 'info'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl
b/tp/t/results/indices/double_seeentry_seealso.pl
index ef365d347e..dab8fdb2fe 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -156,7 +156,7 @@ $result_trees{'double_seeentry_seealso'} = {
'text' => 'bbb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
@@ -176,7 +176,7 @@ $result_trees{'double_seeentry_seealso'} = {
'text' => 'ccc'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
@@ -226,7 +226,7 @@ $result_trees{'double_seeentry_seealso'} = {
'text' => 'ccc'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -253,7 +253,7 @@ $result_trees{'double_seeentry_seealso'} = {
'text' => 'eee'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -310,7 +310,7 @@ $result_trees{'double_seeentry_seealso'} = {
'text' => 'hhh'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
@@ -330,7 +330,7 @@ $result_trees{'double_seeentry_seealso'} = {
'text' => 'iii'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -381,7 +381,7 @@ $result_trees{'double_seeentry_seealso'} = {
'text' => 'fff'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -414,7 +414,7 @@ $result_trees{'double_seeentry_seealso'} = {
'text' => 'subhhh'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
diff --git a/tp/t/results/indices/explicit_sort_key.pl
b/tp/t/results/indices/explicit_sort_key.pl
index 850899c687..add3a5382f 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -144,7 +144,7 @@ $result_trees{'explicit_sort_key'} = {
'text' => 'A'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -201,7 +201,7 @@ $result_trees{'explicit_sort_key'} = {
'text' => 'B'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -258,7 +258,7 @@ $result_trees{'explicit_sort_key'} = {
'text' => '0'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -322,7 +322,7 @@ $result_trees{'explicit_sort_key'} = {
'text' => 'invalid nesting'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -386,7 +386,7 @@ $result_trees{'explicit_sort_key'} = {
'text' => 'foo'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -412,7 +412,7 @@ $result_trees{'explicit_sort_key'} = {
'text' => 'command'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -467,7 +467,7 @@ $result_trees{'explicit_sort_key'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -494,7 +494,7 @@ $result_trees{'explicit_sort_key'} = {
'text' => 'inside'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -503,7 +503,7 @@ $result_trees{'explicit_sort_key'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'url',
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 ab48ada0fc..559d05b8de 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -242,7 +242,7 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
'text' => '--'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
diff --git a/tp/t/results/indices/index_special_region.pl
b/tp/t/results/indices/index_special_region.pl
index cb37658ca7..7596d4f6a1 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -93,7 +93,7 @@ $result_trees{'index_special_region'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -140,7 +140,7 @@ $result_trees{'index_special_region'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -382,7 +382,7 @@ $result_trees{'index_special_region'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -425,7 +425,7 @@ $result_trees{'index_special_region'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1419,7 +1419,7 @@ $result_trees{'index_special_region'} = {
},
'normalized' => 'Copying-information'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1448,7 +1448,7 @@ $result_trees{'index_special_region'} = {
},
'normalized' => 'Public-domain-reference'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1487,7 +1487,7 @@ $result_trees{'index_special_region'} = {
},
'normalized' => 'Titlepage-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1516,7 +1516,7 @@ $result_trees{'index_special_region'} = {
},
'normalized' => 'Titlepage-footnote-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/indices/index_special_region_no_insertcopying.pl
b/tp/t/results/indices/index_special_region_no_insertcopying.pl
index d9c49ba5fe..8122b4b1fd 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -93,7 +93,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -140,7 +140,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -382,7 +382,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -425,7 +425,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1414,7 +1414,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
},
'normalized' => 'Copying-information'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1443,7 +1443,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
},
'normalized' => 'Public-domain-reference'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1482,7 +1482,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
},
'normalized' => 'Titlepage-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1511,7 +1511,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
},
'normalized' => 'Titlepage-footnote-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
index e4ffb1ae6d..6d463c7d90 100644
---
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
+++
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
@@ -93,7 +93,7 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -140,7 +140,7 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -382,7 +382,7 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -425,7 +425,7 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1414,7 +1414,7 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
},
'normalized' => 'Copying-information'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1443,7 +1443,7 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
},
'normalized' => 'Public-domain-reference'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1482,7 +1482,7 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
},
'normalized' => 'Titlepage-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1511,7 +1511,7 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
},
'normalized' => 'Titlepage-footnote-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
index 70ce3828d8..12e626bbec 100644
---
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
+++
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
@@ -93,7 +93,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -140,7 +140,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -382,7 +382,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -425,7 +425,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1414,7 +1414,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
},
'normalized' => 'Copying-information'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1443,7 +1443,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
},
'normalized' => 'Public-domain-reference'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1482,7 +1482,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
},
'normalized' => 'Titlepage-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1511,7 +1511,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
},
'normalized' => 'Titlepage-footnote-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
index bfd4f762c4..5c34fbe058 100644
---
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
+++
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
@@ -93,7 +93,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -140,7 +140,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -382,7 +382,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -425,7 +425,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1414,7 +1414,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
},
'normalized' => 'Copying-information'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1443,7 +1443,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
},
'normalized' => 'Public-domain-reference'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1482,7 +1482,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
},
'normalized' => 'Titlepage-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1511,7 +1511,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
},
'normalized' => 'Titlepage-footnote-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
index d18211407c..f7f89ae54c 100644
--- a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
@@ -93,7 +93,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} =
{
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -140,7 +140,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'}
= {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -382,7 +382,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'}
= {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -425,7 +425,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'}
= {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1419,7 +1419,7 @@
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
},
'normalized' => 'Copying-information'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1448,7 +1448,7 @@
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
},
'normalized' => 'Public-domain-reference'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1487,7 +1487,7 @@
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
},
'normalized' => 'Titlepage-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1516,7 +1516,7 @@
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
},
'normalized' => 'Titlepage-footnote-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
index 2d409c4633..5ea9525e9a 100644
--- a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
@@ -93,7 +93,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -140,7 +140,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -382,7 +382,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -425,7 +425,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1419,7 +1419,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'}
= {
},
'normalized' => 'Copying-information'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1448,7 +1448,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'}
= {
},
'normalized' => 'Public-domain-reference'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1487,7 +1487,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'}
= {
},
'normalized' => 'Titlepage-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1516,7 +1516,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'}
= {
},
'normalized' => 'Titlepage-footnote-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
index 8d63da0921..771ea835dd 100644
---
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
+++
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
@@ -93,7 +93,7 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -140,7 +140,7 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -382,7 +382,7 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -425,7 +425,7 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1419,7 +1419,7 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
},
'normalized' => 'Copying-information'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1448,7 +1448,7 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
},
'normalized' => 'Public-domain-reference'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1487,7 +1487,7 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
},
'normalized' => 'Titlepage-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1516,7 +1516,7 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
},
'normalized' => 'Titlepage-footnote-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 08281fd2e7..b049625f9f 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
@@ -145,7 +145,7 @@
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
'text' => 'A---S'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -171,7 +171,7 @@
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
'text' => 'other second'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
@@ -198,7 +198,7 @@
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
'text' => 'toto'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -256,7 +256,7 @@
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
'text' => 'BB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -319,7 +319,7 @@
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
'text' => 'something else'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index fabb7c04cc..37b0e6193e 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -156,7 +156,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
'text' => 'sss'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -213,7 +213,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
'text' => '123'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -275,7 +275,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
'text' => 'yyy'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
@@ -332,7 +332,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
'text' => 'ttt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
@@ -394,7 +394,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
'text' => 'also'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -451,7 +451,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
'text' => 'entry'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl
b/tp/t/results/indices/same_seealso_seeentry.pl
index e8184d5d0a..a57c7f3480 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -156,7 +156,7 @@ $result_trees{'same_seealso_seeentry'} = {
'text' => 'sss'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -213,7 +213,7 @@ $result_trees{'same_seealso_seeentry'} = {
'text' => '123'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -275,7 +275,7 @@ $result_trees{'same_seealso_seeentry'} = {
'text' => 'yyy'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
@@ -332,7 +332,7 @@ $result_trees{'same_seealso_seeentry'} = {
'text' => 'ttt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
@@ -394,7 +394,7 @@ $result_trees{'same_seealso_seeentry'} = {
'text' => 'also'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -451,7 +451,7 @@ $result_trees{'same_seealso_seeentry'} = {
'text' => 'entry'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
diff --git a/tp/t/results/indices/seealso_duplicate.pl
b/tp/t/results/indices/seealso_duplicate.pl
index afa92e6624..daf71056a8 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -210,7 +210,7 @@ $result_trees{'seealso_duplicate'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -344,7 +344,7 @@ $result_trees{'seealso_duplicate'} = {
'text' => 'Another entry'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 4a5d842b72..4a51546f6f 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -146,7 +146,7 @@ $result_trees{'seeentry'} = {
'text' => 'bbb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
@@ -196,7 +196,7 @@ $result_trees{'seeentry'} = {
'text' => 'ccc'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -265,7 +265,7 @@ $result_trees{'seeentry'} = {
'text' => 'f---bbb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seeentry',
@@ -315,7 +315,7 @@ $result_trees{'seeentry'} = {
'text' => 'f---ccc'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
diff --git a/tp/t/results/indices/sorted_subentries.pl
b/tp/t/results/indices/sorted_subentries.pl
index 33fd85a3fc..2c5367e330 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -1252,7 +1252,7 @@ $result_trees{'sorted_subentries'} = {
'text' => 'jjj'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1260,7 +1260,7 @@ $result_trees{'sorted_subentries'} = {
'text' => 'mymail'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -1430,7 +1430,7 @@ $result_trees{'sorted_subentries'} = {
'text' => 'A'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
diff --git a/tp/t/results/indices/subentry_and_sortas.pl
b/tp/t/results/indices/subentry_and_sortas.pl
index 9436374532..a6ca614a1e 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -146,7 +146,7 @@ $result_trees{'subentry_and_sortas'} = {
'text' => 'A---S'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -183,7 +183,7 @@ $result_trees{'subentry_and_sortas'} = {
'text' => 'B---S1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -260,7 +260,7 @@ $result_trees{'subentry_and_sortas'} = {
'text' => 'X---S'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -297,7 +297,7 @@ $result_trees{'subentry_and_sortas'} = {
'text' => 'X---S1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index 16e27ead55..8a14552b91 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -146,7 +146,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
'text' => 'A---S'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -178,7 +178,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
'text' => 'C---S1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -262,7 +262,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
'text' => 'B---S1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -355,7 +355,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
'text' => 'D'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
diff --git a/tp/t/results/info_tests/anchor_and_spaces.pl
b/tp/t/results/info_tests/anchor_and_spaces.pl
index 0192a0f1c4..a15514a497 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -68,7 +68,7 @@ $result_trees{'anchor_and_spaces'} = {
'text' => 'anchor 0'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -103,7 +103,7 @@ $result_trees{'anchor_and_spaces'} = {
'text' => 'anchor1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -140,7 +140,7 @@ $result_trees{'anchor_and_spaces'} = {
'text' => 'anchor2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/info_tests/anchor_in_command.pl
b/tp/t/results/info_tests/anchor_in_command.pl
index 2b827c2406..5021996821 100644
--- a/tp/t/results/info_tests/anchor_in_command.pl
+++ b/tp/t/results/info_tests/anchor_in_command.pl
@@ -105,7 +105,7 @@ $result_trees{'anchor_in_command'} = {
'text' => 'anchor in emph'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
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 b0945db1a0..d58fc8138a 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -34,7 +34,7 @@ $result_trees{'before_node_and_section'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -121,7 +121,7 @@ $result_trees{'before_node_and_section'} = {
'text' => 'anchor1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -370,7 +370,7 @@ $result_trees{'before_node_and_section'} = {
},
'normalized' => 'anchor1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/info_tests/center_flush.pl
b/tp/t/results/info_tests/center_flush.pl
index d25daaf260..591c3953bc 100644
--- a/tp/t/results/info_tests/center_flush.pl
+++ b/tp/t/results/info_tests/center_flush.pl
@@ -124,7 +124,7 @@ $result_trees{'center_flush'} = {
'text' => 'anchor in flushleft'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -271,7 +271,7 @@ $result_trees{'center_flush'} = {
'text' => 'anchor in flushright'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -303,7 +303,7 @@ $result_trees{'center_flush'} = {
'text' => 'second anchor in flushright'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/info_tests/def_in_copying.pl
b/tp/t/results/info_tests/def_in_copying.pl
index fc90cf6bdf..10e649e7b4 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -164,7 +164,7 @@ $result_trees{'def_in_copying'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -459,7 +459,7 @@ $result_trees{'def_in_copying'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/info_tests/empty_arguments.pl
b/tp/t/results/info_tests/empty_arguments.pl
index ee672f6199..bd87b1200e 100644
--- a/tp/t/results/info_tests/empty_arguments.pl
+++ b/tp/t/results/info_tests/empty_arguments.pl
@@ -34,10 +34,10 @@ $result_trees{'empty_arguments'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
@@ -57,10 +57,10 @@ $result_trees{'empty_arguments'} = {
'text' => 'a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
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 5e3fc411c7..48d7deb542 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
@@ -325,7 +325,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
'text' => ' p'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -559,7 +559,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
},
'normalized' => 'chap-f-nl-Something_003f-After-punct'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -605,7 +605,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
},
'normalized' => 'ankh-p'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -651,7 +651,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
},
'normalized' => 'ankh-p'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -670,7 +670,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/info_tests/file_only_png.pl
b/tp/t/results/info_tests/file_only_png.pl
index 40d0180772..5d5ca31574 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/image_and_punctuation.pl
b/tp/t/results/info_tests/image_and_punctuation.pl
index 6a621c4456..368375b420 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 82485f2b65..1713ffda91 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -42,7 +42,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -64,7 +64,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -86,7 +86,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -108,7 +108,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -130,7 +130,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -152,7 +152,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -174,7 +174,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -207,7 +207,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -229,7 +229,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -251,7 +251,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -273,7 +273,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -295,7 +295,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -317,7 +317,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -339,7 +339,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -375,7 +375,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -397,7 +397,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -419,7 +419,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -441,7 +441,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -463,7 +463,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -485,7 +485,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -507,7 +507,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -543,7 +543,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -579,7 +579,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -615,7 +615,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -637,7 +637,7 @@ $result_trees{'image_and_spaces_formatting'} = {
'text' => 'words'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/info_tests/image_extension.pl
b/tp/t/results/info_tests/image_extension.pl
index 4377094790..ef76230f88 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 da8808c0bd..1257cb4d22 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 55e8a9f981..4da6bc2eaf 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -37,7 +37,7 @@ $result_trees{'image_not_found'} = {
'text' => 'n_f_image'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/info_tests/image_quotes.pl
b/tp/t/results/info_tests/image_quotes.pl
index fb891a5695..eca7bfade9 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 c6374fec18..d757499719 100644
--- a/tp/t/results/info_tests/image_text_encoded.pl
+++ b/tp/t/results/info_tests/image_text_encoded.pl
@@ -53,7 +53,7 @@ $result_trees{'image_text_encoded'} = {
'text' => 'image_encoded'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/info_tests/image_text_file_only_and_alt.pl
b/tp/t/results/info_tests/image_text_file_only_and_alt.pl
index f3b1c48a76..41d770f817 100644
Binary files a/tp/t/results/info_tests/image_text_file_only_and_alt.pl and
b/tp/t/results/info_tests/image_text_file_only_and_alt.pl differ
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 dced3206a9..80d5e65bbe 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
@@ -485,7 +485,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
},
'normalized' => 'nodename_002e-a'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -511,7 +511,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -554,7 +554,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
},
'normalized' => 'node_002ccomma'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -567,7 +567,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -608,7 +608,7 @@ $result_trees{'invalid_node_name_no_warning'} = {
},
'normalized' => 'bidule_003a'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 f920f1e125..4c3e553648 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -485,7 +485,7 @@ $result_trees{'invalid_node_name_warning'} = {
},
'normalized' => 'nodename_002e-a'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -511,7 +511,7 @@ $result_trees{'invalid_node_name_warning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -554,7 +554,7 @@ $result_trees{'invalid_node_name_warning'} = {
},
'normalized' => 'node_002ccomma'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -567,7 +567,7 @@ $result_trees{'invalid_node_name_warning'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -608,7 +608,7 @@ $result_trees{'invalid_node_name_warning'} = {
},
'normalized' => 'bidule_003a'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 2586ed0abb..027230ff1c 100644
--- a/tp/t/results/info_tests/multiline_image_and_align.pl
+++ b/tp/t/results/info_tests/multiline_image_and_align.pl
@@ -21,7 +21,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -72,7 +72,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -123,7 +123,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -174,7 +174,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -241,7 +241,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -277,7 +277,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -299,7 +299,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -336,7 +336,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -406,7 +406,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -414,7 +414,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -422,7 +422,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -430,7 +430,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -438,7 +438,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'txt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -489,7 +489,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -497,7 +497,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -505,7 +505,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -513,7 +513,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -521,7 +521,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'txt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -572,7 +572,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -580,7 +580,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -588,7 +588,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -596,7 +596,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -604,7 +604,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'txt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -655,7 +655,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -663,7 +663,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -671,7 +671,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -679,7 +679,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -687,7 +687,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'txt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -754,7 +754,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -762,7 +762,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -770,7 +770,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -778,7 +778,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -786,7 +786,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'txt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -822,7 +822,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -830,7 +830,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -838,7 +838,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -846,7 +846,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -854,7 +854,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'txt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -876,7 +876,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -884,7 +884,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -892,7 +892,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -900,7 +900,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -908,7 +908,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'txt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -945,7 +945,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -953,7 +953,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -961,7 +961,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -969,7 +969,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -977,7 +977,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'txt'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
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 604b687b44..e951988aeb 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
@@ -286,7 +286,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
'text' => 'anchor in multitable'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -647,7 +647,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
'text' => 'mark'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -801,7 +801,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
},
'normalized' => 'mark'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -829,7 +829,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
},
'normalized' => 'anchor-in-multitable'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 ba4b007b6d..7936aa7943 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -175,7 +175,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
'text' => 'mark inside'
}
],
- 'type' => 'brace_command_arg'
+ 'type' =>
'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -378,7 +378,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
'text' => 'mark'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -554,7 +554,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
},
'normalized' => 'mark'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -582,7 +582,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
},
'normalized' => 'mark-inside'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/info_tests/novalidate_empty_refs.pl
b/tp/t/results/info_tests/novalidate_empty_refs.pl
index d35922e737..ff1480a85d 100644
--- a/tp/t/results/info_tests/novalidate_empty_refs.pl
+++ b/tp/t/results/info_tests/novalidate_empty_refs.pl
@@ -76,7 +76,7 @@ $result_trees{'novalidate_empty_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -117,7 +117,7 @@ $result_trees{'novalidate_empty_refs'} = {
},
'normalized' => '-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/info_tests/one_node_counted_elements.pl
b/tp/t/results/info_tests/one_node_counted_elements.pl
index d915216c00..d3144c73ba 100644
--- a/tp/t/results/info_tests/one_node_counted_elements.pl
+++ b/tp/t/results/info_tests/one_node_counted_elements.pl
@@ -170,7 +170,7 @@ $result_trees{'one_node_counted_elements'} = {
'text' => 'ref'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -325,7 +325,7 @@ $result_trees{'one_node_counted_elements'} = {
},
'normalized' => 'ref'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/info_tests/pxref_test.pl
b/tp/t/results/info_tests/pxref_test.pl
index 5ea3ebdcf1..256a67623c 100644
--- a/tp/t/results/info_tests/pxref_test.pl
+++ b/tp/t/results/info_tests/pxref_test.pl
@@ -71,7 +71,7 @@ $result_trees{'pxref_test'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -114,7 +114,7 @@ $result_trees{'pxref_test'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -127,7 +127,7 @@ $result_trees{'pxref_test'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -171,7 +171,7 @@ $result_trees{'pxref_test'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -214,7 +214,7 @@ $result_trees{'pxref_test'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -227,7 +227,7 @@ $result_trees{'pxref_test'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
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 f806e2ffb3..4cbbdd7fe7 100644
--- a/tp/t/results/info_tests/quote_node_names_info.pl
+++ b/tp/t/results/info_tests/quote_node_names_info.pl
@@ -84,7 +84,7 @@ $result_trees{'quote_node_names_info'} = {
},
'normalized' => 'normal-node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -97,7 +97,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -126,7 +126,7 @@ $result_trees{'quote_node_names_info'} = {
},
'normalized' => 'normal-node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -139,7 +139,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -178,7 +178,7 @@ $result_trees{'quote_node_names_info'} = {
},
'normalized' => 'blah_003ablah'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -191,7 +191,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -220,7 +220,7 @@ $result_trees{'quote_node_names_info'} = {
},
'normalized' => 'blah_003ablah'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -233,7 +233,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -272,7 +272,7 @@ $result_trees{'quote_node_names_info'} = {
},
'normalized' => 'blumpty_002efump'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -285,7 +285,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -314,7 +314,7 @@ $result_trees{'quote_node_names_info'} = {
},
'normalized' => 'blumpty_002efump'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -327,7 +327,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -366,7 +366,7 @@ $result_trees{'quote_node_names_info'} = {
},
'normalized' => 'blah_003ablah'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -419,7 +419,7 @@ $result_trees{'quote_node_names_info'} = {
},
'normalized' => 'secret_002cnode'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -461,7 +461,7 @@ $result_trees{'quote_node_names_info'} = {
},
'normalized' => 'blah_003ablah'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -499,13 +499,13 @@ $result_trees{'quote_node_names_info'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -513,7 +513,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => 'man_ual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -521,7 +521,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => 'Book Title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -559,13 +559,13 @@ $result_trees{'quote_node_names_info'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -573,7 +573,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => 'man_ual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -581,7 +581,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => 'Book Title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -619,10 +619,10 @@ $result_trees{'quote_node_names_info'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -635,7 +635,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -648,7 +648,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -656,7 +656,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => 'Book Title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -694,10 +694,10 @@ $result_trees{'quote_node_names_info'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -710,7 +710,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -723,7 +723,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -731,7 +731,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => 'Book Title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -769,10 +769,10 @@ $result_trees{'quote_node_names_info'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -785,7 +785,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -798,7 +798,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -811,7 +811,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -849,10 +849,10 @@ $result_trees{'quote_node_names_info'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -865,7 +865,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -878,7 +878,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -891,7 +891,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -929,10 +929,10 @@ $result_trees{'quote_node_names_info'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -945,7 +945,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -958,7 +958,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -971,7 +971,7 @@ $result_trees{'quote_node_names_info'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/info_tests/ref_tests.pl
b/tp/t/results/info_tests/ref_tests.pl
index c45da89b70..05ae75c217 100644
--- a/tp/t/results/info_tests/ref_tests.pl
+++ b/tp/t/results/info_tests/ref_tests.pl
@@ -72,7 +72,7 @@ $result_trees{'ref_tests'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -113,7 +113,7 @@ $result_trees{'ref_tests'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -158,7 +158,7 @@ $result_trees{'ref_tests'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -223,7 +223,7 @@ $result_trees{'ref_tests'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -236,7 +236,7 @@ $result_trees{'ref_tests'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -277,7 +277,7 @@ $result_trees{'ref_tests'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -290,7 +290,7 @@ $result_trees{'ref_tests'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -335,7 +335,7 @@ $result_trees{'ref_tests'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -348,7 +348,7 @@ $result_trees{'ref_tests'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -398,7 +398,7 @@ $result_trees{'ref_tests'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -411,7 +411,7 @@ $result_trees{'ref_tests'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/info_tests/test_index.pl
b/tp/t/results/info_tests/test_index.pl
index 93df70ef0d..a9b54647bf 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -83,7 +83,7 @@ $result_trees{'test_index'} = {
},
'normalized' => 'a-counting-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -2816,7 +2816,7 @@ $result_trees{'test_index'} = {
'text' => 'a counting anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/info_tests/top_node_normalization.pl
b/tp/t/results/info_tests/top_node_normalization.pl
index b27e203cbf..02d90c3c34 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -52,7 +52,7 @@ $result_trees{'top_node_normalization'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -79,7 +79,7 @@ $result_trees{'top_node_normalization'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/info_tests/xref_test.pl
b/tp/t/results/info_tests/xref_test.pl
index d2ddb3cd38..17ae4996fd 100644
--- a/tp/t/results/info_tests/xref_test.pl
+++ b/tp/t/results/info_tests/xref_test.pl
@@ -72,7 +72,7 @@ $result_trees{'xref_test'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -112,7 +112,7 @@ $result_trees{'xref_test'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -157,7 +157,7 @@ $result_trees{'xref_test'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -207,7 +207,7 @@ $result_trees{'xref_test'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -220,7 +220,7 @@ $result_trees{'xref_test'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -261,7 +261,7 @@ $result_trees{'xref_test'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/init_files_tests/documentation_examples.pl
b/tp/t/results/init_files_tests/documentation_examples.pl
index 9084265a99..d9f9da340f 100644
--- a/tp/t/results/init_files_tests/documentation_examples.pl
+++ b/tp/t/results/init_files_tests/documentation_examples.pl
@@ -39,7 +39,7 @@ $result_trees{'documentation_examples'} = {
'text' => 'example.com'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -52,7 +52,7 @@ $result_trees{'documentation_examples'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -350,7 +350,7 @@ $result_trees{'documentation_examples'} = {
},
'normalized' => 'my-node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -424,7 +424,7 @@ $result_trees{'documentation_examples'} = {
'text' => 'b.c'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -437,7 +437,7 @@ $result_trees{'documentation_examples'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -672,7 +672,7 @@ $result_trees{'documentation_examples'} = {
'text' => 'example'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -792,7 +792,7 @@ $result_trees{'documentation_examples'} = {
'text' => 'display'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
b/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
index 5511f3efad..e2d8dfb271 100644
--- a/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
+++ b/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
@@ -39,7 +39,7 @@ $result_trees{'documentation_examples_texi2html'} = {
'text' => 'example.com'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -52,7 +52,7 @@ $result_trees{'documentation_examples_texi2html'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -350,7 +350,7 @@ $result_trees{'documentation_examples_texi2html'} = {
},
'normalized' => 'my-node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -424,7 +424,7 @@ $result_trees{'documentation_examples_texi2html'} = {
'text' => 'b.c'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -437,7 +437,7 @@ $result_trees{'documentation_examples_texi2html'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -672,7 +672,7 @@ $result_trees{'documentation_examples_texi2html'} = {
'text' => 'example'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -792,7 +792,7 @@ $result_trees{'documentation_examples_texi2html'} = {
'text' => 'display'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/invalid_nestings/accents.pl
b/tp/t/results/invalid_nestings/accents.pl
index 835897bafa..e7df658b04 100644
--- a/tp/t/results/invalid_nestings/accents.pl
+++ b/tp/t/results/invalid_nestings/accents.pl
@@ -120,7 +120,7 @@ $result_trees{'accents'} = {
'text' => 'truc'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/invalid_nestings/center.pl
b/tp/t/results/invalid_nestings/center.pl
index 3e1446fb23..9a94b34cbb 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -51,7 +51,7 @@ $result_trees{'center'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index 5b576fbe54..06d0aabcaa 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -44,7 +44,7 @@ $result_trees{'footnote_in_ref'} = {
'text' => 'first'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -96,7 +96,7 @@ $result_trees{'footnote_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 076fcda689..6fd15b32d7 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -52,7 +52,7 @@ $result_trees{'ignore_in_xref'} = {
},
'normalized' => 'first'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -117,7 +117,7 @@ $result_trees{'ignore_in_xref'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl
b/tp/t/results/invalid_nestings/in_errormsg.pl
index 9f01ab9c82..bab523a266 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -22,7 +22,7 @@ $result_trees{'in_errormsg'} = {
'text' => 'in ref'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -56,7 +56,7 @@ $result_trees{'in_errormsg'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -88,7 +88,7 @@ $result_trees{'in_errormsg'} = {
},
'normalized' => 'in-ref'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -97,7 +97,7 @@ $result_trees{'in_errormsg'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'errormsg',
@@ -126,7 +126,7 @@ $result_trees{'in_errormsg'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'errormsg',
diff --git a/tp/t/results/invalid_nestings/in_table.pl
b/tp/t/results/invalid_nestings/in_table.pl
index f78a3dd174..3e230a9db3 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -212,7 +212,7 @@ $result_trees{'in_table'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -351,10 +351,10 @@ $result_trees{'in_table'} = {
'text' => 'Top'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -368,7 +368,7 @@ $result_trees{'in_table'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl
b/tp/t/results/invalid_nestings/item_in_ref.pl
index 634e6621b4..1d08f73349 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -92,10 +92,10 @@ $result_trees{'item_in_ref'} = {
'text' => 'Top'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -109,7 +109,7 @@ $result_trees{'item_in_ref'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 442a1880e6..56ff8c8fea 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -23,7 +23,7 @@ $result_trees{'on_block_command_line'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -212,7 +212,7 @@ $result_trees{'on_block_command_line'} = {
'text' => 'in quotation anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl
b/tp/t/results/invalid_nestings/on_def_line.pl
index 3ca7a028da..e107afa136 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -28,7 +28,7 @@ $result_trees{'on_def_line'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -191,7 +191,7 @@ $result_trees{'on_def_line'} = {
'text' => 'in anchorx'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
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 1d283f77c5..69c1ab9ea1 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -51,7 +51,7 @@ $result_trees{'on_index_entry_line'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index 416ad79624..e49d3798fa 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -51,7 +51,7 @@ $result_trees{'on_itemize_line'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/invalid_nestings/on_node_line.pl
b/tp/t/results/invalid_nestings/on_node_line.pl
index 4e8eb190e2..6e5e0ab056 100644
--- a/tp/t/results/invalid_nestings/on_node_line.pl
+++ b/tp/t/results/invalid_nestings/on_node_line.pl
@@ -29,7 +29,7 @@ $result_trees{'on_node_line'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -42,7 +42,7 @@ $result_trees{'on_node_line'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -55,7 +55,7 @@ $result_trees{'on_node_line'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -68,7 +68,7 @@ $result_trees{'on_node_line'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -113,7 +113,7 @@ $result_trees{'on_node_line'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -135,7 +135,7 @@ $result_trees{'on_node_line'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl
b/tp/t/results/invalid_nestings/on_section_line.pl
index 261303a572..0362aed852 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -55,7 +55,7 @@ $result_trees{'on_section_line'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/invalid_nestings/on_subheading_line.pl
b/tp/t/results/invalid_nestings/on_subheading_line.pl
index 5aec50ff11..fee379a585 100644
--- a/tp/t/results/invalid_nestings/on_subheading_line.pl
+++ b/tp/t/results/invalid_nestings/on_subheading_line.pl
@@ -54,7 +54,7 @@ $result_trees{'on_subheading_line'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index 7d20478d25..8c21293b9c 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -44,7 +44,7 @@ $result_trees{'quotation_in_ref'} = {
'text' => 'first'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -53,7 +53,7 @@ $result_trees{'quotation_in_ref'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/invalid_nestings/ref_in_ref.pl
b/tp/t/results/invalid_nestings/ref_in_ref.pl
index 2a164cebd6..22603c6fe6 100644
--- a/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -51,7 +51,7 @@ $result_trees{'ref_in_ref'} = {
},
'normalized' => 'first'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -68,7 +68,7 @@ $result_trees{'ref_in_ref'} = {
},
'normalized' => 'first'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl
b/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl
index bd03bc3024..685239eeaf 100644
--- a/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl
+++ b/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl
@@ -52,7 +52,7 @@ $result_trees{'ref_to_top_in_anchor'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -61,7 +61,7 @@ $result_trees{'ref_to_top_in_anchor'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 79e5cb9455..65ad2555a5 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -44,7 +44,7 @@ $result_trees{'verbatim_in_ref'} = {
'text' => 'first'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -53,7 +53,7 @@ $result_trees{'verbatim_in_ref'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/languages/documentlanguage.pl
b/tp/t/results/languages/documentlanguage.pl
index 001741fa72..49f4da3ff6 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -396,7 +396,7 @@ $result_trees{'documentlanguage'} = {
},
'normalized' => 'chapter'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/languages/documentlanguage_option.pl
b/tp/t/results/languages/documentlanguage_option.pl
index c358b850a7..3e6ab3b7f9 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -396,7 +396,7 @@ $result_trees{'documentlanguage_option'} = {
},
'normalized' => 'chapter'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl
b/tp/t/results/languages/documentlanguage_unknown.pl
index 28138d2ee3..6c78811abe 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -396,7 +396,7 @@ $result_trees{'documentlanguage_unknown'} = {
},
'normalized' => 'chapter'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl
b/tp/t/results/languages/multiple_lang_chapters.pl
index fed41351d9..b2b5e7638f 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -683,7 +683,7 @@ $result_trees{'multiple_lang_chapters'} = {
},
'normalized' => 'chapter-ja'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1035,7 +1035,7 @@ $result_trees{'multiple_lang_chapters'} = {
},
'normalized' => 'chapter-ja'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1801,7 +1801,7 @@ $result_trees{'multiple_lang_chapters'} = {
},
'normalized' => 'chapter-ja'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index c509828c94..1c3bcc84fe 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -683,7 +683,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
},
'normalized' => 'chapter-ja'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1035,7 +1035,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
},
'normalized' => 'chapter-ja'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1801,7 +1801,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
},
'normalized' => 'chapter-ja'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 1d402a3e1a..67956e5691 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -652,7 +652,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
},
'normalized' => 'chapter-ja'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1004,7 +1004,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
},
'normalized' => 'chapter-ja'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1770,7 +1770,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
},
'normalized' => 'chapter-ja'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/languages/unknown_language.pl
b/tp/t/results/languages/unknown_language.pl
index 7fb12260e1..409cd79cfb 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -194,7 +194,7 @@ $result_trees{'unknown_language'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -270,7 +270,7 @@ $result_trees{'unknown_language'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/latex_tests/anchor_before_top.pl
b/tp/t/results/latex_tests/anchor_before_top.pl
index 8c1f8fc386..fab3749c5f 100644
--- a/tp/t/results/latex_tests/anchor_before_top.pl
+++ b/tp/t/results/latex_tests/anchor_before_top.pl
@@ -30,7 +30,7 @@ $result_trees{'anchor_before_top'} = {
'text' => 'a before Top'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -194,7 +194,7 @@ $result_trees{'anchor_before_top'} = {
},
'normalized' => 'a-before-Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
diff --git a/tp/t/results/latex_tests/anchor_in_copying.pl
b/tp/t/results/latex_tests/anchor_in_copying.pl
index f34a08147f..abb437b515 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -41,7 +41,7 @@ $result_trees{'anchor_in_copying'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -245,7 +245,7 @@ $result_trees{'anchor_in_copying'} = {
},
'normalized' => 'a-in-copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
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 6e5d9029bf..4e670eda96 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
@@ -41,7 +41,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -245,7 +245,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
},
'normalized' => 'a-in-copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -302,7 +302,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
},
'normalized' => 'a-in-copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
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 a80ddef90b..02e0eabba4 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
@@ -41,7 +41,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -167,7 +167,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'}
= {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -383,7 +383,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'}
= {
},
'normalized' => 'a-in-copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -411,7 +411,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'}
= {
},
'normalized' => 'a-in-titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
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 a57a71d053..5beadc6827 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
@@ -41,7 +41,7 @@
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -355,7 +355,7 @@
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
},
'normalized' => 'a-in-copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
@@ -412,7 +412,7 @@
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
},
'normalized' => 'a-in-copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
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 628c046a2d..005b6cfab4 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -53,7 +53,7 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}
= {
'text' => 'anch: in node before'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -161,7 +161,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
'text' => 'anch: in node top'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -235,7 +235,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
'text' => 'anch: in node after'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -343,7 +343,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
'text' => 'anch: in chap'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -418,7 +418,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
},
'normalized' => 'anch_003a-in-node-before'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -446,7 +446,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
},
'normalized' => 'anch_003a-in-node-top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -474,7 +474,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
},
'normalized' => 'anch_003a-in-node-after'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -502,7 +502,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
},
'normalized' => 'anch_003a-in-chap'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -572,7 +572,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
},
'normalized' => 'anch_003a-in-node-before'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -600,7 +600,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
},
'normalized' => 'anch_003a-in-node-top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -628,7 +628,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
},
'normalized' => 'anch_003a-in-node-after'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -656,7 +656,7 @@
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
},
'normalized' => 'anch_003a-in-chap'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/latex_tests/float_and_refs.pl
b/tp/t/results/latex_tests/float_and_refs.pl
index 1b9edea5ab..d6e69a81a7 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -636,7 +636,7 @@ $result_trees{'float_and_refs'} = {
},
'normalized' => 'no-type'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -664,7 +664,7 @@ $result_trees{'float_and_refs'} = {
},
'normalized' => 'no-type'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -677,7 +677,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -705,7 +705,7 @@ $result_trees{'float_and_refs'} = {
},
'normalized' => 'no-type'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -718,7 +718,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -731,7 +731,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -758,7 +758,7 @@ $result_trees{'float_and_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -771,7 +771,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -784,7 +784,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -797,7 +797,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -824,7 +824,7 @@ $result_trees{'float_and_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -837,7 +837,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -850,7 +850,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -863,7 +863,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -876,7 +876,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -914,7 +914,7 @@ $result_trees{'float_and_refs'} = {
},
'normalized' => 'with-type'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -942,7 +942,7 @@ $result_trees{'float_and_refs'} = {
},
'normalized' => 'with-type'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -955,7 +955,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -983,7 +983,7 @@ $result_trees{'float_and_refs'} = {
},
'normalized' => 'with-type'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -996,7 +996,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1009,7 +1009,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1036,7 +1036,7 @@ $result_trees{'float_and_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1049,7 +1049,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1062,7 +1062,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1075,7 +1075,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1102,7 +1102,7 @@ $result_trees{'float_and_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1115,7 +1115,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1128,7 +1128,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1141,7 +1141,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1154,7 +1154,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1192,7 +1192,7 @@ $result_trees{'float_and_refs'} = {
},
'normalized' => 'my-figure'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1220,7 +1220,7 @@ $result_trees{'float_and_refs'} = {
},
'normalized' => 'my-figure'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1233,7 +1233,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1261,7 +1261,7 @@ $result_trees{'float_and_refs'} = {
},
'normalized' => 'my-figure'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1274,7 +1274,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1287,7 +1287,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1314,7 +1314,7 @@ $result_trees{'float_and_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1327,7 +1327,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1340,7 +1340,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1353,7 +1353,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -1380,7 +1380,7 @@ $result_trees{'float_and_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1393,7 +1393,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1406,7 +1406,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1419,7 +1419,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1432,7 +1432,7 @@ $result_trees{'float_and_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/latex_tests/indices.pl
b/tp/t/results/latex_tests/indices.pl
index 94cacc6d7c..f107d2cc4f 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -601,7 +601,7 @@ $result_trees{'indices'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -627,7 +627,7 @@ $result_trees{'indices'} = {
'text' => 'b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -807,7 +807,7 @@ $result_trees{'indices'} = {
'text' => '\\cmd'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index 8f1412e3d2..81c892786c 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -601,7 +601,7 @@ $result_trees{'indices_disable_encoding'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'seealso',
@@ -627,7 +627,7 @@ $result_trees{'indices_disable_encoding'} = {
'text' => 'b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
@@ -807,7 +807,7 @@ $result_trees{'indices_disable_encoding'} = {
'text' => '\\cmd'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'sortas',
diff --git a/tp/t/results/latex_tests/node_before_top.pl
b/tp/t/results/latex_tests/node_before_top.pl
index 61142e3b96..d050c5f4e6 100644
--- a/tp/t/results/latex_tests/node_before_top.pl
+++ b/tp/t/results/latex_tests/node_before_top.pl
@@ -192,7 +192,7 @@ $result_trees{'node_before_top'} = {
},
'normalized' => 'before-Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
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 c5d8c15c1e..e4e511fc72 100644
--- a/tp/t/results/latex_tests/top_no_sectioning_command.pl
+++ b/tp/t/results/latex_tests/top_no_sectioning_command.pl
@@ -126,7 +126,7 @@ $result_trees{'top_no_sectioning_command'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'pxref',
diff --git a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
index 81b72ca033..7ef57481a2 100644
--- a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
@@ -743,7 +743,7 @@ args \\e\\|\\f\\|
'text' => 'arg1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -756,7 +756,7 @@ args \\e\\|\\f\\|
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
index 5beb4a2600..c9a4d805ae 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
@@ -211,7 +211,7 @@ $result_trees{'call_macro_in_linemacro_body'} = {
now second arg: gg '
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -233,7 +233,7 @@ now second arg: gg '
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
index f2b444a677..6c7d3d25cd 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
@@ -230,7 +230,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
'text' => '@emph '
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -244,7 +244,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git
a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
index 4d9fac7ae8..70505b8766 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
@@ -154,7 +154,7 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'}
= {
'text' => '@lm {a} @c in comment'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/linemacro/paragraph_no_paragraph.pl
b/tp/t/results/linemacro/paragraph_no_paragraph.pl
index 1e503df52a..ae04630e97 100644
--- a/tp/t/results/linemacro/paragraph_no_paragraph.pl
+++ b/tp/t/results/linemacro/paragraph_no_paragraph.pl
@@ -145,7 +145,7 @@ $result_trees{'paragraph_no_paragraph'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl
b/tp/t/results/macro/arg_body_expansion_order.pl
index 0d1a2e4e9a..7ddf0185b9 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -161,7 +161,7 @@ $result_trees{'arg_body_expansion_order'} = {
'text' => '@othermacro{}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -251,7 +251,7 @@ $result_trees{'arg_body_expansion_order'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/arg_not_closed.pl
b/tp/t/results/macro/arg_not_closed.pl
index 7b3ccb6e14..42757eae33 100644
--- a/tp/t/results/macro/arg_not_closed.pl
+++ b/tp/t/results/macro/arg_not_closed.pl
@@ -86,7 +86,7 @@ $result_trees{'arg_not_closed'} = {
'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/arobase_brace_in_macro_call.pl
b/tp/t/results/macro/arobase_brace_in_macro_call.pl
index c08866b619..5937d65d14 100644
--- a/tp/t/results/macro/arobase_brace_in_macro_call.pl
+++ b/tp/t/results/macro/arobase_brace_in_macro_call.pl
@@ -87,7 +87,7 @@ $result_trees{'arobase_brace_in_macro_call'} = {
'text' => '@{ , @} '
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -152,7 +152,7 @@ $result_trees{'arobase_brace_in_macro_call'} = {
'text' => '@'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/backslash_in_arg.pl
b/tp/t/results/macro/backslash_in_arg.pl
index 37de508c78..8a5115c48d 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -208,7 +208,7 @@ $result_trees{'backslash_in_arg'} = {
'text' => '\\r'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -347,7 +347,7 @@ $result_trees{'backslash_in_arg'} = {
'text' => '\\r'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/bib_example.pl
b/tp/t/results/macro/bib_example.pl
index 4779384247..5407fc0092 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -2461,7 +2461,7 @@ $result_trees{'bib_example'} = {
'text' => 'References'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2573,7 +2573,7 @@ $result_trees{'bib_example'} = {
'text' => 'References'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2771,7 +2771,7 @@ $result_trees{'bib_example'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2995,7 +2995,7 @@ $result_trees{'bib_example'} = {
'text' => 'LaTeX2e'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3137,7 +3137,7 @@ $result_trees{'bib_example'} = {
'text' => '@mybibnode{}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -3150,7 +3150,7 @@ $result_trees{'bib_example'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3177,7 +3177,7 @@ $result_trees{'bib_example'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3237,7 +3237,7 @@ $result_trees{'bib_example'} = {
},
'normalized' => 'References'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -3250,7 +3250,7 @@ $result_trees{'bib_example'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -3390,7 +3390,7 @@ $result_trees{'bib_example'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3498,7 +3498,7 @@ $result_trees{'bib_example'} = {
'text' => 'LaTeX2e'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3688,7 +3688,7 @@ $result_trees{'bib_example'} = {
'text' => 'LaTeX2e'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git
a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
index dfb7640314..eaff434a6b 100644
--- a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
+++ b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
@@ -77,7 +77,7 @@
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -88,7 +88,7 @@
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -110,7 +110,7 @@
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -155,7 +155,7 @@
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/macro/complete_macro_for_end.pl
b/tp/t/results/macro/complete_macro_for_end.pl
index 928817f00b..3c7cc99c24 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -88,7 +88,7 @@ $result_trees{'complete_macro_for_end'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/complex_argument.pl
b/tp/t/results/macro/complex_argument.pl
index b8cf38b6b6..156b6cec24 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -243,7 +243,7 @@ macroseven defined
'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -308,7 +308,7 @@ macroseven defined
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -375,7 +375,7 @@ macroseven defined
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -737,7 +737,7 @@ macroseven defined
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -821,7 +821,7 @@ macroseven defined
'text' => 'aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/cpp_directives_after_macros.pl
b/tp/t/results/macro/cpp_directives_after_macros.pl
index 24e47291aa..5a451e6100 100644
--- a/tp/t/results/macro/cpp_directives_after_macros.pl
+++ b/tp/t/results/macro/cpp_directives_after_macros.pl
@@ -153,7 +153,7 @@ $result_trees{'cpp_directives_after_macros'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -203,7 +203,7 @@ $result_trees{'cpp_directives_after_macros'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/cpp_directives_in_macro.pl
b/tp/t/results/macro/cpp_directives_in_macro.pl
index aac7421cbf..37e6b9d7b9 100644
--- a/tp/t/results/macro/cpp_directives_in_macro.pl
+++ b/tp/t/results/macro/cpp_directives_in_macro.pl
@@ -95,7 +95,7 @@ $result_trees{'cpp_directives_in_macro'} = {
'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/cpp_directives_line_value_macro.pl
b/tp/t/results/macro/cpp_directives_line_value_macro.pl
index 246ad0a81f..0b8525617a 100644
--- a/tp/t/results/macro/cpp_directives_line_value_macro.pl
+++ b/tp/t/results/macro/cpp_directives_line_value_macro.pl
@@ -83,7 +83,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -187,7 +187,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -304,7 +304,7 @@ $result_trees{'cpp_directives_line_value_macro'} = {
'text' => '900'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
index 6cd5fb5f9d..1bf7c589cd 100644
--- a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
+++ b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
@@ -117,7 +117,7 @@ $result_trees{'definfoenclose_replaced_by_macro'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl
b/tp/t/results/macro/double_recursive_macro_call.pl
index 83d6d5eabb..3a80498e19 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -145,7 +145,7 @@ $result_trees{'double_recursive_macro_call'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -161,7 +161,7 @@ $result_trees{'double_recursive_macro_call'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/empty_macro_argument.pl
b/tp/t/results/macro/empty_macro_argument.pl
index 0eaf7c983c..ed799f8dbd 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -69,7 +69,7 @@ $result_trees{'empty_macro_argument'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -101,7 +101,7 @@ $result_trees{'empty_macro_argument'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -127,7 +127,7 @@ $result_trees{'empty_macro_argument'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -158,7 +158,7 @@ $result_trees{'empty_macro_argument'} = {
'text' => 'x'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -255,7 +255,7 @@ $result_trees{'empty_macro_argument'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -287,7 +287,7 @@ $result_trees{'empty_macro_argument'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -313,7 +313,7 @@ $result_trees{'empty_macro_argument'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -344,7 +344,7 @@ $result_trees{'empty_macro_argument'} = {
'text' => 'x'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/empty_macro_no_arg.pl
b/tp/t/results/macro/empty_macro_no_arg.pl
index e4e350a815..a459b7c162 100644
--- a/tp/t/results/macro/empty_macro_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_no_arg.pl
@@ -97,7 +97,7 @@ $result_trees{'empty_macro_no_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/expand_two_same.pl
b/tp/t/results/macro/expand_two_same.pl
index 7b71347d15..f9277fbf90 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -87,7 +87,7 @@ arg}
'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -200,7 +200,7 @@ arg}
'text' => 'arg with comma , here '
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/expansion_order.pl
b/tp/t/results/macro/expansion_order.pl
index 1a00bb8b28..bc48e4d764 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -141,7 +141,7 @@ $result_trees{'expansion_order'} = {
'text' => 'ab'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -158,7 +158,7 @@ $result_trees{'expansion_order'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index 0a74e8d7a8..d8049ff38e 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -144,7 +144,7 @@ $result_trees{'form_feeds'} = {
'text' => 'arg1 '
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -157,7 +157,7 @@ $result_trees{'form_feeds'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index 4e2659e5f9..8059a50eba 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -528,7 +528,7 @@ $result_trees{'glossary'} = {
'text' => 'id1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -541,7 +541,7 @@ $result_trees{'glossary'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -554,7 +554,7 @@ $result_trees{'glossary'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -610,7 +610,7 @@ $result_trees{'glossary'} = {
},
'normalized' => 'id1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -618,7 +618,7 @@ $result_trees{'glossary'} = {
'text' => 'name1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -844,7 +844,7 @@ $result_trees{'glossary'} = {
'text' => '@glossarytext{}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -967,7 +967,7 @@ $result_trees{'glossary'} = {
'text' => 'id2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -980,7 +980,7 @@ $result_trees{'glossary'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -993,7 +993,7 @@ $result_trees{'glossary'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1050,7 +1050,7 @@ $result_trees{'glossary'} = {
},
'normalized' => 'id2'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -1058,7 +1058,7 @@ $result_trees{'glossary'} = {
'text' => 'name2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -1284,7 +1284,7 @@ $result_trees{'glossary'} = {
'text' => '@glossarytext{}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1477,7 +1477,7 @@ $result_trees{'glossary'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1521,7 +1521,7 @@ $result_trees{'glossary'} = {
'text' => 'id2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/macro/ifclear_in_macro.pl
b/tp/t/results/macro/ifclear_in_macro.pl
index 025761bce2..c50e278d6c 100644
--- a/tp/t/results/macro/ifclear_in_macro.pl
+++ b/tp/t/results/macro/ifclear_in_macro.pl
@@ -89,7 +89,7 @@ $result_trees{'ifclear_in_macro'} = {
'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/ifset_in_macro.pl
b/tp/t/results/macro/ifset_in_macro.pl
index bf68a8f799..a35ff77d0e 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -89,7 +89,7 @@ $result_trees{'ifset_in_macro'} = {
'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/ifset_in_macro_set.pl
b/tp/t/results/macro/ifset_in_macro_set.pl
index 2d91476b87..3586422a7d 100644
--- a/tp/t/results/macro/ifset_in_macro_set.pl
+++ b/tp/t/results/macro/ifset_in_macro_set.pl
@@ -89,7 +89,7 @@ $result_trees{'ifset_in_macro_set'} = {
'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/ignored_macro_definition.pl
b/tp/t/results/macro/ignored_macro_definition.pl
index 4af36a87ca..57444d2504 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -82,7 +82,7 @@ $result_trees{'ignored_macro_definition'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -121,7 +121,7 @@ in inlinefmt tex
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index 9ce2bc3c74..27ee808597 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -83,7 +83,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
'text' => 'Many arguments, separated by commas, are
processed here'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/implicit_quoting_recursion.pl
b/tp/t/results/macro/implicit_quoting_recursion.pl
index 1118636fdd..87ecfcd304 100644
--- a/tp/t/results/macro/implicit_quoting_recursion.pl
+++ b/tp/t/results/macro/implicit_quoting_recursion.pl
@@ -82,7 +82,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => '@cat{@cat{@cat{@cat{@cat{na, to}, po}, co},
tu}, oto}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -90,7 +90,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => 'tam'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -112,7 +112,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => '@cat{@cat{@cat{@cat{na, to}, po}, co}, tu}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -125,7 +125,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -147,7 +147,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => '@cat{@cat{@cat{na, to}, po}, co}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -160,7 +160,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -182,7 +182,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => '@cat{@cat{na, to}, po}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -195,7 +195,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -217,7 +217,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => '@cat{na, to}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -230,7 +230,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -252,7 +252,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => 'na'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -265,7 +265,7 @@ $result_trees{'implicit_quoting_recursion'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index 098000165b..2cb1ebbde9 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -79,7 +79,7 @@ $result_trees{'leading_spaces_no_ignore'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/line_end_accent_command_macro_call.pl
b/tp/t/results/macro/line_end_accent_command_macro_call.pl
index 74fad0c4a7..649a21b0c0 100644
--- a/tp/t/results/macro/line_end_accent_command_macro_call.pl
+++ b/tp/t/results/macro/line_end_accent_command_macro_call.pl
@@ -69,7 +69,7 @@ $result_trees{'line_end_accent_command_macro_call'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -212,7 +212,7 @@ $result_trees{'line_end_accent_command_macro_call'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_after_paragraph.pl
b/tp/t/results/macro/macro_after_paragraph.pl
index 66ac11d4c4..6359b8515e 100644
--- a/tp/t/results/macro/macro_after_paragraph.pl
+++ b/tp/t/results/macro/macro_after_paragraph.pl
@@ -88,7 +88,7 @@ $result_trees{'macro_after_paragraph'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
index 80b2e54905..7c31c6ccd7 100644
--- a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
+++ b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
@@ -199,7 +199,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
'text' => 'maa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1144,7 +1144,7 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
'text' => 'mmm'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_before_specific_line_command_args.pl
b/tp/t/results/macro/macro_before_specific_line_command_args.pl
index dfe463e4c5..daaf9048b9 100644
--- a/tp/t/results/macro/macro_before_specific_line_command_args.pl
+++ b/tp/t/results/macro/macro_before_specific_line_command_args.pl
@@ -107,7 +107,7 @@ $result_trees{'macro_before_specific_line_command_args'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_call_empty_middle_arg.pl
b/tp/t/results/macro/macro_call_empty_middle_arg.pl
index 383252cfd2..ac9e32e7d5 100644
--- a/tp/t/results/macro/macro_call_empty_middle_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_middle_arg.pl
@@ -96,7 +96,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
'text' => 'j'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -109,7 +109,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -122,7 +122,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -176,7 +176,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
'text' => 'm'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -184,7 +184,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -197,7 +197,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -251,10 +251,10 @@ $result_trees{'macro_call_empty_middle_arg'} = {
'text' => 'o'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -262,7 +262,7 @@ $result_trees{'macro_call_empty_middle_arg'} = {
'text' => 'p'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_call_empty_two_arg.pl
b/tp/t/results/macro/macro_call_empty_two_arg.pl
index 5e95d61869..533f885217 100644
--- a/tp/t/results/macro/macro_call_empty_two_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_two_arg.pl
@@ -82,7 +82,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -127,7 +127,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -175,7 +175,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -183,7 +183,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -228,10 +228,10 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -279,7 +279,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -287,7 +287,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -340,7 +340,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'text' => 'g'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -348,7 +348,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -398,10 +398,10 @@ $result_trees{'macro_call_empty_two_arg'} = {
'text' => 'h'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -446,7 +446,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -459,7 +459,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -504,7 +504,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -517,7 +517,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -565,7 +565,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -573,7 +573,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'text' => 'k'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -618,7 +618,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -626,7 +626,7 @@ $result_trees{'macro_call_empty_two_arg'} = {
'text' => 'l'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
index f9e8e1740f..9dad520462 100644
--- a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
@@ -80,7 +80,7 @@ $result_trees{'macro_call_in_ignored_inlinefmtifelse'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
index d8b53e9197..396a2cf5b2 100644
--- a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
+++ b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
@@ -83,7 +83,7 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -99,7 +99,7 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -129,7 +129,7 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
diff --git a/tp/t/results/macro/macro_call_in_node_manual.pl
b/tp/t/results/macro/macro_call_in_node_manual.pl
index 92e84aab3b..649f8fd974 100644
--- a/tp/t/results/macro/macro_call_in_node_manual.pl
+++ b/tp/t/results/macro/macro_call_in_node_manual.pl
@@ -386,7 +386,7 @@ $result_trees{'macro_call_in_node_manual'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -461,7 +461,7 @@ $result_trees{'macro_call_in_node_manual'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -538,7 +538,7 @@ $result_trees{'macro_call_in_node_manual'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -624,7 +624,7 @@ $result_trees{'macro_call_in_node_manual'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -651,7 +651,7 @@ $result_trees{'macro_call_in_node_manual'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -727,7 +727,7 @@ $result_trees{'macro_call_in_node_manual'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -814,7 +814,7 @@ $result_trees{'macro_call_in_node_manual'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -860,7 +860,7 @@ $result_trees{'macro_call_in_node_manual'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -941,7 +941,7 @@ $result_trees{'macro_call_in_node_manual'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1031,7 +1031,7 @@ $result_trees{'macro_call_in_node_manual'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
index 00fa7fd432..e69df52df9 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
@@ -69,7 +69,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -99,7 +99,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
index bf75ae4ce3..ef145fbcda 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
@@ -69,7 +69,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -99,7 +99,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -129,7 +129,7 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'}
= {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
diff --git
a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
index 81f4f57d9d..0e0b276c84 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
@@ -80,7 +80,7 @@
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -91,7 +91,7 @@
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -112,7 +112,7 @@
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
index c8217f47db..a836731ef9 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
@@ -69,7 +69,7 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -99,7 +99,7 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
index 668ff958af..d15e31e8ff 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
@@ -74,7 +74,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl
b/tp/t/results/macro/macro_expands_to_empty.pl
index 6104f8ae1f..71ce5994e1 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -78,7 +78,7 @@ $result_trees{'macro_expands_to_empty'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -104,7 +104,7 @@ $result_trees{'macro_expands_to_empty'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_expansion.pl
b/tp/t/results/macro/macro_expansion.pl
index fe067021f8..4c3e5ecead 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -109,7 +109,7 @@ $result_trees{'macro_expansion'} = {
'text' => 'first arg'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -122,7 +122,7 @@ $result_trees{'macro_expansion'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -227,7 +227,7 @@ $result_trees{'macro_expansion'} = {
'text' => 'aaa @samp{a macro , } bbb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -441,7 +441,7 @@ $result_trees{'macro_expansion'} = {
'text' => 'first arg'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -454,7 +454,7 @@ $result_trees{'macro_expansion'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -556,7 +556,7 @@ $result_trees{'macro_expansion'} = {
'text' => 'first , arg'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -569,7 +569,7 @@ $result_trees{'macro_expansion'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -673,7 +673,7 @@ $result_trees{'macro_expansion'} = {
now'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -688,7 +688,7 @@ now'
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
index 215cd6d857..50d2286c5f 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
@@ -101,7 +101,7 @@ $result_trees{'macro_expansion_end_in_conditional_end'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
index d1cf311383..35713fea5b 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
@@ -91,7 +91,7 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
index 0f56cb3b18..d59593a911 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
@@ -74,7 +74,7 @@ $result_trees{'macro_expansion_end_in_ignored_ifset_content'}
= {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
index 0e778a1bd8..4fc9cf9212 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
@@ -79,7 +79,7 @@
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
index 6455ab522f..b49c19b696 100644
---
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
+++
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
@@ -79,7 +79,7 @@
$result_trees{'macro_expansion_end_in_ignored_nested_different_conditional'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
index b2876a298e..a386add506 100644
--- a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
+++ b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
@@ -142,7 +142,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -181,7 +181,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -239,7 +239,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -283,7 +283,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
'text' => '@code{l}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -348,7 +348,7 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
'text' => 'T'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
index 161fbfeda7..e9ca0d0616 100644
--- a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
+++ b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
@@ -108,7 +108,7 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -131,7 +131,7 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_for_end.pl
b/tp/t/results/macro/macro_for_end.pl
index f0eba15d00..1adb63173c 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -88,7 +88,7 @@ $result_trees{'macro_for_end'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
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 e392db1224..d186eb0799 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -69,7 +69,7 @@ $result_trees{'macro_for_ignored_line_command'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_for_verb.pl
b/tp/t/results/macro/macro_for_verb.pl
index b9d7da0744..e0517fe166 100644
--- a/tp/t/results/macro/macro_for_verb.pl
+++ b/tp/t/results/macro/macro_for_verb.pl
@@ -69,7 +69,7 @@ $result_trees{'macro_for_verb'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_accent.pl
b/tp/t/results/macro/macro_in_accent.pl
index 4c340e1ef2..31f20c08c1 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -147,7 +147,7 @@ $result_trees{'macro_in_accent'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -198,7 +198,7 @@ $result_trees{'macro_in_accent'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -248,7 +248,7 @@ $result_trees{'macro_in_accent'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -289,7 +289,7 @@ $result_trees{'macro_in_accent'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -352,7 +352,7 @@ $result_trees{'macro_in_accent'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -374,7 +374,7 @@ $result_trees{'macro_in_accent'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_brace_command.pl
b/tp/t/results/macro/macro_in_brace_command.pl
index 16b1de4133..949bc13cd8 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -168,7 +168,7 @@ $result_trees{'macro_in_brace_command'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -201,7 +201,7 @@ $result_trees{'macro_in_brace_command'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -226,7 +226,7 @@ $result_trees{'macro_in_brace_command'} = {
'text' => 'bar-expansion'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl
b/tp/t/results/macro/macro_in_def_delimiters.pl
index 2d1c4cd140..10c80e8bd1 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -136,7 +136,7 @@ $result_trees{'macro_in_def_delimiters'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -231,7 +231,7 @@ $result_trees{'macro_in_def_delimiters'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -321,7 +321,7 @@ $result_trees{'macro_in_def_delimiters'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -395,7 +395,7 @@ $result_trees{'macro_in_def_delimiters'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_empty_menu_comment.pl
b/tp/t/results/macro/macro_in_empty_menu_comment.pl
index da7b0b36e2..ae6b528170 100644
--- a/tp/t/results/macro/macro_in_empty_menu_comment.pl
+++ b/tp/t/results/macro/macro_in_empty_menu_comment.pl
@@ -88,7 +88,7 @@ $result_trees{'macro_in_empty_menu_comment'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
index 63a7dc9e8e..85dd93dd8a 100644
--- a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
@@ -113,7 +113,7 @@
$result_trees{'macro_in_empty_multitable_empty_before_item'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
index 4aea9d0583..cd86ab2dee 100644
--- a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
@@ -92,7 +92,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_empty_text.pl
b/tp/t/results/macro/macro_in_empty_text.pl
index 9550d099d1..b12090f3ef 100644
--- a/tp/t/results/macro/macro_in_empty_text.pl
+++ b/tp/t/results/macro/macro_in_empty_text.pl
@@ -88,7 +88,7 @@ $result_trees{'macro_in_empty_text'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_end_argument.pl
b/tp/t/results/macro/macro_in_end_argument.pl
index 987a34d47d..4d988c8b15 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -118,7 +118,7 @@ $result_trees{'macro_in_end_argument'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_index_commands.pl
b/tp/t/results/macro/macro_in_index_commands.pl
index 7961cb4f9b..3c28b6305a 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -190,7 +190,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -236,7 +236,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -261,7 +261,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -423,7 +423,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -610,7 +610,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -753,7 +753,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -931,7 +931,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -999,7 +999,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1031,7 +1031,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1134,7 +1134,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1207,7 +1207,7 @@ $result_trees{'macro_in_index_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index f0148e54c4..f815c52a31 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -99,7 +99,7 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl
b/tp/t/results/macro/macro_in_macro_arg.pl
index 9559e03d98..ed448a833a 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -212,7 +212,7 @@ $result_trees{'macro_in_macro_arg'} = {
'text' => '@macroone{}text for macro2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -229,7 +229,7 @@ $result_trees{'macro_in_macro_arg'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
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 0d457a85d9..addb0cdc3f 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -145,7 +145,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
'text' => '@macrooneone{}text for macro2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -162,7 +162,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_menu.pl
b/tp/t/results/macro/macro_in_menu.pl
index ad2aff5ef4..30892b5ffb 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -383,7 +383,7 @@ $result_trees{'macro_in_menu'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -416,7 +416,7 @@ $result_trees{'macro_in_menu'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -485,7 +485,7 @@ $result_trees{'macro_in_menu'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -514,7 +514,7 @@ $result_trees{'macro_in_menu'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -581,7 +581,7 @@ $result_trees{'macro_in_menu'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -624,7 +624,7 @@ $result_trees{'macro_in_menu'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -702,7 +702,7 @@ $result_trees{'macro_in_menu'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -741,7 +741,7 @@ $result_trees{'macro_in_menu'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -764,7 +764,7 @@ $result_trees{'macro_in_menu'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -847,7 +847,7 @@ $result_trees{'macro_in_menu'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
index aac910059f..0cc04bbf33 100644
--- a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
@@ -88,7 +88,7 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} =
{
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
index e0826bcb95..cb2edfc9ea 100644
--- a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
@@ -97,7 +97,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -120,7 +120,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -152,7 +152,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -187,7 +187,7 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_menu_description.pl
b/tp/t/results/macro/macro_in_menu_description.pl
index bddad29a20..4e71b04820 100644
--- a/tp/t/results/macro/macro_in_menu_description.pl
+++ b/tp/t/results/macro/macro_in_menu_description.pl
@@ -138,7 +138,7 @@ $result_trees{'macro_in_menu_description'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl
b/tp/t/results/macro/macro_in_misc_commands.pl
index 0ff7c7842f..a9c96fc7d8 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -166,7 +166,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -197,7 +197,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -241,7 +241,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -474,7 +474,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -511,7 +511,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -727,7 +727,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -752,7 +752,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -795,7 +795,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -848,7 +848,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -900,7 +900,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1043,7 +1043,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1126,7 +1126,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1212,7 +1212,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1427,7 +1427,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1603,7 +1603,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1680,7 +1680,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1727,7 +1727,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1754,7 +1754,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1942,7 +1942,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2391,7 +2391,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2450,7 +2450,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2509,7 +2509,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2568,7 +2568,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2627,7 +2627,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2686,7 +2686,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2856,7 +2856,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2915,7 +2915,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3085,7 +3085,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3144,7 +3144,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3271,7 +3271,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3446,7 +3446,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3510,7 +3510,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3711,7 +3711,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3758,7 +3758,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3801,7 +3801,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3840,7 +3840,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3884,7 +3884,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3930,7 +3930,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3970,7 +3970,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4014,7 +4014,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4068,7 +4068,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4118,7 +4118,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4161,7 +4161,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4256,7 +4256,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4367,7 +4367,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4512,7 +4512,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4646,7 +4646,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4764,7 +4764,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4835,7 +4835,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -4936,7 +4936,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -5034,7 +5034,7 @@ $result_trees{'macro_in_misc_commands'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
index 7fe6f7f151..3b16d3716e 100644
--- a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
@@ -115,7 +115,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_table_empty_before_item.pl
b/tp/t/results/macro/macro_in_table_empty_before_item.pl
index 22a83986b2..c779f3c4e9 100644
--- a/tp/t/results/macro/macro_in_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_table_empty_before_item.pl
@@ -94,7 +94,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
index e9f4c236fc..1aca420b5e 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
@@ -78,7 +78,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -94,7 +94,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
'text' => 'flag'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -149,7 +149,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -165,7 +165,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
'text' => 'flag'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
index eea42009a6..b6f06ba8fe 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
@@ -78,7 +78,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -94,7 +94,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
'text' => 'flag'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -109,7 +109,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
'text' => ''
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineifclear',
@@ -149,7 +149,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -165,7 +165,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
'text' => 'flag'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -180,7 +180,7 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineifclear',
diff --git a/tp/t/results/macro/macro_name_with_digit.pl
b/tp/t/results/macro/macro_name_with_digit.pl
index f31e8aec7f..a72fed5eec 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -165,7 +165,7 @@ $result_trees{'macro_name_with_digit'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl
b/tp/t/results/macro/macro_name_with_hyphen.pl
index 2a9c9cbe3f..ad301a0d9c 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -82,7 +82,7 @@ $result_trees{'macro_name_with_hyphen'} = {
'text' => 'blah'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -95,7 +95,7 @@ $result_trees{'macro_name_with_hyphen'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl
b/tp/t/results/macro/macro_no_arg_expansion.pl
index 74c3dee077..71bbea722f 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -69,7 +69,7 @@ $result_trees{'macro_no_arg_expansion'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
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 c7e7e4efeb..0b5b734160 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
@@ -78,7 +78,7 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
'text' => 'aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index 1e93b4c858..06d5873d89 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -76,7 +76,7 @@ $result_trees{'macro_zero'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/nested_macro_call.pl
b/tp/t/results/macro/nested_macro_call.pl
index aa3382ac63..e6c13ec2ff 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -139,7 +139,7 @@ $result_trees{'nested_macro_call'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -156,7 +156,7 @@ $result_trees{'nested_macro_call'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/no_macrobody.pl
b/tp/t/results/macro/no_macrobody.pl
index 03d9c6e77e..5e2de4745e 100644
--- a/tp/t/results/macro/no_macrobody.pl
+++ b/tp/t/results/macro/no_macrobody.pl
@@ -114,7 +114,7 @@ $result_trees{'no_macrobody'} = {
'text' => 'arg brace'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/paragraph_and_macro.pl
b/tp/t/results/macro/paragraph_and_macro.pl
index 6483766df4..026225797a 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -185,7 +185,7 @@ $result_trees{'paragraph_and_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -218,7 +218,7 @@ $result_trees{'paragraph_and_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -253,7 +253,7 @@ $result_trees{'paragraph_and_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -294,7 +294,7 @@ $result_trees{'paragraph_and_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -328,7 +328,7 @@ $result_trees{'paragraph_and_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -363,7 +363,7 @@ $result_trees{'paragraph_and_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/protect_in_body.pl
b/tp/t/results/macro/protect_in_body.pl
index 08fdc8b5d5..a96be2a119 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -89,7 +89,7 @@ $result_trees{'protect_in_body'} = {
'text' => '@samp{f\\irst arg}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -102,7 +102,7 @@ $result_trees{'protect_in_body'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
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 4461a2d3cd..cb52e059a4 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -82,7 +82,7 @@ $result_trees{'protect_in_body_one_arg'} = {
'text' => '@samp{f\\irst arg}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/recursive_call_in_argument.pl
b/tp/t/results/macro/recursive_call_in_argument.pl
index b1ec53d97b..65341eac7c 100644
--- a/tp/t/results/macro/recursive_call_in_argument.pl
+++ b/tp/t/results/macro/recursive_call_in_argument.pl
@@ -78,7 +78,7 @@ $result_trees{'recursive_call_in_argument'} = {
'text' => '@anorecurse{}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl
b/tp/t/results/macro/recursive_call_in_macro.pl
index e1f45cb32c..3888316324 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -78,7 +78,7 @@ $result_trees{'recursive_call_in_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/recursive_call_in_rmacro.pl
b/tp/t/results/macro/recursive_call_in_rmacro.pl
index 888db77559..2e5e7d3be2 100644
--- a/tp/t/results/macro/recursive_call_in_rmacro.pl
+++ b/tp/t/results/macro/recursive_call_in_rmacro.pl
@@ -79,7 +79,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -95,7 +95,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -111,7 +111,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -127,7 +127,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -143,7 +143,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -159,7 +159,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -175,7 +175,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -191,7 +191,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -207,7 +207,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -223,7 +223,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -239,7 +239,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -255,7 +255,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -271,7 +271,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -287,7 +287,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -303,7 +303,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -319,7 +319,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -335,7 +335,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -351,7 +351,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -367,7 +367,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -383,7 +383,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -399,7 +399,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -415,7 +415,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -431,7 +431,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -447,7 +447,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -463,7 +463,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -479,7 +479,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -495,7 +495,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -511,7 +511,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -527,7 +527,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -543,7 +543,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -559,7 +559,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -575,7 +575,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -591,7 +591,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -607,7 +607,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -623,7 +623,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -639,7 +639,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -655,7 +655,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -671,7 +671,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -687,7 +687,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -703,7 +703,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -719,7 +719,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -735,7 +735,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -751,7 +751,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -767,7 +767,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -783,7 +783,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -799,7 +799,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -815,7 +815,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -831,7 +831,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -847,7 +847,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -863,7 +863,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -879,7 +879,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -895,7 +895,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -911,7 +911,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -927,7 +927,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -943,7 +943,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -959,7 +959,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -975,7 +975,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -991,7 +991,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1007,7 +1007,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1023,7 +1023,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1039,7 +1039,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1055,7 +1055,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1071,7 +1071,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1087,7 +1087,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1103,7 +1103,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1119,7 +1119,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1135,7 +1135,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1151,7 +1151,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1167,7 +1167,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1183,7 +1183,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1199,7 +1199,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1215,7 +1215,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1231,7 +1231,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1247,7 +1247,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1263,7 +1263,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1279,7 +1279,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1295,7 +1295,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1311,7 +1311,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1327,7 +1327,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1343,7 +1343,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1359,7 +1359,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1375,7 +1375,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1391,7 +1391,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1407,7 +1407,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1423,7 +1423,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1439,7 +1439,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1455,7 +1455,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1471,7 +1471,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1487,7 +1487,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1503,7 +1503,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1519,7 +1519,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1535,7 +1535,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1551,7 +1551,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1567,7 +1567,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1583,7 +1583,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1599,7 +1599,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1615,7 +1615,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1631,7 +1631,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1647,7 +1647,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1663,7 +1663,7 @@ $result_trees{'recursive_call_in_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl
b/tp/t/results/macro/redefine_texinfo_macro.pl
index 9f0663b993..583b015bba 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -78,7 +78,7 @@ $result_trees{'redefine_texinfo_macro'} = {
'text' => 'code'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl
b/tp/t/results/macro/simple_imbricated_macro.pl
index 3cae311a2a..520948e8e4 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -84,7 +84,7 @@ $result_trees{'simple_imbricated_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -180,7 +180,7 @@ $result_trees{'simple_imbricated_macro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
index 8917db82b6..1cc4a816b9 100644
--- a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
@@ -84,7 +84,7 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -180,7 +180,7 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/space_macro_after_end.pl
b/tp/t/results/macro/space_macro_after_end.pl
index b14ea11e79..9177e855d9 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -106,7 +106,7 @@ $result_trees{'space_macro_after_end'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
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 dffafe67c6..de729a5635 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -102,7 +102,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/too_much_args.pl
b/tp/t/results/macro/too_much_args.pl
index 303036ddba..0ac7429dfe 100644
--- a/tp/t/results/macro/too_much_args.pl
+++ b/tp/t/results/macro/too_much_args.pl
@@ -87,7 +87,7 @@ $result_trees{'too_much_args'} = {
'text' => 'one'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -100,7 +100,7 @@ $result_trees{'too_much_args'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
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 5d8acd304e..3469858fda 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -180,7 +180,7 @@ $result_trees{'two_macros_on_a_line'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -209,7 +209,7 @@ $result_trees{'two_macros_on_a_line'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -290,7 +290,7 @@ $result_trees{'two_macros_on_a_line'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -347,7 +347,7 @@ $result_trees{'two_macros_on_a_line'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -418,7 +418,7 @@ arg
in macro'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -476,7 +476,7 @@ in macro'
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
index 37df3e484c..89f0eecd2e 100644
--- a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
+++ b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
@@ -78,7 +78,7 @@ $result_trees{'unpaired_backslash_in_macro_body'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
index cdfb5f4ede..7cb4cad78f 100644
--- a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
@@ -87,7 +87,7 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
'text' => '@verb{, commas ,}'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -100,7 +100,7 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/macro/verb_with_brace_in_macro_call.pl
b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
index 44f2f6c6c3..f45eea6731 100644
--- a/tp/t/results/macro/verb_with_brace_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
@@ -91,7 +91,7 @@ $result_trees{'verb_with_brace_in_macro_call'} = {
'text' => '@verb{: in }'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -104,7 +104,7 @@ $result_trees{'verb_with_brace_in_macro_call'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/menu/commands_in_nodedescriptionblock.pl
b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
index a79e12110f..21bf53528d 100644
--- a/tp/t/results/menu/commands_in_nodedescriptionblock.pl
+++ b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
@@ -229,7 +229,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
},
'normalized' => 'in-nodescription'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -256,7 +256,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
},
'normalized' => 'f1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -329,7 +329,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
'text' => 'in nodescription'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -369,7 +369,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
},
'normalized' => 'node2'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -511,7 +511,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
'text' => 'float_image'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -779,7 +779,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
},
'normalized' => 'in-nodescription'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -806,7 +806,7 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
},
'normalized' => 'f1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/menu/formats_in_menu.pl
b/tp/t/results/menu/formats_in_menu.pl
index f31b391754..706ea54a48 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -506,7 +506,7 @@ $result_trees{'formats_in_menu'} = {
'text' => '* acronym::'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index a0d4e84d99..d3698717fe 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -126,7 +126,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -148,7 +148,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index cb7eb0e8f8..ef0692f5c4 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -87,7 +87,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
'text' => 'An anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index b1c8dbcbf3..e75db5dd4d 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -253,7 +253,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -269,7 +269,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -648,7 +648,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1054,7 +1054,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1565,7 +1565,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1582,7 +1582,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1964,7 +1964,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2370,7 +2370,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2663,7 +2663,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -2679,7 +2679,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3055,7 +3055,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -3461,7 +3461,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl
b/tp/t/results/misc_commands/kbdinputstyle.pl
index e95d40dc57..9179e10b06 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -178,7 +178,7 @@ $result_trees{'kbdinputstyle'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -664,7 +664,7 @@ $result_trees{'kbdinputstyle'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1141,7 +1141,7 @@ $result_trees{'kbdinputstyle'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index b6377f5e95..0e9823d9c5 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -203,7 +203,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -813,7 +813,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1415,7 +1415,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/misc_commands/ref_in_center.pl
b/tp/t/results/misc_commands/ref_in_center.pl
index ef20e590d0..708704fb8d 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -156,7 +156,7 @@ $result_trees{'ref_in_center'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -201,7 +201,7 @@ $result_trees{'ref_in_center'} = {
'text' => 'Top'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -209,7 +209,7 @@ $result_trees{'ref_in_center'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -218,7 +218,7 @@ $result_trees{'ref_in_center'} = {
'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index db4304acd4..60f7506cb3 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -244,7 +244,7 @@ $result_trees{'test_allowcodebreaks'} = {
'text' => '0'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -521,7 +521,7 @@ $result_trees{'test_allowcodebreaks'} = {
'text' => 'A node0'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -565,7 +565,7 @@ $result_trees{'test_allowcodebreaks'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -717,7 +717,7 @@ $result_trees{'test_allowcodebreaks'} = {
'text' => '1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -994,7 +994,7 @@ $result_trees{'test_allowcodebreaks'} = {
'text' => 'A node1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1038,7 +1038,7 @@ $result_trees{'test_allowcodebreaks'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1166,7 +1166,7 @@ $result_trees{'test_allowcodebreaks'} = {
'text' => 'w'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1438,7 +1438,7 @@ $result_trees{'test_allowcodebreaks'} = {
'text' => 'A nodew'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1631,7 +1631,7 @@ $result_trees{'test_allowcodebreaks'} = {
'text' => '2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1908,7 +1908,7 @@ $result_trees{'test_allowcodebreaks'} = {
'text' => 'A node2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -1952,7 +1952,7 @@ $result_trees{'test_allowcodebreaks'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/moresectioning/anchor_in_footnote.pl
b/tp/t/results/moresectioning/anchor_in_footnote.pl
index 781839e7a3..e4f7eeb97a 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote.pl
@@ -88,7 +88,7 @@ $result_trees{'anchor_in_footnote'} = {
'text' => 'Anchor in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -313,7 +313,7 @@ $result_trees{'anchor_in_footnote'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
index f3147518f9..7ce3106557 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
@@ -122,7 +122,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
'text' => 'Anchor in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -347,7 +347,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git
a/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
b/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
index e884293782..c7d4f76197 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
@@ -127,7 +127,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
'text' => 'Anchor in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -352,7 +352,7 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
b/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
index af7c3bcc43..f49b6d0e36 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
@@ -93,7 +93,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
'text' => 'Anchor in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -318,7 +318,7 @@ $result_trees{'anchor_in_footnote_split_node'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
index fc0b3ee4bd..2c8d1a9dad 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
@@ -348,13 +348,13 @@ $result_trees{'character_and_spaces_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -367,7 +367,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -395,13 +395,13 @@ $result_trees{'character_and_spaces_in_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -409,7 +409,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -445,13 +445,13 @@ $result_trees{'character_and_spaces_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -464,7 +464,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -506,7 +506,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -534,13 +534,13 @@ $result_trees{'character_and_spaces_in_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -553,7 +553,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -626,7 +626,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
},
'normalized' =>
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -655,7 +655,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
},
'normalized' =>
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -689,7 +689,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -723,7 +723,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
index cd7aa32401..1b070452ec 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
@@ -356,13 +356,13 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -375,7 +375,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -403,13 +403,13 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -417,7 +417,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
'text' => 'manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -453,13 +453,13 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -472,7 +472,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -514,7 +514,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -542,13 +542,13 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -561,7 +561,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -634,7 +634,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
},
'normalized' =>
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -663,7 +663,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
},
'normalized' =>
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -697,7 +697,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -731,7 +731,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
index e29ebc274c..c9ee4d2bc0 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
@@ -374,7 +374,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
},
'normalized' => 'chap'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -446,7 +446,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
},
'normalized' => 'chap'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/moresectioning/no_element.pl
b/tp/t/results/moresectioning/no_element.pl
index 83163df67a..7e67ab68a0 100644
--- a/tp/t/results/moresectioning/no_element.pl
+++ b/tp/t/results/moresectioning/no_element.pl
@@ -85,7 +85,7 @@ $result_trees{'no_element'} = {
'text' => 'An anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -129,7 +129,7 @@ $result_trees{'no_element'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -171,7 +171,7 @@ $result_trees{'no_element'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -219,7 +219,7 @@ $result_trees{'no_element'} = {
'text' => 'Anchor in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -263,7 +263,7 @@ $result_trees{'no_element'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -406,7 +406,7 @@ $result_trees{'no_element'} = {
},
'normalized' => 'float-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
b/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
index cfb86c2698..3aba9891f3 100644
--- a/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
@@ -355,7 +355,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
},
'normalized' => 'node-before'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -383,7 +383,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
},
'normalized' => 'after'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -453,7 +453,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
},
'normalized' => 'node-before'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -481,7 +481,7 @@ $result_trees{'nodes_before_after_top_xref'} = {
},
'normalized' => 'after'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
b/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
index 8ce8598d89..10bea9bb29 100644
--- a/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
@@ -48,7 +48,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -60,7 +60,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -77,7 +77,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -115,7 +115,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -127,7 +127,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -144,7 +144,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -384,7 +384,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -396,7 +396,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -413,7 +413,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
diff --git a/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
b/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
index df56102115..1b3a1711cf 100644
--- a/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
@@ -48,7 +48,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -60,7 +60,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -77,7 +77,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -115,7 +115,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -127,7 +127,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -144,7 +144,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -384,7 +384,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -396,7 +396,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
'text' => 'GNU'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -413,7 +413,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 476f7ea417..f64b54301a 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -17,7 +17,7 @@ $result_trees{'placed_things_before_element'} = {
'text' => 'An anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -61,7 +61,7 @@ $result_trees{'placed_things_before_element'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -103,7 +103,7 @@ $result_trees{'placed_things_before_element'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -151,7 +151,7 @@ $result_trees{'placed_things_before_element'} = {
'text' => 'Anchor in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -195,7 +195,7 @@ $result_trees{'placed_things_before_element'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -338,7 +338,7 @@ $result_trees{'placed_things_before_element'} = {
},
'normalized' => 'float-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -547,7 +547,7 @@ $result_trees{'placed_things_before_element'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -589,7 +589,7 @@ $result_trees{'placed_things_before_element'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git
a/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
b/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
index a6a6592fa5..460d2a61b1 100644
--- a/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
@@ -17,7 +17,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = {
'text' => 'An anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -61,7 +61,7 @@ $result_trees{'placed_things_before_element_no_use_node'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -103,7 +103,7 @@ $result_trees{'placed_things_before_element_no_use_node'} =
{
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -151,7 +151,7 @@ $result_trees{'placed_things_before_element_no_use_node'} =
{
'text' => 'Anchor in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -195,7 +195,7 @@ $result_trees{'placed_things_before_element_no_use_node'} =
{
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -338,7 +338,7 @@ $result_trees{'placed_things_before_element_no_use_node'} =
{
},
'normalized' => 'float-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -547,7 +547,7 @@ $result_trees{'placed_things_before_element_no_use_node'} =
{
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -589,7 +589,7 @@ $result_trees{'placed_things_before_element_no_use_node'} =
{
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/moresectioning/placed_things_before_node.pl
b/tp/t/results/moresectioning/placed_things_before_node.pl
index 7031cf0a3b..01bffd1d40 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -20,7 +20,7 @@ $result_trees{'placed_things_before_node'} = {
'text' => 'An anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -64,7 +64,7 @@ $result_trees{'placed_things_before_node'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -106,7 +106,7 @@ $result_trees{'placed_things_before_node'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -154,7 +154,7 @@ $result_trees{'placed_things_before_node'} = {
'text' => 'Anchor in footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -198,7 +198,7 @@ $result_trees{'placed_things_before_node'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -341,7 +341,7 @@ $result_trees{'placed_things_before_node'} = {
},
'normalized' => 'float-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -647,7 +647,7 @@ $result_trees{'placed_things_before_node'} = {
},
'normalized' => 'An-anchor'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -689,7 +689,7 @@ $result_trees{'placed_things_before_node'} = {
},
'normalized' => 'Anchor-in-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/moresectioning/special_spaces_in_nodes.pl
b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
index 13fa5198cc..ecd9af4809 100644
--- a/tp/t/results/moresectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
@@ -880,7 +880,7 @@ $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"
},
- "type" => "brace_command_arg"
+ "type" => "brace_command_container"
}
],
"cmdname" => "ref",
diff --git a/tp/t/results/multitable/ref_in_multitable.pl
b/tp/t/results/multitable/ref_in_multitable.pl
index 51354f489f..c84c1075da 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -50,7 +50,7 @@ $result_trees{'ref_in_multitable'} = {
},
'normalized' =>
'XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XX'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -169,7 +169,7 @@ $result_trees{'ref_in_multitable'} = {
},
'normalized' =>
'RRR-RRR-RRR-RRR-RRR-RRR-RRR-RRR-RRR-RRRR'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -252,7 +252,7 @@ $result_trees{'ref_in_multitable'} = {
},
'normalized' =>
'SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSSSS'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -322,7 +322,7 @@ $result_trees{'ref_in_multitable'} = {
},
'normalized' =>
'XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XX'
},
- 'type' => 'brace_command_arg'
+ 'type' =>
'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -463,7 +463,7 @@ $result_trees{'ref_in_multitable'} = {
},
'normalized' =>
'XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XX'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/paragraph/image_in_paragraph.pl
b/tp/t/results/paragraph/image_in_paragraph.pl
index a47590c73a..29c03d0649 100644
--- a/tp/t/results/paragraph/image_in_paragraph.pl
+++ b/tp/t/results/paragraph/image_in_paragraph.pl
@@ -22,7 +22,7 @@ $result_trees{'image_in_paragraph'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -30,7 +30,7 @@ $result_trees{'image_in_paragraph'} = {
'text' => 'bb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -38,7 +38,7 @@ $result_trees{'image_in_paragraph'} = {
'text' => 'cc'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -46,7 +46,7 @@ $result_trees{'image_in_paragraph'} = {
'text' => 'dd'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -54,7 +54,7 @@ $result_trees{'image_in_paragraph'} = {
'text' => '.ee'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/paragraph/no_paragraph_commands.pl
b/tp/t/results/paragraph/no_paragraph_commands.pl
index 676c8ddf02..c7ea79a410 100644
--- a/tp/t/results/paragraph/no_paragraph_commands.pl
+++ b/tp/t/results/paragraph/no_paragraph_commands.pl
@@ -45,7 +45,7 @@ $result_trees{'no_paragraph_commands'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -53,7 +53,7 @@ $result_trees{'no_paragraph_commands'} = {
'text' => 'bb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -61,7 +61,7 @@ $result_trees{'no_paragraph_commands'} = {
'text' => 'cc'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -69,7 +69,7 @@ $result_trees{'no_paragraph_commands'} = {
'text' => 'dd'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -77,7 +77,7 @@ $result_trees{'no_paragraph_commands'} = {
'text' => '.ee'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/paragraph/paragraph_command.pl
b/tp/t/results/paragraph/paragraph_command.pl
index 64bf5304fb..682fb4fbcd 100644
--- a/tp/t/results/paragraph/paragraph_command.pl
+++ b/tp/t/results/paragraph/paragraph_command.pl
@@ -96,7 +96,7 @@ $result_trees{'paragraph_command'} = {
'text' => '0075'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
@@ -126,7 +126,7 @@ $result_trees{'paragraph_command'} = {
'text' => 'm1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/paragraph/sole_image.pl
b/tp/t/results/paragraph/sole_image.pl
index 189c6db023..261ad10f65 100644
--- a/tp/t/results/paragraph/sole_image.pl
+++ b/tp/t/results/paragraph/sole_image.pl
@@ -17,7 +17,7 @@ $result_trees{'sole_image'} = {
'text' => 'aa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
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 f61e7719cd..cb100a444e 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
@@ -50,7 +50,7 @@ $result_trees{'U_with_utf8_enable_encoding'} = {
'text' => '00FF'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'U',
diff --git a/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
b/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
index 200c726a1f..04346c96e3 100644
--- a/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
+++ b/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
@@ -31,7 +31,7 @@ $result_trees{'anchor_and_empty_lines'} = {
'text' => 'in anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
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 86da5f7bd9..0bbd814e6c 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
@@ -87,7 +87,7 @@ $result_trees{'at_commands_glued_in_example'} = {
'text' => 'ABC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -100,7 +100,7 @@ $result_trees{'at_commands_glued_in_example'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -123,7 +123,7 @@ $result_trees{'at_commands_glued_in_example'} = {
'text' => 'ABC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -146,7 +146,7 @@ $result_trees{'at_commands_glued_in_example'} = {
'text' => 'somebody'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -159,7 +159,7 @@ $result_trees{'at_commands_glued_in_example'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -190,7 +190,7 @@ $result_trees{'at_commands_glued_in_example'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -340,7 +340,7 @@ $result_trees{'at_commands_glued_in_example'} = {
'text' => 'anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
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 12bb7a0e84..50c41dff39 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
@@ -73,7 +73,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
'text' => 'ABC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -86,7 +86,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -109,7 +109,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
'text' => 'ABC'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -132,7 +132,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
'text' => 'somebody'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -145,7 +145,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -176,7 +176,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -331,7 +331,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
'text' => 'anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
b/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
index 25d52d9ce8..17399d9be5 100644
--- a/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
+++ b/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
@@ -43,13 +43,13 @@ $result_trees{'del_quote_linebreaking'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -62,7 +62,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -70,7 +70,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => 'Manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -110,13 +110,13 @@ $result_trees{'del_quote_linebreaking'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -129,7 +129,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -137,7 +137,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => 'Manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -177,13 +177,13 @@ $result_trees{'del_quote_linebreaking'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -196,7 +196,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -204,7 +204,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => 'Manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -258,13 +258,13 @@ $result_trees{'del_quote_linebreaking'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -277,7 +277,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -285,7 +285,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => 'Manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -325,13 +325,13 @@ $result_trees{'del_quote_linebreaking'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -344,7 +344,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -352,7 +352,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => 'Manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -392,13 +392,13 @@ $result_trees{'del_quote_linebreaking'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -411,7 +411,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -419,7 +419,7 @@ $result_trees{'del_quote_linebreaking'} = {
'text' => 'Manual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 59f6c5c395..56593da620 100644
--- a/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
+++ b/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
@@ -19,7 +19,7 @@ $result_trees{'lone_braces_in_inlineraw'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -40,7 +40,7 @@ $result_trees{'lone_braces_in_inlineraw'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
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 9e7f51e47b..76da92494d 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -50,7 +50,7 @@ $result_trees{'long_uref_after_item'} = {
'text' =>
'http://foo.org/some/long/url/which/goes/past/eighty/columns/and/has/no/alternative/text.html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
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 6a668b4b2c..fb256fc1e1 100644
--- a/tp/t/results/plaintext_tests/multiline_image_and_align.pl
+++ b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
@@ -21,7 +21,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -72,7 +72,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -123,7 +123,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -174,7 +174,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -241,7 +241,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -277,7 +277,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -299,7 +299,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -336,7 +336,7 @@ $result_trees{'multiline_image_and_align'} = {
'text' => 'figure'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
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 e2cb05ab78..9fbc530d1e 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
@@ -160,7 +160,7 @@ $result_trees{'no_empty_line_after_section'} = {
'text' => 'url'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'uref',
diff --git a/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
b/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
index 9b653264d3..045d7bfe85 100644
--- a/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
+++ b/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
@@ -19,7 +19,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -38,7 +38,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -57,7 +57,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => 'aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -76,7 +76,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => 'bbb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -96,7 +96,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => 'AAA'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -109,7 +109,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -128,7 +128,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => 'BBB'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -141,7 +141,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -160,7 +160,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => 'aaa'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -173,7 +173,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'abbr',
@@ -193,7 +193,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => 'bbb'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -206,7 +206,7 @@ $result_trees{'punctuation_abbr_acronym'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
diff --git a/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
b/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
index ad638d6bd1..c71466340e 100644
--- a/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
+++ b/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
@@ -27,7 +27,7 @@ $result_trees{'punctuation_at_end_command'} = {
'text' => '.'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -35,7 +35,7 @@ $result_trees{'punctuation_at_end_command'} = {
'text' => '.'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/plaintext_tests/punctuation_in_command.pl
b/tp/t/results/plaintext_tests/punctuation_in_command.pl
index 4e5cfce77d..018375c93d 100644
--- a/tp/t/results/plaintext_tests/punctuation_in_command.pl
+++ b/tp/t/results/plaintext_tests/punctuation_in_command.pl
@@ -27,7 +27,7 @@ $result_trees{'punctuation_in_command'} = {
'text' => 'a. b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -35,7 +35,7 @@ $result_trees{'punctuation_in_command'} = {
'text' => 'a. b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
b/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
index bb6715a074..0d08645e73 100644
--- a/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
+++ b/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
@@ -22,7 +22,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
'text' => '.'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -30,7 +30,7 @@ $result_trees{'punctuation_in_command_end_line'} = {
'text' => '.'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl
b/tp/t/results/plaintext_tests/quote_node_names.pl
index 619092cc28..8662300a48 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -84,7 +84,7 @@ $result_trees{'quote_node_names'} = {
},
'normalized' => 'normal-node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -97,7 +97,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -126,7 +126,7 @@ $result_trees{'quote_node_names'} = {
},
'normalized' => 'normal-node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -139,7 +139,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -178,7 +178,7 @@ $result_trees{'quote_node_names'} = {
},
'normalized' => 'blah_003ablah'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -191,7 +191,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -220,7 +220,7 @@ $result_trees{'quote_node_names'} = {
},
'normalized' => 'blah_003ablah'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -233,7 +233,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -272,7 +272,7 @@ $result_trees{'quote_node_names'} = {
},
'normalized' => 'blumpty_002efump'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -285,7 +285,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -314,7 +314,7 @@ $result_trees{'quote_node_names'} = {
},
'normalized' => 'blumpty_002efump'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -327,7 +327,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -366,7 +366,7 @@ $result_trees{'quote_node_names'} = {
},
'normalized' => 'blah_003ablah'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -419,7 +419,7 @@ $result_trees{'quote_node_names'} = {
},
'normalized' => 'secret_002cnode'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -461,7 +461,7 @@ $result_trees{'quote_node_names'} = {
},
'normalized' => 'blah_003ablah'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -499,13 +499,13 @@ $result_trees{'quote_node_names'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -513,7 +513,7 @@ $result_trees{'quote_node_names'} = {
'text' => 'man_ual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -521,7 +521,7 @@ $result_trees{'quote_node_names'} = {
'text' => 'Book Title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -559,13 +559,13 @@ $result_trees{'quote_node_names'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -573,7 +573,7 @@ $result_trees{'quote_node_names'} = {
'text' => 'man_ual'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -581,7 +581,7 @@ $result_trees{'quote_node_names'} = {
'text' => 'Book Title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -619,10 +619,10 @@ $result_trees{'quote_node_names'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -635,7 +635,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -648,7 +648,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -656,7 +656,7 @@ $result_trees{'quote_node_names'} = {
'text' => 'Book Title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -694,10 +694,10 @@ $result_trees{'quote_node_names'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -710,7 +710,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -723,7 +723,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -731,7 +731,7 @@ $result_trees{'quote_node_names'} = {
'text' => 'Book Title'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -769,10 +769,10 @@ $result_trees{'quote_node_names'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -785,7 +785,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -798,7 +798,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -811,7 +811,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -849,10 +849,10 @@ $result_trees{'quote_node_names'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -865,7 +865,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -878,7 +878,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -891,7 +891,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -929,10 +929,10 @@ $result_trees{'quote_node_names'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -945,7 +945,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -958,7 +958,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -971,7 +971,7 @@ $result_trees{'quote_node_names'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 c2a090335d..9eb400af5a 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -124,7 +124,7 @@ $result_trees{'star_at_command_formatting'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -393,7 +393,7 @@ $result_trees{'star_at_command_formatting'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -689,7 +689,7 @@ $result_trees{'star_at_command_formatting'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
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 518ff2d614..6d46879f67 100644
--- a/tp/t/results/plaintext_tests/xref_quote_long_item.pl
+++ b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
@@ -143,10 +143,10 @@ $result_trees{'xref_quote_long_item'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -160,7 +160,7 @@ $result_trees{'xref_quote_long_item'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -173,7 +173,7 @@ $result_trees{'xref_quote_long_item'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 5ae8bd5494..a94c21f2fe 100644
--- a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
@@ -28,7 +28,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -36,7 +36,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
'text' => 'b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -44,7 +44,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
'text' => 'c'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -52,7 +52,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
'text' => 'd'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -76,7 +76,7 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
'text' => 'an anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/raw/inline_in_example.pl
b/tp/t/results/raw/inline_in_example.pl
index af557ccfd4..56f6d726d1 100644
--- a/tp/t/results/raw/inline_in_example.pl
+++ b/tp/t/results/raw/inline_in_example.pl
@@ -36,7 +36,7 @@ $result_trees{'inline_in_example'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -72,7 +72,7 @@ $result_trees{'inline_in_example'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
@@ -96,7 +96,7 @@ $result_trees{'inline_in_example'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -109,7 +109,7 @@ $result_trees{'inline_in_example'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -142,7 +142,7 @@ $result_trees{'inline_in_example'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -162,7 +162,7 @@ $result_trees{'inline_in_example'} = {
'text' => 'HTML'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -180,7 +180,7 @@ $result_trees{'inline_in_example'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
diff --git a/tp/t/results/raw/inline_missing_first_arg.pl
b/tp/t/results/raw/inline_missing_first_arg.pl
index 11b1cb4edf..17c3de9464 100644
--- a/tp/t/results/raw/inline_missing_first_arg.pl
+++ b/tp/t/results/raw/inline_missing_first_arg.pl
@@ -19,7 +19,7 @@ $result_trees{'inline_missing_first_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -45,7 +45,7 @@ $result_trees{'inline_missing_first_arg'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/raw/inlinefmt.pl b/tp/t/results/raw/inlinefmt.pl
index 02303ec0df..a194791c87 100644
--- a/tp/t/results/raw/inlinefmt.pl
+++ b/tp/t/results/raw/inlinefmt.pl
@@ -22,7 +22,7 @@ $result_trees{'inlinefmt'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -49,7 +49,7 @@ $result_trees{'inlinefmt'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -73,7 +73,7 @@ $result_trees{'inlinefmt'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -88,7 +88,7 @@ $result_trees{'inlinefmt'} = {
'text' => 'HTML'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -105,7 +105,7 @@ $result_trees{'inlinefmt'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
diff --git a/tp/t/results/raw/inlinefmt_with_empty_line.pl
b/tp/t/results/raw/inlinefmt_with_empty_line.pl
index 6e237c82b4..a2bc873168 100644
--- a/tp/t/results/raw/inlinefmt_with_empty_line.pl
+++ b/tp/t/results/raw/inlinefmt_with_empty_line.pl
@@ -22,7 +22,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -41,7 +41,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -81,7 +81,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -100,7 +100,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -128,7 +128,7 @@ $result_trees{'inlinefmt_with_empty_line'} = {
'text' => 'HTML'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
diff --git a/tp/t/results/raw/inlineraw.pl b/tp/t/results/raw/inlineraw.pl
index 23cd62fefc..c459621c43 100644
--- a/tp/t/results/raw/inlineraw.pl
+++ b/tp/t/results/raw/inlineraw.pl
@@ -22,7 +22,7 @@ $result_trees{'inlineraw'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -49,7 +49,7 @@ $result_trees{'inlineraw'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
@@ -73,7 +73,7 @@ $result_trees{'inlineraw'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -88,7 +88,7 @@ $result_trees{'inlineraw'} = {
'text' => 'HTML'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -105,7 +105,7 @@ $result_trees{'inlineraw'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
diff --git a/tp/t/results/raw/inlineraw_with_empty_line.pl
b/tp/t/results/raw/inlineraw_with_empty_line.pl
index 59be66fd9e..630c111383 100644
--- a/tp/t/results/raw/inlineraw_with_empty_line.pl
+++ b/tp/t/results/raw/inlineraw_with_empty_line.pl
@@ -22,7 +22,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
'text' => 'plaintext'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -55,7 +55,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
@@ -79,7 +79,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -103,7 +103,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
'text' => 'HTML'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'acronym',
@@ -120,7 +120,7 @@ $result_trees{'inlineraw_with_empty_line'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
diff --git a/tp/t/results/regions/anchor_in_copying.pl
b/tp/t/results/regions/anchor_in_copying.pl
index 72407f49cb..a44203dc18 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -57,7 +57,7 @@ $result_trees{'anchor_in_copying'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -246,7 +246,7 @@ $result_trees{'anchor_in_copying'} = {
},
'normalized' => 'Copying-information'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 9cd5b72b8b..7c82565910 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -56,7 +56,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
'extra' => {
'element_region' => 'copying'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -268,7 +268,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
},
'normalized' => 'Copying-footnote'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl
b/tp/t/results/regions/anchor_in_titlepage.pl
index e9d58d75d3..cdb5c69502 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -41,7 +41,7 @@ $result_trees{'anchor_in_titlepage'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -242,7 +242,7 @@ $result_trees{'anchor_in_titlepage'} = {
},
'normalized' => 'in-titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index b05763d203..c3ca456c50 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -41,7 +41,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
'extra' => {
'element_region' => 'titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -242,7 +242,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
},
'normalized' => 'in-titlepage'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/regions/ref_in_copying.pl
b/tp/t/results/regions/ref_in_copying.pl
index 96488cf4ba..7b52178045 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -43,7 +43,7 @@ $result_trees{'ref_in_copying'} = {
},
'normalized' => 'GFDL'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
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 d67826232e..22f33bb414 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
@@ -43,7 +43,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
},
'normalized' => 'GFDL'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/sectioning/anchor_zero.pl
b/tp/t/results/sectioning/anchor_zero.pl
index 76915b16d4..fd4a951539 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -42,7 +42,7 @@ $result_trees{'anchor_zero'} = {
'text' => '0'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -86,7 +86,7 @@ $result_trees{'anchor_zero'} = {
},
'normalized' => '0'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 38d206377f..5678937708 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -80,7 +80,7 @@ $result_trees{'double_node_anchor_float'} = {
'text' => 'node1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -109,7 +109,7 @@ $result_trees{'double_node_anchor_float'} = {
'text' => 'anchor1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git
a/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
b/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
index faa5f89905..5effab64e0 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
@@ -132,7 +132,7 @@
$result_trees{'double_recursive_self_section_node_reference'} = {
},
'normalized' => 'to-node1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -193,7 +193,7 @@
$result_trees{'double_recursive_self_section_node_reference'} = {
},
'normalized' => 'node1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/sectioning/double_recursive_self_section_reference.pl
b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
index 1788515b58..88023d4cc6 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
@@ -66,7 +66,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
},
'normalized' => 'n2'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -155,7 +155,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
},
'normalized' => 'n1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/sectioning/double_top.pl
b/tp/t/results/sectioning/double_top.pl
index b9cfbb5c10..f643939e9f 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -134,7 +134,7 @@ $result_trees{'double_top'} = {
'text' => 'TOP'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/sectioning/email_in_node.pl
b/tp/t/results/sectioning/email_in_node.pl
index 58fd98bd01..84933df1ce 100644
--- a/tp/t/results/sectioning/email_in_node.pl
+++ b/tp/t/results/sectioning/email_in_node.pl
@@ -30,7 +30,7 @@ $result_trees{'email_in_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -54,7 +54,7 @@ $result_trees{'email_in_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -67,7 +67,7 @@ $result_trees{'email_in_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
@@ -86,7 +86,7 @@ $result_trees{'email_in_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -99,7 +99,7 @@ $result_trees{'email_in_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'email',
diff --git a/tp/t/results/sectioning/empty_anchor.pl
b/tp/t/results/sectioning/empty_anchor.pl
index ff635750e3..8502260ab4 100644
--- a/tp/t/results/sectioning/empty_anchor.pl
+++ b/tp/t/results/sectioning/empty_anchor.pl
@@ -12,7 +12,7 @@ $result_trees{'empty_anchor'} = {
{
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -34,7 +34,7 @@ $result_trees{'empty_anchor'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl
b/tp/t/results/sectioning/empty_ref_arg.pl
index be5e6d5d24..a7f1d41d54 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -52,7 +52,7 @@ $result_trees{'empty_ref_arg'} = {
},
'normalized' => 'first'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -65,7 +65,7 @@ $result_trees{'empty_ref_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -93,7 +93,7 @@ $result_trees{'empty_ref_arg'} = {
},
'normalized' => 'first'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'info' => {
@@ -101,7 +101,7 @@ $result_trees{'empty_ref_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -114,7 +114,7 @@ $result_trees{'empty_ref_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -142,7 +142,7 @@ $result_trees{'empty_ref_arg'} = {
},
'normalized' => 'first'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -155,7 +155,7 @@ $result_trees{'empty_ref_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -168,7 +168,7 @@ $result_trees{'empty_ref_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -196,7 +196,7 @@ $result_trees{'empty_ref_arg'} = {
},
'normalized' => 'first'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -236,7 +236,7 @@ $result_trees{'empty_ref_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -266,7 +266,7 @@ $result_trees{'empty_ref_arg'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/sectioning/empty_refs.pl
b/tp/t/results/sectioning/empty_refs.pl
index 6838cb62d8..f6c904900b 100644
--- a/tp/t/results/sectioning/empty_refs.pl
+++ b/tp/t/results/sectioning/empty_refs.pl
@@ -26,7 +26,7 @@ $result_trees{'empty_refs'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
@@ -67,7 +67,7 @@ $result_trees{'empty_refs'} = {
},
'normalized' => '-'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/sectioning/equivalent_labels.pl
b/tp/t/results/sectioning/equivalent_labels.pl
index d170754f43..cbe582d8e1 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -55,7 +55,7 @@ $result_trees{'equivalent_labels'} = {
}
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl
b/tp/t/results/sectioning/equivalent_nodes.pl
index f1eab8e464..c204c39529 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -248,7 +248,7 @@ $result_trees{'equivalent_nodes'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
b/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
index a48e71460d..99f1716371 100644
--- a/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
+++ b/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
@@ -268,7 +268,7 @@ $result_trees{'equivalent_nodes_novalidate'} = {
},
'normalized' => 'node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index b6c042cd73..0431a4dbe8 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -152,7 +152,7 @@ $result_trees{'node_referenced_in_ref'} = {
},
'normalized' => 'second-level-node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl
b/tp/t/results/sectioning/nodename_parentheses.pl
index 3ea53d2519..5d8d6e6018 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -440,7 +440,7 @@ $result_trees{'nodename_parentheses'} = {
},
'normalized' => 'Node-_0028with-parentheses_0029'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -494,7 +494,7 @@ $result_trees{'nodename_parentheses'} = {
]
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -604,7 +604,7 @@ $result_trees{'nodename_parentheses'} = {
'text' => '(manual)anchor'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git a/tp/t/results/sectioning/novalidate.pl
b/tp/t/results/sectioning/novalidate.pl
index fd80866a1c..ce435a95f1 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -196,7 +196,7 @@ $result_trees{'novalidate'} = {
},
'normalized' => 'unknown-ref'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 c8341a6f40..1f6d5b929b 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -83,7 +83,7 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
'text' => 'ref'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -128,7 +128,7 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
},
'normalized' => 'ref'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git
a/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
b/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
index 6ed385623a..596e264c1c 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
@@ -83,7 +83,7 @@
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
'text' => 'ref'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -128,7 +128,7 @@
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
},
'normalized' => 'ref'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl
b/tp/t/results/sectioning/protected_node_parentheses.pl
index ef5294490a..68b7226dca 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -264,7 +264,7 @@ $result_trees{'protected_node_parentheses'} = {
'text' => 'manual2) name2'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
@@ -321,7 +321,7 @@ $result_trees{'protected_node_parentheses'} = {
},
'normalized' => '_0028manual2_0029-name2'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/sectioning/recursive_self_section_reference.pl
b/tp/t/results/sectioning/recursive_self_section_reference.pl
index 122fe25feb..fd050a2057 100644
--- a/tp/t/results/sectioning/recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/recursive_self_section_reference.pl
@@ -66,7 +66,7 @@ $result_trees{'recursive_self_section_reference'} = {
},
'normalized' => 'sharp'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/sectioning/ref_to_top.pl
b/tp/t/results/sectioning/ref_to_top.pl
index dcf8040918..b833941dbf 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -90,7 +90,7 @@ $result_trees{'ref_to_top'} = {
},
'normalized' => 'Top'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
diff --git a/tp/t/results/sectioning/ref_to_unknown_node.pl
b/tp/t/results/sectioning/ref_to_unknown_node.pl
index c62ff8acf6..405f9a6ae5 100644
--- a/tp/t/results/sectioning/ref_to_unknown_node.pl
+++ b/tp/t/results/sectioning/ref_to_unknown_node.pl
@@ -27,7 +27,7 @@ $result_trees{'ref_to_unknown_node'} = {
},
'normalized' => 'unknown-node'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 1db0eab28b..56a2da9460 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
@@ -172,7 +172,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -185,7 +185,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
@@ -335,7 +335,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
},
'normalized' => '_2002_2003_2002'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -362,7 +362,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'ref',
diff --git a/tp/t/results/transformations/protect_colon_source_mark.pl
b/tp/t/results/transformations/protect_colon_source_mark.pl
index 4bccc40ee5..75b2521bed 100644
--- a/tp/t/results/transformations/protect_colon_source_mark.pl
+++ b/tp/t/results/transformations/protect_colon_source_mark.pl
@@ -85,7 +85,7 @@ $result_trees{'protect_colon_source_mark'} = {
'text' => 'nop'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/transformations/protect_comma_source_mark.pl
b/tp/t/results/transformations/protect_comma_source_mark.pl
index 0765f91f2a..5fa4d098d6 100644
--- a/tp/t/results/transformations/protect_comma_source_mark.pl
+++ b/tp/t/results/transformations/protect_comma_source_mark.pl
@@ -98,7 +98,7 @@ $result_trees{'protect_comma_source_mark'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
index ff2b5cb625..40e3aecd4c 100644
---
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
+++
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
@@ -78,7 +78,7 @@
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -117,7 +117,7 @@
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
'text' => 'my_f)'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git
a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
index e657b4c399..04b817d603 100644
--- a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
+++ b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
@@ -78,7 +78,7 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -117,7 +117,7 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
'text' => 'some text) aa,,'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'anchor',
diff --git
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
index 314d31b9b2..961bf6c469 100644
---
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
+++
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
@@ -83,7 +83,7 @@
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -195,7 +195,7 @@
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -327,7 +327,7 @@
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
'text' => '900'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
index f79a3b59bc..b079df65b6 100644
---
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
+++
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
@@ -98,7 +98,7 @@
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
diff --git a/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
b/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
index c8ff890c7a..3a26aa9ae5 100644
--- a/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
+++ b/tp/t/results/value/closing_brace_in_value_in_ignored_inline.pl
@@ -41,7 +41,7 @@ $result_trees{'closing_brace_in_value_in_ignored_inline'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -77,7 +77,7 @@ $result_trees{'closing_brace_in_value_in_ignored_inline'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -122,7 +122,7 @@ $result_trees{'closing_brace_in_value_in_ignored_inline'} =
{
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/value/ignored_value_definition.pl
b/tp/t/results/value/ignored_value_definition.pl
index c9bc2ded70..6f98aa46c1 100644
--- a/tp/t/results/value/ignored_value_definition.pl
+++ b/tp/t/results/value/ignored_value_definition.pl
@@ -41,7 +41,7 @@ $result_trees{'ignored_value_definition'} = {
'text' => 'tex'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/value/value_in_node.pl
b/tp/t/results/value/value_in_node.pl
index 01fdb07c75..bb20333312 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -721,7 +721,7 @@ $result_trees{'value_in_node'} = {
},
'normalized' => 'Node-1'
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'xref',
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 b8c43c4fcc..c26606de22 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
@@ -104,7 +104,7 @@ $result_trees{'comma_value_in_macro_arg'} = {
'text' => 'arg1 @value{comma} arg2 '
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
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 97d2942983..3427c5fb37 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
@@ -100,7 +100,7 @@ $result_trees{'value_in_macro_body'} = {
'text' => 'macro_arg1'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
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 6d08eeebb7..ee0bc48916 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
@@ -23,7 +23,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -57,7 +57,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -85,7 +85,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
'text' => 'a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -99,7 +99,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -127,7 +127,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
'text' => 'a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -141,7 +141,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -169,7 +169,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
'text' => 'a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -183,7 +183,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -211,7 +211,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
'text' => 'a'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -225,7 +225,7 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl
b/tp/t/results/xml_tests/commands_and_spaces.pl
index d615f6222a..d648f7afae 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -340,7 +340,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -348,7 +348,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => 'b'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -361,7 +361,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -374,7 +374,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -387,7 +387,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -423,7 +423,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -437,7 +437,7 @@ $result_trees{'commands_and_spaces'} = {
'
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -450,7 +450,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -463,7 +463,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -476,7 +476,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
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 ce9f720aa3..081ce5bda1 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -17,7 +17,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'A'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -50,7 +50,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'hh'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -139,7 +139,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'B'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -172,7 +172,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'jj'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -224,7 +224,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_example'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -256,7 +256,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in example after text'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -326,7 +326,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_quotation_arg'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -357,7 +357,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_quotation_content'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -456,7 +456,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_table_item'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -505,7 +505,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_table_def'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -538,7 +538,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_table_def_para'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -569,7 +569,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_table_def_after'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -668,7 +668,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'node_image'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -706,7 +706,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'image_in_description'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -749,7 +749,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_menu_entry_name'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -786,7 +786,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'extnode'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -854,7 +854,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_menu_comment'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -938,7 +938,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'node_image'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -985,7 +985,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_chapter_arg'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1035,7 +1035,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1101,7 +1101,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in text in_footnote'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1192,7 +1192,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_float'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1224,7 +1224,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_caption'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
@@ -1248,7 +1248,7 @@ $result_trees{'image_inline_or_not'} = {
'text' => 'in_caption_para'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'image',
diff --git a/tp/t/results/xml_tests/inline_commands.pl
b/tp/t/results/xml_tests/inline_commands.pl
index c4083662db..4d42e45cff 100644
--- a/tp/t/results/xml_tests/inline_commands.pl
+++ b/tp/t/results/xml_tests/inline_commands.pl
@@ -19,7 +19,7 @@ $result_trees{'inline_commands'} = {
'text' => 'xml'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -32,7 +32,7 @@ $result_trees{'inline_commands'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlineraw',
@@ -56,7 +56,7 @@ $result_trees{'inline_commands'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -98,7 +98,7 @@ $result_trees{'inline_commands'} = {
'text' => 'xml'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -127,7 +127,7 @@ $result_trees{'inline_commands'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmt',
@@ -151,7 +151,7 @@ $result_trees{'inline_commands'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -193,7 +193,7 @@ $result_trees{'inline_commands'} = {
'text' => 'xml'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -222,7 +222,7 @@ $result_trees{'inline_commands'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -255,7 +255,7 @@ $result_trees{'inline_commands'} = {
'text' => 'html'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -277,7 +277,7 @@ $result_trees{'inline_commands'} = {
'text' => ' '
}
},
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'cmdname' => 'inlinefmtifelse',
diff --git a/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl
b/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl
index 4de4b927ee..b7867b4d15 100644
--- a/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl
+++ b/tp/t/results/xml_tests/inlineifset_empty_second_arg.pl
@@ -22,7 +22,7 @@ $result_trees{'inlineifset_empty_second_arg'} = {
'text' => 'flag'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
@@ -67,7 +67,7 @@ $result_trees{'inlineifset_empty_second_arg'} = {
'text' => 'flag'
}
],
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
},
{
'contents' => [
diff --git a/tp/t/results/xtable/table_nested.pl
b/tp/t/results/xtable/table_nested.pl
index 6b44126098..e6f5d7ea2a 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -197,7 +197,7 @@ $result_trees{'table_nested'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -768,7 +768,7 @@ $result_trees{'table_nested'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {
@@ -1352,7 +1352,7 @@ $result_trees{'table_nested'} = {
'element' => {
'args' => [
{
- 'type' => 'brace_command_arg'
+ 'type' => 'brace_command_container'
}
],
'info' => {